summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml/XMLRedlineImportHelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml/XMLRedlineImportHelper.cxx')
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx39
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(