[Libreoffice-commits] core.git: include/sfx2

[Stephan Bergmann]

 include/sfx2/sidebar/Accessible.hxx       |    9 +++------
 include/sfx2/sidebar/SidebarPanelBase.hxx |    4 ----
 include/sfx2/sidebar/Theme.hxx            |   12 ++++--------
 3 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit 4cae165f0b0655a158923012efd67e8becff6164
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 21 15:09:10 2016 +0100

    ODR violation (base class must be the same across compilation units)
    
    Change-Id: I2aa5fefad978f50f5166d75bbcfb25d88780d03d

diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx
index cb1d729..38c9fb7 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 b41a86c..6fe46dc 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 fc9921e..f457d74 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;