diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 14:54:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-21 14:55:54 +0100 |
| commit | 9bb574590ef99782c50212feffbcf82e1944a217 (patch) | |
| tree | 9ba51bfa86a94336313cff5e4b31d717ebcea04f /chart2 | |
| parent | 263bec579fb5045d2e50a027778a0aec17c70f4b (diff) | |
ODR violation (base class must be the same across compilation units)
Change-Id: I6e386574d0366ef75f24811266134d93b28dc3a5
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/inc/ChartToolbarController.hxx | 4 | ||||
| -rw-r--r-- | chart2/source/controller/sidebar/Chart2PanelFactory.hxx | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx index 00d86a6fc597..7a11bc5880fa 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 aebf987830f9..6fe6b4afc209 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, |