summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-06-15 10:41:08 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-15 10:45:13 +0200
commit43b057760472c0131a83227cf4d35db2bca2d0e4 (patch)
tree69f0748b01dc6055f2b8da34297f684f4af329d5
parent98f90fdecc030b3789c0811cff8603709e5fec30 (diff)
fdo#58819 VML export of ESCHER_Prop_fillOpacity
Change-Id: Ic50be88b484e5bfba60c5bd8dafb7e6da0b33c9e
-rw-r--r--oox/source/export/vmlexport.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 325f87e2dbfe..710fe93cc5d8 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -516,6 +516,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
case ESCHER_Prop_fillBackColor: // 387
case ESCHER_Prop_fillBlip: // 390
case ESCHER_Prop_fNoFillHitTest: // 447
+ case ESCHER_Prop_fillOpacity: // 386
{
sal_uInt32 nValue;
sax_fastparser::FastAttributeList *pAttrList = m_pSerializer->createAttrList();
@@ -567,6 +568,10 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
impl_AddBool( pAttrList, XML_detectmouseclick, nValue );
+ if (rProps.GetOpt(ESCHER_Prop_fillOpacity, nValue))
+ // Partly undo the transformation at the end of EscherPropertyContainer::CreateFillProperties(): VML opacity is 0..1.
+ pAttrList->add(XML_opacity, OString::number(double((nValue * 100) >> 16) / 100));
+
m_pSerializer->singleElementNS( XML_v, XML_fill, XFastAttributeListRef( pAttrList ) );
}
bAlreadyWritten[ ESCHER_Prop_fillType ] = true;
@@ -574,6 +579,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
bAlreadyWritten[ ESCHER_Prop_fillBackColor ] = true;
bAlreadyWritten[ ESCHER_Prop_fillBlip ] = true;
bAlreadyWritten[ ESCHER_Prop_fNoFillHitTest ] = true;
+ bAlreadyWritten[ ESCHER_Prop_fillOpacity ] = true;
break;
case ESCHER_Prop_lineColor: // 448