diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-25 11:54:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-25 11:55:54 +0100 |
| commit | 46a0c8761e07226389bb2afef54817f51879e27d (patch) | |
| tree | 148bf0f7c4bf27bbee62c5de3e080428a40f177f /oox | |
| parent | eb9c04ed215f9b12584c6e254c36303c6b3865ed (diff) | |
Revert "tdf#90174 FILESAVE: export of bullet color for pptx"
This reverts commit 8707670cb39f5777cd54f8b180ec342416ef259f (plus follow-up
53e89ab25c0cd7df1b900a2e1048cfa402ea4353 "WaE: uninitialized nBulletColor") as
it broke CppunitTest_sd_export_tests.
Change-Id: Ib7433ba6e43b2f90767b0333dceb0f732d6659df
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 2deda44d551d..0c732fdaefdd 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1610,7 +1610,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa bool bHasFontDesc = false; OUString aGraphicURL; sal_Int16 nBulletRelSize = 0; - sal_Int32 nBulletColor = 0; for ( sal_Int32 i = 0; i < nPropertyCount; i++ ) { @@ -1635,10 +1634,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa else if( *(OUString*)pValue == ")") bPBehind = true; } - else if(aPropName == "BulletColor") - { - nBulletColor = *( (sal_Int32*)pValue ); - } else if ( aPropName == "BulletChar" ) { aBulletChar = OUString ( *( (OUString*)pValue ) )[ 0 ]; @@ -1693,13 +1688,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa } else { - if (nBulletColor) - { - mpFS->startElementNS( XML_a, XML_buClr, FSEND ); - WriteColor( nBulletColor ); - mpFS->endElementNS( XML_a, XML_buClr ); - } - if( nBulletRelSize && nBulletRelSize != 100 ) mpFS->singleElementNS( XML_a, XML_buSzPct, XML_val, IS( std::max( (sal_Int32)25000, std::min( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND ); |