diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-12 12:06:49 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-21 21:24:41 +0200 |
| commit | b8e216ec3737e9b0fc030cad83a31e98c4300399 (patch) | |
| tree | faca3140adcc90258eb6b0d4bd753f13d4db0c77 /sw | |
| parent | de593264eb825d1d8eaebe65ce8a61f91692518e (diff) | |
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
(cherry picked from commit b59931d8a62f761022929f58f27d7ba22536b570)
Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa
Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index f8867d972494..e066325812ea 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2136,12 +2136,20 @@ lcl_ApplyCellProperties( xCellCurs->gotoEnd( sal_True ); const uno::Reference< beans::XPropertyState > xCellTextPropState(xCellCurs, uno::UNO_QUERY); - const beans::PropertyState state = xCellTextPropState->getPropertyState(rName); - if (state == beans::PropertyState_DEFAULT_VALUE) + try { - const uno::Reference< beans::XPropertySet > - xCellTextProps(xCellCurs, uno::UNO_QUERY); - xCellTextProps->setPropertyValue(rName, rValue); + const beans::PropertyState state = xCellTextPropState->getPropertyState(rName); + if (state == beans::PropertyState_DEFAULT_VALUE) + { + 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 ); } } } |