include/oox/export/drawingml.hxx | 2 +-
oox/source/export/drawingml.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 491b348a64699332142febef90534aa9f70d5156
Author: Jacobo Aragunde Pérez <jaragu...@igalia.com>
Date: Thu Jan 30 16:10:34 2014 +0100
drawingML: complete the fix of nAlpha param in DrawingML
Change-Id: I1aec870ee52180d1b1b96762f69fab94370acbde
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 08fb539..f2ec9e7 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -116,7 +116,7 @@ public:
OUString WriteImage( const Graphic &rGraphic );
- void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = 0 );
+ void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
void WriteLineArrow( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rXPropSet, sal_Bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry,
sal_Int32 nStartID, sal_Int32 nEndID );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5363df2..459b425 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -189,7 +189,7 @@ void DrawingML::WriteSolidFill( sal_uInt32 nColor,
sal_Int32 nAlpha )
void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha )
{
mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
- if( nAlpha )
+ if( nAlpha < MAX_PERCENT )
{
mpFS->startElementNS( XML_a, XML_schemeClr, XML_val,
OUStringToOString( sSchemeName, RTL_TEXTENCODING_ASCII_US
).getStr(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
