[PATCH libreoffice-4-0] fdo#65882 - fix intermittent writer unit test failure on exi...

[Michael Meeks (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4336

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/4336/1

fdo#65882 - fix intermittent writer unit test failure on exit.

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
---
M sw/source/filter/xml/XMLRedlineImportHelper.cxx
1 file changed, 23 insertions(+), 16 deletions(-)



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 @@
     }
 
     // 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(

-- 
To view, visit https://gerrit.libreoffice.org/4336
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Meeks <michael.meeks at suse.com>