ODR violation (base class must be the same across compilation units)

Change-Id: Ieb98d8984c8d39fb72afbceccca29a2d402dc41e

19 files changed, 117 insertions, 155 deletions

diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 30866b9b9151..7bb26b8b78b1 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -45,13 +45,11 @@ namespace sdext { namespace presenter {
 class PresenterController;
 class PresenterTextView;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::accessibility::XAccessible,
-        css::lang::XInitialization,
-        css::awt::XFocusListener
-    > PresenterAccessibleInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::accessibility::XAccessible,
+    css::lang::XInitialization,
+    css::awt::XFocusListener
+> PresenterAccessibleInterfaceBase;
 
 class PresenterAccessible
     : public ::cppu::BaseMutex,
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index eac955e60b4a..37232cc363f0 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -38,14 +38,12 @@ namespace sdext { namespace presenter {
 
 class PresenterController;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener
-    > PresenterButtonInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener
+> PresenterButtonInterfaceBase;
 
 /** Button for the presenter screen.  It displays a text surrounded by a
     frame.
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 3b96626882ff..d9eef94da5b9 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -57,16 +57,14 @@ class PresenterPaneBorderPainter;
 class PresenterTheme;
 class PresenterWindowManager;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::drawing::framework::XConfigurationChangeListener,
-        css::frame::XFrameActionListener,
-        css::awt::XKeyListener,
-        css::awt::XFocusListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener
-    > PresenterControllerInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::drawing::framework::XConfigurationChangeListener,
+    css::frame::XFrameActionListener,
+    css::awt::XKeyListener,
+    css::awt::XFocusListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener
+> PresenterControllerInterfaceBase;
 
 /// Represents an element in the toolbar that shows the time elapsed since the presentation started.
 class IPresentationTime
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 545031343cc5..c68c6861c07a 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -31,11 +31,9 @@
 
 namespace sdext { namespace presenter {
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::presentation::XSlideShowListener
-    > PresenterCurrentSlideObserverInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::presentation::XSlideShowListener
+> PresenterCurrentSlideObserverInterfaceBase;
 
 /** Check periodically the slide show controller and the
     frame::XController whether the current slide has changed.  If so,
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index ee50c4c6fea5..3e068e484da7 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -31,18 +31,16 @@
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <memory>
 
-namespace {
-    typedef cppu::WeakComponentImplHelper<
-        css::drawing::framework::XView,
-        css::awt::XWindowListener,
-        css::awt::XPaintListener
-        > PresenterHelpViewInterfaceBase;
-}
-
 namespace sdext { namespace presenter {
 
 class PresenterButton;
 
+typedef cppu::WeakComponentImplHelper<
+    css::drawing::framework::XView,
+    css::awt::XWindowListener,
+    css::awt::XPaintListener
+    > PresenterHelpViewInterfaceBase;
+
 /** Show help text that describes the defined keys.
 */
 class PresenterHelpView
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index d7f1bbf3fab7..99976cc39461 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -39,22 +39,20 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace {
-    typedef cppu::WeakComponentImplHelper<
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::drawing::framework::XView,
-        css::drawing::XDrawView,
-        css::awt::XKeyListener
-        > PresenterNotesViewInterfaceBase;
-}
-
 namespace sdext { namespace presenter {
 
 class PresenterButton;
 class PresenterScrollBar;
 class PresenterTextView;
 
+typedef cppu::WeakComponentImplHelper<
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::drawing::framework::XView,
+    css::drawing::XDrawView,
+    css::awt::XKeyListener
+    > PresenterNotesViewInterfaceBase;
+
 /** A drawing framework view of the notes of a slide.  At the moment this is
     a simple text view that does not show the original formatting of the
     notes text.
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 7a00416cc17b..55704e8bace1 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -42,14 +42,12 @@ namespace sdext { namespace presenter {
 
 class PresenterController;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::drawing::framework::XPane,
-        css::lang::XInitialization,
-        css::awt::XWindowListener,
-        css::awt::XPaintListener
-    > PresenterPaneBaseInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::drawing::framework::XPane,
+    css::lang::XInitialization,
+    css::awt::XWindowListener,
+    css::awt::XPaintListener
+> PresenterPaneBaseInterfaceBase;
 
 /** Base class of the panes used by the presenter screen.  Pane objects are
     stored in the PresenterPaneContainer.  Sizes and positions are
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 22f55340f2c0..f50b8a2c4cb3 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -36,11 +36,9 @@ namespace sdext { namespace presenter {
 class PresenterPane;
 class PresenterTheme;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper<
-        css::drawing::framework::XPaneBorderPainter
-    > PresenterPaneBorderPainterInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper<
+    css::drawing::framework::XPaneBorderPainter
+> PresenterPaneBorderPainterInterfaceBase;
 
 /** This class is responsible for painting window borders of PresenterPane
     objects.
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index ef84dce83c3f..6961a07bd00f 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -43,11 +43,9 @@ namespace sdext { namespace presenter {
 class PresenterPaneBase;
 class PresenterSprite;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::lang::XEventListener
-    > PresenterPaneContainerInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::lang::XEventListener
+> PresenterPaneContainerInterfaceBase;
 
 /** This class could also be called PresenterPaneAndViewContainer because it
     stores not only references to all panes that belong to the presenter
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index b3aea590eb8e..ea39e6cf1b01 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -37,11 +37,9 @@ namespace sdext { namespace presenter {
 
 class PresenterController;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::drawing::framework::XResourceFactory
-    > PresenterPaneFactoryInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::drawing::framework::XResourceFactory
+> PresenterPaneFactoryInterfaceBase;
 
 /** The PresenterPaneFactory provides a fixed set of panes.
 
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index 5f939a5e55f0..ed94385bb2be 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -31,13 +31,11 @@
 
 namespace sdext { namespace presenter {
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::lang::XInitialization,
-        css::lang::XServiceInfo,
-        css::frame::XDispatchProvider
-    > PresenterProtocolHandlerInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::lang::XInitialization,
+    css::lang::XServiceInfo,
+    css::frame::XDispatchProvider
+> PresenterProtocolHandlerInterfaceBase;
 
 class PresenterController;
 
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index e168ef9f02a3..53f234d45d39 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -39,14 +39,12 @@ namespace sdext { namespace presenter {
 
 class PresenterController;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::task::XJob
-        > PresenterScreenJobInterfaceBase;
-    typedef ::cppu::WeakComponentImplHelper <
-        css::lang::XEventListener
-        > PresenterScreenInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::task::XJob
+    > PresenterScreenJobInterfaceBase;
+typedef ::cppu::WeakComponentImplHelper <
+    css::lang::XEventListener
+    > PresenterScreenInterfaceBase;
 
 /** The PresenterScreenJob service is instantiated every time a document is
     created or loaded.  In its execute() method it then filters out all
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 7706ce4ea5aa..26341835c7ea 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -37,14 +37,12 @@ namespace sdext { namespace presenter {
 class PresenterCanvasHelper;
 class PresenterPaintManager;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener
-    > PresenterScrollBarInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener
+> PresenterScrollBarInterfaceBase;
 
 /** Base class of horizontal and vertical scroll bars.
 */
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index 489f27b527a3..a3460d43eaec 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -39,14 +39,12 @@
 
 namespace sdext { namespace presenter {
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::drawing::framework::XView,
-        css::drawing::XDrawView,
-        css::awt::XPaintListener,
-        css::awt::XWindowListener
-    > PresenterSlidePreviewInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::drawing::framework::XView,
+    css::drawing::XDrawView,
+    css::awt::XPaintListener,
+    css::awt::XWindowListener
+> PresenterSlidePreviewInterfaceBase;
 
 /** Static preview of a slide.  Typically used for the preview of the next
     slide.
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index a72119c87fff..1debbf705434 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -42,17 +42,15 @@
 
 namespace sdext { namespace presenter {
 
-namespace {
-    typedef cppu::WeakComponentImplHelper<
-        css::presentation::XSlideShowView,
-        css::awt::XPaintListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener,
-        css::awt::XWindowListener,
-        css::drawing::framework::XView,
-        css::drawing::XDrawView
-        > PresenterSlideShowViewInterfaceBase;
-}
+typedef cppu::WeakComponentImplHelper<
+    css::presentation::XSlideShowView,
+    css::awt::XPaintListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener,
+    css::awt::XWindowListener,
+    css::drawing::framework::XView,
+    css::drawing::XDrawView
+    > PresenterSlideShowViewInterfaceBase;
 
 /** Life view in a secondary window of a full screen slide show.
 */
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 997ff86bbd8a..353760f98fa1 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -38,24 +38,22 @@
 #include <com/sun/star/rendering/XSprite.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 
-namespace {
-    typedef cppu::WeakComponentImplHelper<
-        css::drawing::framework::XView,
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::beans::XPropertyChangeListener,
-        css::drawing::XSlidePreviewCacheListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener,
-        css::drawing::XDrawView
-        > PresenterSlideSorterInterfaceBase;
-}
-
 namespace sdext { namespace presenter {
 
 class PresenterButton;
 class PresenterScrollBar;
 
+typedef cppu::WeakComponentImplHelper<
+    css::drawing::framework::XView,
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::beans::XPropertyChangeListener,
+    css::drawing::XSlidePreviewCacheListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener,
+    css::drawing::XDrawView
+    > PresenterSlideSorterInterfaceBase;
+
 /** A simple slide sorter for the presenter screen.  It uses a preview cache
     to create the slide previews.  Painting is done via a canvas.
 */
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 76a07e6a51b4..fea18534f113 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -45,24 +45,22 @@
 
 #include <functional>
 
-namespace {
-    typedef cppu::WeakComponentImplHelper<
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::awt::XMouseListener,
-        css::awt::XMouseMotionListener,
-        css::drawing::XDrawView
-        > PresenterToolBarInterfaceBase;
-
-    typedef cppu::WeakComponentImplHelper<
-        css::awt::XPaintListener,
-        css::drawing::framework::XView,
-        css::drawing::XDrawView
-        > PresenterToolBarViewInterfaceBase;
-}
-
 namespace sdext { namespace presenter {
 
+typedef cppu::WeakComponentImplHelper<
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::awt::XMouseListener,
+    css::awt::XMouseMotionListener,
+    css::drawing::XDrawView
+    > PresenterToolBarInterfaceBase;
+
+typedef cppu::WeakComponentImplHelper<
+    css::awt::XPaintListener,
+    css::drawing::framework::XView,
+    css::drawing::XDrawView
+    > PresenterToolBarViewInterfaceBase;
+
 /** A simple tool bar that can display bitmapped buttons and labels.  At the
     moment there are buttons for moving to the next and previous slide and
     to the next effect.  A label displays the index of the current slide
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index f0f959601f0a..0b62d439df78 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -34,11 +34,9 @@
 
 namespace sdext { namespace presenter {
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper <
-        css::drawing::framework::XResourceFactory
-    > PresenterViewFactoryInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper <
+    css::drawing::framework::XResourceFactory
+> PresenterViewFactoryInterfaceBase;
 
 /** Base class for presenter views that allows the view factory to store
     them in a cache and reuse deactivated views.
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 1724da476515..0dbdac35b110 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -47,14 +47,12 @@ class PresenterController;
 class PresenterPaneBorderPainter;
 class PresenterTheme;
 
-namespace {
-    typedef ::cppu::WeakComponentImplHelper<
-        css::awt::XWindowListener,
-        css::awt::XPaintListener,
-        css::awt::XMouseListener,
-        css::awt::XFocusListener
-    > PresenterWindowManagerInterfaceBase;
-}
+typedef ::cppu::WeakComponentImplHelper<
+    css::awt::XWindowListener,
+    css::awt::XPaintListener,
+    css::awt::XMouseListener,
+    css::awt::XFocusListener
+> PresenterWindowManagerInterfaceBase;
 
 /** A simple manager of the positions of the panes of the presenter screen.
     Uses relative coordinates of the four sides of each pane.  Allows panes