Avoid ODR-violating name clash

Change-Id: I4911dcb5d902a5b92d4c175054acd220e449459d

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 }