diff options
Diffstat (limited to 'sdext/source/presenter')
29 files changed, 56 insertions, 61 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 94d002ce5758..d94a3fc94c5e 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -37,9 +37,8 @@ #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <cppuhelper/compbase1.hxx> -#include <cppuhelper/compbase5.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/bind.hpp> using namespace ::com::sun::star; @@ -52,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework; namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper5 < + typedef ::cppu::WeakComponentImplHelper < css::accessibility::XAccessible, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleComponent, @@ -226,7 +225,7 @@ protected: //===== AccessibleStateSet ==================================================== namespace { -typedef ::cppu::WeakComponentImplHelper1 < +typedef ::cppu::WeakComponentImplHelper < css::accessibility::XAccessibleStateSet > AccessibleStateSetInterfaceBase; } @@ -262,7 +261,7 @@ private: //===== AccessibleRelationSet ================================================= namespace { -typedef ::cppu::WeakComponentImplHelper1 < +typedef ::cppu::WeakComponentImplHelper < css::accessibility::XAccessibleRelationSet > AccessibleRelationSetInterfaceBase; } @@ -300,7 +299,7 @@ private: //===== PresenterAccessibleParagraph ========================================== namespace { -typedef ::cppu::ImplInheritanceHelper1 < +typedef ::cppu::ImplInheritanceHelper < PresenterAccessible::AccessibleObject, css::accessibility::XAccessibleText > PresenterAccessibleParagraphInterfaceBase; diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index ad4f88bfac93..fb5eac8f3f12 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/drawing/framework/XPane2.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> @@ -46,7 +46,7 @@ class PresenterController; class PresenterTextView; namespace { - typedef ::cppu::WeakComponentImplHelper3 < + typedef ::cppu::WeakComponentImplHelper < css::accessibility::XAccessible, css::lang::XInitialization, css::awt::XFocusListener diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 5af832883ddc..2ec4cc485728 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> #include <rtl/ref.hxx> @@ -40,7 +40,7 @@ namespace sdext { namespace presenter { class PresenterController; namespace { - typedef ::cppu::WeakComponentImplHelper4 < + typedef ::cppu::WeakComponentImplHelper < css::awt::XWindowListener, css::awt::XPaintListener, css::awt::XMouseListener, diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index ad1356e62c33..9f9a9447de07 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -24,7 +24,7 @@ #include "PresenterPaneContainer.hxx" #include "PresenterTheme.hxx" #include "PresenterSprite.hxx" -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/XFocusListener.hpp> @@ -58,7 +58,7 @@ class PresenterTheme; class PresenterWindowManager; namespace { - typedef ::cppu::WeakComponentImplHelper6 < + typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeListener, css::frame::XFrameActionListener, css::awt::XKeyListener, diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 1e9848269222..57c0c90d1a55 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/frame/XController.hpp> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> #include <salhelper/timer.hxx> @@ -32,7 +32,7 @@ namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::presentation::XSlideShowListener > PresenterCurrentSlideObserverInterfaceBase; } diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index edc9481605cf..64e4e71f7e53 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> @@ -31,7 +31,7 @@ namespace sdext { namespace presenter { -typedef ::cppu::WeakComponentImplHelper1 < +typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeListener > PresenterFrameworkObserverInterfaceBase; diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 7792d79389b9..d2cc595e349a 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -22,7 +22,7 @@ #include "PresenterController.hxx" #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/drawing/framework/XView.hpp> @@ -32,7 +32,7 @@ #include <boost/scoped_ptr.hpp> namespace { - typedef cppu::WeakComponentImplHelper3< + typedef cppu::WeakComponentImplHelper< css::drawing::framework::XView, css::awt::XWindowListener, css::awt::XPaintListener diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 322dbfab1427..057a18e72323 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -24,7 +24,7 @@ #include "PresenterToolBar.hxx" #include "PresenterViewFactory.hxx" #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/awt/XButton.hpp> @@ -40,7 +40,7 @@ #include <boost/shared_ptr.hpp> namespace { - typedef cppu::WeakComponentImplHelper5< + typedef cppu::WeakComponentImplHelper< css::awt::XWindowListener, css::awt::XPaintListener, css::drawing::framework::XView, diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 700c440c78bd..f93d6c1d7846 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -22,7 +22,7 @@ #include "PresenterTheme.hxx" #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/awt/XMouseMotionListener.hpp> @@ -44,7 +44,7 @@ namespace sdext { namespace presenter { class PresenterController; namespace { - typedef ::cppu::WeakComponentImplHelper4 < + typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XPane, css::lang::XInitialization, css::awt::XWindowListener, diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index b5a09797f278..f8d8c3f5597b 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <cppuhelper/compbase1.hxx> #include <osl/mutex.hxx> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index d69cbc1f709f..6d81840ccecb 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -26,7 +26,7 @@ #ifdef ENABLE_PANE_RESIZING #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/XGraphics.hpp> @@ -48,7 +48,7 @@ namespace sdext { namespace presenter { class PresenterController; namespace { - typedef ::cppu::WeakComponentImplHelper3 < + typedef ::cppu::WeakComponentImplHelper < css::lang::XInitialization, css::awt::XMouseListener, css::awt::XMouseMotionListener diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 79d4a3dd3e4f..f7c74d6f8a6f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/awt/XGraphics.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -39,7 +39,7 @@ class PresenterPane; class PresenterTheme; namespace { - typedef ::cppu::WeakComponentImplHelper1< + typedef ::cppu::WeakComponentImplHelper< css::drawing::framework::XPaneBorderPainter > PresenterPaneBorderPainterInterfaceBase; } diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 03704b9910a6..ced20baf6e25 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/Color.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> @@ -46,7 +46,7 @@ class PresenterPaneBase; class PresenterSprite; namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::lang::XEventListener > PresenterPaneContainerInterfaceBase; } diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 98bf788d107b..ec53e017a66f 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -38,7 +38,7 @@ namespace sdext { namespace presenter { class PresenterController; namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XResourceFactory > PresenterPaneFactoryInterfaceBase; } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 8d5d3be89e78..fa5a535e912b 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -165,7 +165,7 @@ namespace { } // end of anonymous namespace namespace { - typedef ::cppu::WeakComponentImplHelper2 < + typedef ::cppu::WeakComponentImplHelper < css::frame::XDispatch, css::document::XEventListener > PresenterDispatchInterfaceBase; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 110b351eca00..075764d29040 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/document/XEventBroadcaster.hpp> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <vcl/svapp.hxx> @@ -51,7 +52,7 @@ using namespace ::com::sun::star::drawing::framework; namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::document::XEventListener > PresenterScreenListenerInterfaceBase; diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 44931fbbcfaf..b523c22289c9 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -22,7 +22,7 @@ #include "PresenterConfigurationAccess.hxx" #include "PresenterPaneContainer.hxx" -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XController.hpp> @@ -41,10 +41,10 @@ namespace sdext { namespace presenter { class PresenterController; namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::task::XJob > PresenterScreenJobInterfaceBase; - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::lang::XEventListener > PresenterScreenInterfaceBase; } diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 5e91d20ca019..5a7389f5a25a 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> @@ -41,7 +41,7 @@ class PresenterCanvasHelper; class PresenterPaintManager; namespace { - typedef ::cppu::WeakComponentImplHelper4 < + typedef ::cppu::WeakComponentImplHelper < css::awt::XWindowListener, css::awt::XPaintListener, css::awt::XMouseListener, diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index f3b2c8432083..afe809d64361 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -35,13 +35,13 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper4 < + typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XView, css::drawing::XDrawView, css::awt::XPaintListener, diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index bce135ef4ac5..05c3352b88c9 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/Color.hpp> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/basemutex.hxx> #include <boost/noncopyable.hpp> @@ -44,7 +44,7 @@ namespace sdext { namespace presenter { namespace { - typedef cppu::WeakComponentImplHelper7< + typedef cppu::WeakComponentImplHelper< css::presentation::XSlideShowView, css::awt::XPaintListener, css::awt::XMouseListener, diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index abbe11c9c06f..109778701b05 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -24,7 +24,7 @@ #include "PresenterPaneContainer.hxx" #include "PresenterViewFactory.hxx" #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase8.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> @@ -39,7 +39,7 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> namespace { - typedef cppu::WeakComponentImplHelper8< + typedef cppu::WeakComponentImplHelper< css::drawing::framework::XView, css::awt::XWindowListener, css::awt::XPaintListener, diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 64c9a9eea6ba..6174e449b1e2 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> #include <rtl/ref.hxx> #include <boost/shared_ptr.hpp> diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 3b5fea741932..e9acc4328049 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <functional> diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index e7bd6164f615..9b1249b7bc6c 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/awt/XCallback.hpp> #include <com/sun/star/awt/XRequestCallback.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> #include <osl/time.h> #include <rtl/ref.hxx> @@ -65,7 +65,7 @@ public: static void CancelTask (const sal_Int32 nTaskId); }; -typedef cppu::WeakComponentImplHelper1< +typedef cppu::WeakComponentImplHelper< css::awt::XCallback > PresenterClockTimerInterfaceBase; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index d1da37eff87d..406c94a20720 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -30,7 +30,7 @@ #include "PresenterTimer.hxx" #include "PresenterWindowManager.hxx" -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> @@ -121,7 +121,7 @@ public: //===== PresenterToolBar::Element ============================================= namespace { - typedef cppu::WeakComponentImplHelper2< + typedef cppu::WeakComponentImplHelper< css::document::XEventListener, css::frame::XStatusListener > ElementInterfaceBase; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index a249d018b5f6..c76a62bf6253 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -24,8 +24,7 @@ #include "PresenterViewFactory.hxx" #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase3.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/awt/XButton.hpp> @@ -49,7 +48,7 @@ #include <functional> namespace { - typedef cppu::WeakComponentImplHelper5< + typedef cppu::WeakComponentImplHelper< css::awt::XWindowListener, css::awt::XPaintListener, css::awt::XMouseListener, @@ -57,7 +56,7 @@ namespace { css::drawing::XDrawView > PresenterToolBarInterfaceBase; - typedef cppu::WeakComponentImplHelper3< + typedef cppu::WeakComponentImplHelper< css::awt::XPaintListener, css::drawing::framework::XView, css::drawing::XDrawView diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index ab884974acc6..d7677105ca54 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/drawing/XSlideSorterBase.hpp> #include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp> -#include <cppuhelper/compbase1.hxx> #include <boost/bind.hpp> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index b75236438cd5..48a369e5de6c 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERVIEWFACTORY_HXX #include "PresenterController.hxx" -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> @@ -35,7 +35,7 @@ namespace sdext { namespace presenter { namespace { - typedef ::cppu::WeakComponentImplHelper1 < + typedef ::cppu::WeakComponentImplHelper < css::drawing::framework::XResourceFactory > PresenterViewFactoryInterfaceBase; } diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 9f25fbbb9cc6..22d84019be8d 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> @@ -49,7 +49,7 @@ class PresenterPaneBorderPainter; class PresenterTheme; namespace { - typedef ::cppu::WeakComponentImplHelper4< + typedef ::cppu::WeakComponentImplHelper< css::awt::XWindowListener, css::awt::XPaintListener, css::awt::XMouseListener, |