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:00:44 +0100 |
| commit | b9155a663b767695c5d636e855765c209944cfd5 (patch) | |
| tree | 24df1c00895807d728f13b951862bf70d5446392 | |
| parent | 445ebce3e08973dd1701791974477d7fa64835fa (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 e1118e0153b3..e7583aac9f25 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( |