[Libreoffice-commits] core.git: chart2/source

[Stephan Bergmann]

 chart2/source/controller/inc/ChartToolbarController.hxx |    4 ----
 chart2/source/controller/sidebar/Chart2PanelFactory.hxx |    9 +++------
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 9bb574590ef99782c50212feffbcf82e1944a217
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 21 14:54:50 2016 +0100

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

diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx
index 00d86a6..7a11bc5 100644
--- a/chart2/source/controller/inc/ChartToolbarController.hxx
+++ b/chart2/source/controller/inc/ChartToolbarController.hxx
@@ -23,15 +23,11 @@
 
 namespace chart {
 
-namespace {
-
 typedef cppu::WeakComponentImplHelper<
     css::frame::XToolbarController, css::frame::XStatusListener,
     css::util::XUpdatable, css::lang::XInitialization,
     css::lang::XServiceInfo> ChartToolbarControllerBase;
 
-}
-
 class ChartToolbarController : private cppu::BaseMutex,
                                public ChartToolbarControllerBase
 {
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
index aebf987..6fe6b4a 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
@@ -28,12 +28,9 @@
 
 namespace chart { namespace sidebar {
 
-namespace
-{
-    typedef ::cppu::WeakComponentImplHelper <
-        css::ui::XUIElementFactory, css::lang::XServiceInfo
-        > PanelFactoryInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::ui::XUIElementFactory, css::lang::XServiceInfo
+    > PanelFactoryInterfaceBase;
 
 class ChartPanelFactory
     : private ::cppu::BaseMutex,