[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sd/source

[Tamás Zolnai]

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

New commits:
commit 66257ee2df8b039affe2022f2ce8dfcba8ee8e2b
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Mon Jul 31 11:50:14 2017 +0200

    Windows build fix: ambigous symbol
    
    Caused by:
    ae86557de53a8762924f18c78a556e2d6881002a
    
    These namespaces were removed from the cxx file, but not from the header.
    
    Change-Id: I5bae177638f0c9d404aac0fa4577689965ef5c26
    Reviewed-on: https://gerrit.libreoffice.org/40585
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 68b8372f2777..1a54791bb5b7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -106,6 +106,10 @@ void dump_pset(Reference< XPropertySet > const & rXPropSet);
 
 #define IDS(x) OString(OStringLiteral(#x " ") + OString::number( mnShapeIdMax++ )).getStr()
 
+namespace oox {
+    using namespace drawingml;
+    namespace core {
+
 class PowerPointShapeExport : public ShapeExport
 {
     PowerPointExport&   mrExport;
@@ -2332,6 +2336,9 @@ OUString PowerPointExport::getImplementationName() throw (css::uno::RuntimeExcep
     return OUString("com.sun.star.comp.Impress.oox.PowerPointExport");
 }
 
+}
+}
+
 // UNO component
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL
 css_comp_Impress_oox_PowerPointExport(uno::XComponentContext* rxCtxt,