diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-11 13:13:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-11 13:13:24 +0200 |
| commit | 4d3c88805d1917932ee88a0f22ae93c43e8e389a (patch) | |
| tree | fe311e9f21256b7491e09e0d4c64c87dbf955b8d | |
| parent | d4494c33e4114f194262c4ad202a3eafca41fba7 (diff) | |
Avoid ODR-violating name clash
Change-Id: I69c3b11b01d520a485b07c8e5397a7f971210af2
| -rw-r--r-- | svx/source/form/tabwin.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/table/XMLTableImport.cxx | 4 |
2 files changed, 7 insertions, 0 deletions
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: |