summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-11 13:05:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-11 13:06:05 +0200
commitd4494c33e4114f194262c4ad202a3eafca41fba7 (patch)
tree43b4c21780e1d4ca257a665077087c3a64ad33ed
parent0968e47b7190832c6c06c0aa38f8da129660f854 (diff)
Avoid ODR-violating name clash
Change-Id: I4911dcb5d902a5b92d4c175054acd220e449459d
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx4
2 files changed, 8 insertions, 0 deletions
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 92c97059ba28..939b48ba5e48 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -41,6 +41,8 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
+namespace {
+
struct XMLServiceMapEntry_Impl
{
enum XMLTokenEnum eClass;
@@ -48,6 +50,8 @@ struct XMLServiceMapEntry_Impl
sal_Int32 nFilterServiceLen;
};
+}
+
#define SERVICE_MAP_ENTRY( cls, app ) \
{ XML_##cls, \
XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1122dfc7ebd9..d704318f9ea6 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -114,6 +114,8 @@ sal_Char const sXML_1_2[] = "1.2";
#define XML_USEPRETTYPRINTING "UsePrettyPrinting"
+namespace {
+
struct XMLServiceMapEntry_Impl
{
const sal_Char *sModelService;
@@ -122,6 +124,8 @@ struct XMLServiceMapEntry_Impl
sal_Int32 nFilterServiceLen;
};
+}
+
#define SERVICE_MAP_ENTRY( app ) \
{ XML_MODEL_SERVICE_##app, sizeof(XML_MODEL_SERVICE_##app)-1, \
XML_EXPORT_FILTER_##app, sizeof(XML_EXPORT_FILTER_##app)-1 }