[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

[Michael Meeks]

 sw/source/filter/xml/XMLRedlineImportHelper.cxx |   39 ++++++++++++++----------
 1 file changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 49c783437f37b52f1feeb415d1fc9274b185a488
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jun 18 10:00:12 2013 +0100

    fdo#65882 - fix intermittent writer unit test failure on exit.
    
    Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
    Reviewed-on: https://gerrit.libreoffice.org/4336
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index fb942bb..3fe4709 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -369,25 +369,32 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
     }
 
     // set redline mode & key
-    Any aAny;
+    try
+    {
+        Any aAny;
 
-    aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
-    if ( bHandleShowChanges )
-        xModelPropertySet->setPropertyValue( sShowChanges, aAny );
-    else
-        xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
+        aAny.setValue( &bShowChanges, ::getBooleanCppuType() );
+        if ( bHandleShowChanges )
+            xModelPropertySet->setPropertyValue( sShowChanges, aAny );
+        else
+            xImportInfoPropertySet->setPropertyValue( sShowChanges, aAny );
 
-    aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
-    if ( bHandleRecordChanges )
-        xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
-    else
-        xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
+        aAny.setValue( &bRecordChanges, ::getBooleanCppuType() );
+        if ( bHandleRecordChanges )
+            xModelPropertySet->setPropertyValue( sRecordChanges, aAny );
+        else
+            xImportInfoPropertySet->setPropertyValue( sRecordChanges, aAny );
 
-    aAny <<= aProtectionKey;
-    if ( bHandleProtectionKey )
-        xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
-    else
-        xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+        aAny <<= aProtectionKey;
+        if ( bHandleProtectionKey )
+            xModelPropertySet->setPropertyValue( sRedlineProtectionKey, aAny );
+        else
+            xImportInfoPropertySet->setPropertyValue( sRedlineProtectionKey, aAny);
+    }
+    catch (const uno::RuntimeException &) // fdo#65882
+    {
+        SAL_WARN( "sw", "potentially benign ordering issue during shutdown" );
+    }
 }
 
 void XMLRedlineImportHelper::Add(