diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 15:09:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 15:09:10 +0100 |
| commit | 4cae165f0b0655a158923012efd67e8becff6164 (patch) | |
| tree | 620fc5b70f8fbdc82c43b7c4f5a44b2c1c72d558 /include | |
| parent | fe9a5a4b4ac260ebe7c582d2923f926ab9d9f294 (diff) | |
ODR violation (base class must be the same across compilation units)
Change-Id: I2aa5fefad978f50f5166d75bbcfb25d88780d03d
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sidebar/Accessible.hxx | 9 | ||||
| -rw-r--r-- | include/sfx2/sidebar/SidebarPanelBase.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/sidebar/Theme.hxx | 12 |
3 files changed, 7 insertions, 18 deletions
diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx index cb1d729e9053..38c9fb7fdf7c 100644 --- a/include/sfx2/sidebar/Accessible.hxx +++ b/include/sfx2/sidebar/Accessible.hxx @@ -25,12 +25,9 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -namespace -{ - typedef cppu::WeakComponentImplHelper < - css::accessibility::XAccessible - > AccessibleInterfaceBase; -} +typedef cppu::WeakComponentImplHelper < + css::accessibility::XAccessible + > AccessibleInterfaceBase; namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index b41a86c1e92b..6fe46dcb7c46 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -39,16 +39,12 @@ namespace vcl { class Window; } namespace sfx2 { namespace sidebar { -namespace -{ - typedef cppu::WeakComponentImplHelper<css::ui::XContextChangeEventListener, css::ui::XUIElement, css::ui::XToolPanel, css::ui::XSidebarPanel, css::ui::XUpdateModel> SidebarPanelBaseInterfaceBase; -} /** Base class for sidebar panels that provides some convenience functionality. diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index fc9921e5e206..f457d740ed9c 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -39,14 +39,10 @@ class SvBorder; namespace sfx2 { namespace sidebar { - -namespace -{ - typedef cppu::WeakComponentImplHelper < - css::beans::XPropertySet, - css::beans::XPropertySetInfo - > ThemeInterfaceBase; -} +typedef cppu::WeakComponentImplHelper < + css::beans::XPropertySet, + css::beans::XPropertySetInfo + > ThemeInterfaceBase; class Paint; |