diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-28 16:43:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-28 17:02:13 +0100 |
| commit | 6cee94ba6b224399e5a4a2511df39d3118454c83 (patch) | |
| tree | 527fabda07634b251e7d5ca711e7a5040534eabe | |
| parent | 5f447bb0156322c542649809e1f8ec1db2f22e7d (diff) | |
fdo#84692 SwXAutoStyleFamily::insertStyle: don't throw on unknown property
Regression from commit 7d9bb549d498d6beed2c4050c402d09643febdfa
(Related: #i124638# Second step of DrawingLayer FillAttributes...,
2014-06-02), the problem was that the new branch (used for paragraphs)
in the method does not tolerate unknown properties (it throws), while
the behavior was just a warning.
Adapt the new branch to the old behavior, so that the document can be
opened again.
Change-Id: I5d849987602fb8aa0cbbda92ce07c050067473b3
| -rw-r--r-- | sw/qa/core/data/odt/pass/fdo84692.odt | bin | 0 -> 9408 bytes | |||
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/core/data/odt/pass/fdo84692.odt b/sw/qa/core/data/odt/pass/fdo84692.odt Binary files differnew file mode 100644 index 000000000000..db5c878c9f69 --- /dev/null +++ b/sw/qa/core/data/odt/pass/fdo84692.odt diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 1038f2658bdd..84d71489b8cb 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -4210,8 +4210,8 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( if (!pEntry) { - throw uno::RuntimeException(OUString("Unknown property: ") + rPropName, - static_cast<cppu::OWeakObject*>(this)); + SAL_WARN("sw.core", "SwXAutoStyleFamily::Modify: Unknown property: " << rPropName); + continue; } const sal_uInt8 nMemberId(pEntry->nMemberId & (~SFX_METRIC_ITEM)); |