diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-18 10:00:12 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-18 10:04:31 +0100 |
| commit | 23ff4ca909f960a7fb36ac87791d448a2ed5eb6d (patch) | |
| tree | 0c5f31d53673ef9266b9f243a971370b71c8c579 | |
| parent | 9e1c2d3b1da6f8ca23d2fd2fd5255f6bb8d9afda (diff) | |
fdo#65882 - fix intermittent writer unit test failure on exit.
Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
| -rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.cxx | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index b4f85a540016..e922d3c40b50 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -368,25 +368,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( |