diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-30 13:11:01 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-30 17:58:54 +0200 |
| commit | 024fa6b3915fd84586b348b5033dcc4312cd8926 (patch) | |
| tree | 5f2b3db77b2a10850c098b37eeed04d494dcd705 | |
| parent | ec49295718144aeeb81683bcfe5923c3610e8d21 (diff) | |
tdf#108231 tdf#108109 xmloff: SvxUnoDrawingModel doesn't implement...
... XStyleFamiliesSupplier, so try to do without. This is called from
sw in case SWTRANSFER_OBJECTTYPE_DRAWMODEL.
(regression from 9835a5823e0f559aabbc0e15ea126c82229c4bc7)
Change-Id: Ic99ad4bf0c8e6e24fc10da173ec480c9d29c0363
(cherry picked from commit db38e3f201517acf22c1773ae9fc4cb2514788b1)
Reviewed-on: https://gerrit.libreoffice.org/38214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index f3880cb1c5ab..95013a03a27d 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -385,11 +385,16 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // Shapes with a Writer TextBox always have a parent style. // If there would be none, then just assign the first available. uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(GetExport().GetModel(), uno::UNO_QUERY); - uno::Reference<container::XNameAccess> xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); - uno::Reference<container::XNameAccess> xFrameStyles = xStyleFamilies->getByName("FrameStyles").get< uno::Reference<container::XNameAccess> >(); - uno::Sequence<OUString> aFrameStyles = xFrameStyles->getElementNames(); - if (aFrameStyles.hasElements()) - aParentName = aFrameStyles[0]; + if (xStyleFamiliesSupplier.is()) // tdf#108231 + { + uno::Reference<container::XNameAccess> xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); + uno::Reference<container::XNameAccess> xFrameStyles = xStyleFamilies->getByName("FrameStyles").get< uno::Reference<container::XNameAccess> >(); + uno::Sequence<OUString> aFrameStyles = xFrameStyles->getElementNames(); + if (aFrameStyles.hasElements()) + { + aParentName = aFrameStyles[0]; + } + } } // filter propset |