[Libreoffice-commits] core.git: sd/source

[Jochen Nitschke]

 sd/source/filter/eppt/pptx-epptooxml.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 753d55f816161d1016fd3e4b7e65bd4b10a2a9a8
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sat Dec 24 14:06:27 2016 +0100

    inline macro
    
    Change-Id: I138989cf94f4a621af284999b58809c7f1bd0f8b
    Reviewed-on: https://gerrit.libreoffice.org/32410
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 50d37f3..5f1b8e1 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -94,7 +94,6 @@ using ::sax_fastparser::FSHelperPtr;
 
 
 void dump_pset(Reference< XPropertySet > const & rXPropSet);
-#define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
 namespace oox {
     using namespace drawingml;
@@ -1891,7 +1890,8 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( const Reference< XSha
 
     // non visual shape properties
     mpFS->startElementNS( XML_p, XML_nvSpPr, FSEND );
-    WriteNonVisualDrawingProperties( xShape, IDS( PlaceHolder ) );
+    const OString aPlaceholderID("PlaceHolder " + OString::number(mnShapeIdMax++));
+    WriteNonVisualDrawingProperties( xShape, aPlaceholderID.getStr() );
     mpFS->startElementNS( XML_p, XML_cNvSpPr, FSEND );
     mpFS->singleElementNS( XML_a, XML_spLocks, XML_noGrp, "1", FSEND );
     mpFS->endElementNS( XML_p, XML_cNvSpPr );