diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-11-12 16:24:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-08 21:58:12 +0100 |
| commit | 4b1f79280a617a973ba27e27cff7b2d216468638 (patch) | |
| tree | c9081a4f0c296251359a00190acf74df1dabcc15 | |
| parent | 2a8f10162deb89aebc7ed625b4072ed6af818a88 (diff) | |
tdf#95744: saving shape names re-enabled
commit c29657e0d6bb707345584ac7a7f5ae5016f37297 inverted
one of the tests for SvXMLExportFlags::OASIS
Change-Id: I523cecd4203c91d82a4e3e82b8457d2c55a5fff0
Reviewed-on: https://gerrit.libreoffice.org/19931
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
(cherry picked from commit 249f8b1cc9897ac9666dd5c69dc22fae7586c207)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 96dfd640fb20..9bedc46e0964 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -662,7 +662,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if ( ( GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITER && GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERWEB && GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERGLOBAL ) || - !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) || + ( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) || aShapeInfo.meShapeType == XmlShapeTypeDrawGroupShape || ( aShapeInfo.meShapeType == XmlShapeTypeDrawCustomShape && aShapeInfo.xCustomShapeReplacement.is() ) ) |