Skip to content

C
core
Kaydet (Commit) 4d3c8880 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Avoid ODR-violating name clash 

Change-Id: I69c3b11b01d520a485b07c8e5397a7f971210af2
üst d4494c33
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
svx/source/form/tabwin.cxx
Dosyayı görüntüle @ 4d3c8880
...@@ -71,6 +71,7 @@ using namespace ::com::sun::star; ...@@ -71,6 +71,7 @@ using namespace ::com::sun::star;
using namespace ::svxform; using namespace ::svxform;
using namespace ::svx; using namespace ::svx;
namespace {
struct ColumnInfo struct ColumnInfo
{ {
...@@ -83,6 +84,8 @@ struct ColumnInfo ...@@ -83,6 +84,8 @@ struct ColumnInfo
} }
}; };
}
static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
{ {
uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); uno::Sequence< OUString > aEntries = i_xColumns->getElementNames();
......
xmloff/source/table/XMLTableImport.cxx
Dosyayı görüntüle @ 4d3c8880
...@@ -51,6 +51,8 @@ using namespace ::com::sun::star::style; ...@@ -51,6 +51,8 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
namespace {
struct ColumnInfo struct ColumnInfo
{ {
OUString msStyleName; OUString msStyleName;
...@@ -58,6 +60,8 @@ struct ColumnInfo ...@@ -58,6 +60,8 @@ struct ColumnInfo
OUString msDefaultCellStyleName; OUString msDefaultCellStyleName;
}; };
}
class XMLProxyContext : public SvXMLImportContext class XMLProxyContext : public SvXMLImportContext
{ {
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment