Kaydet (Commit) b59931d8 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#81046 don't crash on compilers that enforce exception specs

bit of a hammer here, the offending property is "IsSplitAllowed" if someone
wants to attempt a more subtle fix

Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa
üst 43cda910
...@@ -2138,12 +2138,20 @@ lcl_ApplyCellProperties( ...@@ -2138,12 +2138,20 @@ lcl_ApplyCellProperties(
xCellCurs->gotoEnd( sal_True ); xCellCurs->gotoEnd( sal_True );
const uno::Reference< beans::XPropertyState > const uno::Reference< beans::XPropertyState >
xCellTextPropState(xCellCurs, uno::UNO_QUERY); xCellTextPropState(xCellCurs, uno::UNO_QUERY);
const beans::PropertyState state = xCellTextPropState->getPropertyState(rName); try
if (state == beans::PropertyState_DEFAULT_VALUE)
{ {
const uno::Reference< beans::XPropertySet > const beans::PropertyState state = xCellTextPropState->getPropertyState(rName);
xCellTextProps(xCellCurs, uno::UNO_QUERY); if (state == beans::PropertyState_DEFAULT_VALUE)
xCellTextProps->setPropertyValue(rName, rValue); {
const uno::Reference< beans::XPropertySet >
xCellTextProps(xCellCurs, uno::UNO_QUERY);
xCellTextProps->setPropertyValue(rName, rValue);
}
}
catch (const uno::Exception& e)
{
SAL_WARN( "sw.uno", "Exception when getting PropertyState: "
+ rName + ". Message: " + e.Message );
} }
} }
} }
......
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