[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - xmloff/source

Oliver Specht oliver.specht at cib.de
Fri Jan 8 13:00:40 PST 2016


 xmloff/source/draw/shapeexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b1f79280a617a973ba27e27cff7b2d216468638
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Thu Nov 12 16:24:51 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    (cherry picked from commit 249f8b1cc9897ac9666dd5c69dc22fae7586c207)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 96dfd64..9bedc46 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() ) )


More information about the Libreoffice-commits mailing list