Kaydet (Commit) b9155a66 authored tarafından Michael Meeks's avatar Michael Meeks

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

Change-Id: Iffa4ea724f2192f85df66eaf4e9e4f30e6ba3d4b
üst 445ebce3
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment