summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx4
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterView.hxx4
-rw-r--r--sd/source/ui/inc/DocumentRenderer.hxx4
-rw-r--r--sd/source/ui/inc/DrawController.hxx4
-rw-r--r--sd/source/ui/inc/DrawSubController.hxx6
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx4
-rw-r--r--sd/source/ui/inc/framework/ConfigurationController.hxx4
-rw-r--r--sd/source/ui/inc/framework/ModuleController.hxx4
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx4
-rw-r--r--sd/source/ui/inc/framework/PresentationFactory.hxx4
-rw-r--r--sd/source/ui/inc/framework/ViewShellWrapper.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx4
-rw-r--r--sd/source/ui/inc/tools/PropertySet.hxx4
-rw-r--r--sd/source/ui/inc/tools/SlotStateListener.hxx4
-rw-r--r--sd/source/ui/inc/unomodel.hxx11
-rw-r--r--sd/source/ui/inc/unopage.hxx4
-rw-r--r--sd/source/ui/inc/unosrch.hxx9
17 files changed, 39 insertions, 45 deletions
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 9464ac14de06..c183f7b0df54 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLESLIDESORTEROBJECT_HXX
#include "MutexOwner.hxx"
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -39,7 +39,7 @@ class SlideSorter;
namespace accessibility {
-typedef ::cppu::WeakComponentImplHelper5<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index f1ac5a189f33..92c2918b4aa5 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_ACCESSIBLESLIDESORTERVIEW_HXX
#include "MutexOwner.hxx"
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -45,7 +45,7 @@ namespace accessibility {
class AccessibleSlideSorterObject;
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index 77a5d1d8f525..fae3d8dbe6fb 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -23,14 +23,14 @@
#include "ViewShellBase.hxx"
#include <com/sun/star/view/XRenderable.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/scoped_ptr.hpp>
namespace sd {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::view::XRenderable
> DocumentRendererInterfaceBase;
}
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 6bdf397e5f7e..8281b7aeadf0 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/weakbase.hxx>
#include <memory>
#include <vector>
@@ -43,7 +43,7 @@
namespace sd {
-typedef ::cppu::ImplInheritanceHelper7 <
+typedef ::cppu::ImplInheritanceHelper <
SfxBaseController,
::com::sun::star::view::XSelectionSupplier,
::com::sun::star::lang::XServiceInfo,
diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx
index fbb757ee6087..4f9d90a6883d 100644
--- a/sd/source/ui/inc/DrawSubController.hxx
+++ b/sd/source/ui/inc/DrawSubController.hxx
@@ -22,17 +22,17 @@
#include <com/sun/star/drawing/XDrawSubController.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
namespace sd {
- class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper2<
+ class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper<
::com::sun::star::drawing::XDrawSubController,
::com::sun::star::lang::XServiceInfo >
{
public:
DrawSubControllerInterfaceBase( ::osl::Mutex& aMutex )
- : ::cppu::WeakComponentImplHelper2<
+ : ::cppu::WeakComponentImplHelper<
::com::sun::star::drawing::XDrawSubController,
::com::sun::star::lang::XServiceInfo >( aMutex ) {}
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index c50ce4d8c1ba..d298fd5b3f5c 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <vcl/tabctrl.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include "MutexOwner.hxx"
#include <vector>
@@ -41,7 +41,7 @@ namespace sd {
}
namespace {
- typedef ::cppu::WeakComponentImplHelper4 <
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XToolBar,
::com::sun::star::drawing::framework::XTabBar,
::com::sun::star::drawing::framework::XConfigurationChangeListener,
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 45f82cfe4127..c9802c72db37 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
#include <boost/scoped_ptr.hpp>
@@ -41,7 +41,7 @@
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationController,
css::lang::XInitialization
> ConfigurationControllerInterfaceBase;
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 525fabc9a639..d9541a91e4bf 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -27,14 +27,14 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XController.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
#include <set>
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XModuleController,
css::lang::XInitialization
> ModuleControllerInterfaceBase;
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index a38ae7bb1103..1fb4586380e0 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/drawing/framework/XPane2.hpp>
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <vcl/vclptr.hxx>
@@ -36,7 +36,7 @@ namespace vcl { class Window; }
namespace {
-typedef ::cppu::WeakComponentImplHelper3 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XPane,
::com::sun::star::drawing::framework::XPane2,
::com::sun::star::lang::XUnoTunnel
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index f07edf30899e..94a6eb0658b7 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -29,14 +29,14 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory,
css::drawing::framework::XConfigurationChangeListener
> PresentationFactoryInterfaceBase;
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 5b384485c13f..39ece9828542 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -27,14 +27,14 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase5.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/shared_ptr.hpp>
namespace {
-typedef ::cppu::WeakComponentImplHelper5 < ::com::sun::star::lang::XUnoTunnel
+typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::awt::XWindowListener
, ::com::sun::star::view::XSelectionSupplier
, ::com::sun::star::drawing::framework::XRelocatableResource
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 59454e6a9be1..67ce818be7fa 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -27,7 +27,7 @@
#include <tools/link.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <editeng/unoipset.hxx>
@@ -78,7 +78,7 @@ enum AnimationMode
ANIMATIONMODE_PREVIEW
};
-typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::presentation::XPresentation2, ::com::sun::star::lang::XServiceInfo > SlideshowBase;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::presentation::XPresentation2, ::com::sun::star::lang::XServiceInfo > SlideshowBase;
class SlideShow : private ::cppu::BaseMutex, public SlideshowBase
{
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index e44224377df8..67ce4097bf50 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SD_SOURCE_UI_INC_TOOLS_PROPERTYSET_HXX
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <boost/scoped_ptr.hpp>
#include <map>
@@ -29,7 +29,7 @@
namespace sd { namespace tools {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::beans::XPropertySet
> PropertySetInterfaceBase;
}
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 37c78e703ec1..0983d6b9967b 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -27,12 +27,12 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <tools/link.hxx>
namespace sd { namespace tools {
-typedef cppu::WeakComponentImplHelper1<
+typedef cppu::WeakComponentImplHelper<
::com::sun::star::frame::XStatusListener
> SlotStateListenerInterfaceBase;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index f77cc5bbd2e2..6aff89c83444 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -50,6 +50,7 @@
#include <editeng/unoipset.hxx>
#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sddllapi.h>
class SdDrawDocument;
@@ -274,9 +275,7 @@ public:
* *
***********************************************************************/
-#include <cppuhelper/implbase4.hxx>
-
-class SdDrawPagesAccess : public ::cppu::WeakImplHelper4< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent >
+class SdDrawPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent >
{
private:
SdXImpressDocument* mpModel;
@@ -317,9 +316,7 @@ public:
* *
***********************************************************************/
-#include <cppuhelper/implbase3.hxx>
-
-class SdMasterPagesAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent >
+class SdMasterPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent >
{
private:
SdXImpressDocument* mpModel;
@@ -357,7 +354,7 @@ public:
* *
***********************************************************************/
-class SdDocLinkTargets : public ::cppu::WeakImplHelper3< ::com::sun::star::container::XNameAccess,
+class SdDocLinkTargets : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XComponent >
{
private:
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 350492431ba9..99be5f8c0179 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -282,9 +282,9 @@ public:
/***********************************************************************
* *
***********************************************************************/
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-class SdPageLinkTargets : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess,
+class SdPageLinkTargets : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XServiceInfo >
{
private:
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 13b183ecd2d2..6b9705bfc073 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <editeng/editdata.hxx>
#include <editeng/unoipset.hxx>
@@ -73,9 +74,7 @@ public:
/** this class holds the parameters and status of a search or replace operation performed
by class SdUnoSearchReplaceShape */
-#include <cppuhelper/implbase2.hxx>
-
-class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XReplaceDescriptor > // public ::com::sun::star::util::XSearchDescriptor, ::com::sun::star::beans::XPropertySet
+class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XReplaceDescriptor > // public ::com::sun::star::util::XSearchDescriptor, ::com::sun::star::beans::XPropertySet
{
protected:
SvxItemPropertySet* mpPropSet;
@@ -119,11 +118,9 @@ public:
/* ================================================================= */
-#include <cppuhelper/implbase1.hxx>
-
/** this class holds a sequence that is a result from a find all and
lets people access it through the XIndexAccess Interface. */
-class SdUnoFindAllAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess > // public ::com::sun::star::container::XElementAccess
+class SdUnoFindAllAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess > // public ::com::sun::star::container::XElementAccess
{
protected:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > maSequence;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 18:10:42 +0000