[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

[Miklos Vajna]

 oox/source/drawingml/textparagraphproperties.cxx |   25 ++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit aa4197498a1abf53bb22843b38e827730b4d4ee1
Author: Miklos Vajna <vmik...@suse.cz>
Date:   Tue Jun 5 16:13:26 2012 +0200

    TextParagraphProperties::pushToPropSet: limit effect of failed numrule 
import
    
    Fixes missing paragraph properties in Writer when importing SmartArt.
    
    Change-Id: I0091d7156b30b7ef99e550d7252a60676c23046e

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index e82124d..abd0b3b 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -443,18 +443,25 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
         aPropSet.getProperty( xNumRule, PROP_NumberingRules );
         OSL_ENSURE( xNumRule.is(), "can't get Numbering rules");
 
-        if( xNumRule.is() )
+        try
         {
-            if( !rioBulletMap.empty() )
+            if( xNumRule.is() )
             {
-                // fix default bullet size to be 100%
-                if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
-                    rioBulletMap[ PROP_BulletRelSize ] <<= static_cast< 
sal_Int16 >( 100 );
-                Sequence< PropertyValue > aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
-                xNumRule->replaceByIndex( getLevel(), makeAny( aBulletPropSeq 
) );
+                if( !rioBulletMap.empty() )
+                {
+                    // fix default bullet size to be 100%
+                    if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
+                        rioBulletMap[ PROP_BulletRelSize ] <<= static_cast< 
sal_Int16 >( 100 );
+                    Sequence< PropertyValue > aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
+                    xNumRule->replaceByIndex( getLevel(), makeAny( 
aBulletPropSeq ) );
+                }
+
+                aPropSet.setProperty( PROP_NumberingRules, xNumRule );
             }
-
-            aPropSet.setProperty( PROP_NumberingRules, xNumRule );
+        }
+        catch (const Exception &)
+        {
+            // Don't warn for now, expected to fail for Writer.
         }
     }
     if ( noParaLeftMargin )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits