From 4d3c88805d1917932ee88a0f22ae93c43e8e389a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 11 Sep 2014 13:13:24 +0200
Subject: Avoid ODR-violating name clash

Change-Id: I69c3b11b01d520a485b07c8e5397a7f971210af2
---
 svx/source/form/tabwin.cxx             | 3 +++
 xmloff/source/table/XMLTableImport.cxx | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 12baa61a787e..58b357b31f14 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -71,6 +71,7 @@ using namespace ::com::sun::star;
 using namespace ::svxform;
 using namespace ::svx;
 
+namespace {
 
 struct ColumnInfo
 {
@@ -83,6 +84,8 @@ struct ColumnInfo
     }
 };
 
+}
+
 static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
 {
     uno::Sequence< OUString > aEntries = i_xColumns->getElementNames();
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 798a9e3f438f..3b376181458f 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -51,6 +51,8 @@ using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
+namespace {
+
 struct ColumnInfo
 {
     OUString msStyleName;
@@ -58,6 +60,8 @@ struct ColumnInfo
     OUString msDefaultCellStyleName;
 };
 
+}
+
 class XMLProxyContext : public SvXMLImportContext
 {
 public:
-- 
cgit