[Libreoffice-commits] core.git: sd/inc sd/source sd/workben
Takeshi Abe
tabe at fixedpoint.jp
Mon Aug 31 00:15:12 PDT 2015
sd/inc/pch/precompiled_sd.hxx | 10 +-------
sd/inc/stlfamily.hxx | 4 +--
sd/inc/stlpool.hxx | 5 +---
sd/inc/stlsheet.hxx | 4 +--
sd/source/core/CustomAnimationEffect.cxx | 4 +--
sd/source/core/annotations/Annotation.cxx | 12 +++++-----
sd/source/core/annotations/AnnotationEnumeration.cxx | 4 +--
sd/source/filter/grf/sdgrffilter.cxx | 4 +--
sd/source/filter/html/HtmlOptionsDialog.cxx | 4 +--
sd/source/ui/annotations/annotationmanager.cxx | 2 -
sd/source/ui/annotations/annotationmanagerimpl.hxx | 6 ++---
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 4 +--
sd/source/ui/dlg/filedlg.cxx | 1
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx | 4 +--
sd/source/ui/framework/configuration/UpdateRequest.hxx | 4 +--
sd/source/ui/framework/factories/BasicPaneFactory.hxx | 4 +--
sd/source/ui/framework/factories/BasicToolBarFactory.hxx | 4 +--
sd/source/ui/framework/factories/BasicViewFactory.hxx | 4 +--
sd/source/ui/framework/factories/ChildWindowPane.hxx | 4 +--
sd/source/ui/framework/factories/PresentationFactory.cxx | 6 ++---
sd/source/ui/framework/module/CenterViewFocusModule.hxx | 4 +--
sd/source/ui/framework/module/ResourceManager.hxx | 4 +--
sd/source/ui/framework/module/ShellStackGuard.hxx | 4 +--
sd/source/ui/framework/module/ToolBarModule.hxx | 4 +--
sd/source/ui/framework/module/ViewTabBarModule.hxx | 4 +--
sd/source/ui/framework/tools/FrameworkHelper.cxx | 8 +++---
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 4 +--
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 4 +--
sd/source/ui/inc/DocumentRenderer.hxx | 4 +--
sd/source/ui/inc/DrawController.hxx | 4 +--
sd/source/ui/inc/DrawSubController.hxx | 6 ++---
sd/source/ui/inc/ViewTabBar.hxx | 4 +--
sd/source/ui/inc/framework/ConfigurationController.hxx | 4 +--
sd/source/ui/inc/framework/ModuleController.hxx | 4 +--
sd/source/ui/inc/framework/Pane.hxx | 4 +--
sd/source/ui/inc/framework/PresentationFactory.hxx | 4 +--
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 6 ++---
sd/source/ui/inc/slideshow.hxx | 4 +--
sd/source/ui/inc/tools/PropertySet.hxx | 4 +--
sd/source/ui/inc/tools/SlotStateListener.hxx | 4 +--
sd/source/ui/inc/unomodel.hxx | 11 +++------
sd/source/ui/inc/unopage.hxx | 4 +--
sd/source/ui/inc/unosrch.hxx | 9 ++-----
sd/source/ui/presenter/PresenterCanvas.cxx | 4 +--
sd/source/ui/presenter/PresenterHelper.hxx | 4 +--
sd/source/ui/presenter/PresenterPreviewCache.hxx | 4 +--
sd/source/ui/presenter/PresenterTextView.hxx | 4 +--
sd/source/ui/remotecontrol/Listener.cxx | 2 -
sd/source/ui/remotecontrol/Listener.hxx | 4 +--
sd/source/ui/sidebar/PanelFactory.hxx | 4 +--
sd/source/ui/slideshow/slideshowimpl.hxx | 8 +++---
sd/source/ui/slideshow/slideshowviewimpl.hxx | 5 +---
sd/source/ui/slidesorter/controller/SlsListener.hxx | 4 +--
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 4 +--
sd/source/ui/table/tablefunction.cxx | 1
sd/source/ui/tools/EventMultiplexer.cxx | 4 +--
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 10 ++++----
sd/source/ui/unoidl/randomnode.cxx | 4 +--
sd/source/ui/unoidl/sddetect.hxx | 4 +--
sd/source/ui/unoidl/unocpres.hxx | 8 ++----
sd/source/ui/unoidl/unolayer.hxx | 6 ++---
sd/source/ui/unoidl/unomodule.hxx | 4 +--
sd/source/ui/unoidl/unoobj.cxx | 3 +-
sd/source/ui/unoidl/unoobj.hxx | 2 -
sd/source/ui/unoidl/unopage.cxx | 3 +-
sd/source/ui/unoidl/unopback.hxx | 4 +--
sd/source/ui/view/ToolBarManager.cxx | 1
sd/source/ui/view/drviewsa.cxx | 4 +--
sd/workben/custompanel/ctp_panel.hxx | 4 +--
69 files changed, 148 insertions(+), 167 deletions(-)
New commits:
commit c1c6a8615c420e8b1dd1f94614a36e250dab8f96
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Aug 30 21:24:35 2015 +0900
sd: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I01909ee45c31d17356e13b1ff2430440daff9aa7
Reviewed-on: https://gerrit.libreoffice.org/18146
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index ea9a234..e8ac76a 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -23,7 +23,7 @@
#include "comphelper/anytostring.hxx"
#include "comphelper/scopeguard.hxx"
#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "osl/diagnose.h"
#include "osl/time.h"
#include "rtl/ref.hxx"
@@ -372,15 +372,9 @@
#include <cppcanvas/vclfactory.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/propertysetmixin.hxx>
#include <cppuhelper/proptypehlp.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index 9f5e743..a88772b 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -33,7 +33,7 @@
#include <rtl/ref.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svl/style.hxx>
@@ -43,7 +43,7 @@ class SdStyleSheet;
class SdPage;
struct SdStyleFamilyImpl;
-class SdStyleFamily : public ::cppu::WeakImplHelper7< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet >
+class SdStyleFamily : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet >
{
public:
/// creates the style family for the given SfxStyleFamily
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 2578b07..b6ebc30 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -28,8 +28,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <map>
#include <vector>
@@ -46,7 +45,7 @@ class SvxNumberFormat;
typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap;
-typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool,
+typedef ::cppu::ImplInheritanceHelper< SfxStyleSheetPool,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::container::XIndexAccess,
::com::sun::star::container::XNameAccess,
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index e57ef39..9e05c2e 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <svl/style.hxx>
@@ -43,7 +43,7 @@
class ModifyListenerForewarder;
-typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet,
+typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertyState,
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 4cc6db5..898bd88 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -66,7 +66,7 @@
#include <algorithm>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
@@ -2971,7 +2971,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
}
}
-class AnimationChangeListener : public cppu::WeakImplHelper1< XChangesListener >
+class AnimationChangeListener : public cppu::WeakImplHelper< XChangesListener >
{
public:
AnimationChangeListener( MainSequence* pMainSequence ) : mpMainSequence( pMainSequence ) {}
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 21a096b..074ee7e 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -28,7 +28,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/propertysetmixin.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include "Annotation.hxx"
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
namespace sd {
class Annotation : private ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper1< XAnnotation>,
+ public ::cppu::WeakComponentImplHelper< XAnnotation>,
public ::cppu::PropertySetMixin< XAnnotation >,
private boost::noncopyable
{
@@ -62,8 +62,8 @@ public:
// XInterface:
virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper1< XAnnotation >::release(); }
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper< XAnnotation >::acquire(); }
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE { ::cppu::WeakComponentImplHelper< XAnnotation >::release(); }
// ::com::sun::star::beans::XPropertySet:
virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) SAL_OVERRIDE;
@@ -167,7 +167,7 @@ void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage )
}
Annotation::Annotation( const Reference< XComponentContext >& context, SdPage* pPage )
-: ::cppu::WeakComponentImplHelper1< XAnnotation >(m_aMutex)
+: ::cppu::WeakComponentImplHelper< XAnnotation >(m_aMutex)
, ::cppu::PropertySetMixin< XAnnotation >(context, static_cast< Implements >(IMPLEMENTS_PROPERTY_SET), Sequence< OUString >())
, mpPage( pPage )
{
@@ -189,7 +189,7 @@ void SAL_CALL Annotation::disposing()
Any Annotation::queryInterface(Type const & type) throw (RuntimeException, std::exception)
{
- return ::cppu::WeakComponentImplHelper1< XAnnotation>::queryInterface(type);
+ return ::cppu::WeakComponentImplHelper< XAnnotation>::queryInterface(type);
}
// com.sun.star.beans.XPropertySet:
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index efa3e57..a7b9b46 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -20,7 +20,7 @@
#include "sal/config.h"
#include "boost/noncopyable.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/office/XAnnotationEnumeration.hpp"
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang;
namespace sd {
-class AnnotationEnumeration: public ::cppu::WeakImplHelper1< css::office::XAnnotationEnumeration >, private boost::noncopyable
+class AnnotationEnumeration: public ::cppu::WeakImplHelper< css::office::XAnnotationEnumeration >, private boost::noncopyable
{
public:
AnnotationEnumeration( const AnnotationVector& rAnnotations );
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index c8ec3ee..d20acea 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -68,7 +68,7 @@
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/drawing/XDrawView.hpp>
#include "../../ui/inc/DrawController.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
@@ -84,7 +84,7 @@ using namespace ::com::sun::star::ucb;
using namespace com::sun::star::ui::dialogs;
using namespace ::sfx2;
-class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
+class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper< com::sun::star::task::XInteractionHandler >
{
com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
sal_uInt16 nFilterError;
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 068df39..4fb08f5 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/document/XExporter.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
@@ -49,7 +49,7 @@ using namespace com::sun::star::ui::dialogs;
#include "sdabstdlg.hxx"
#include <boost/scoped_ptr.hpp>
-class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
+class SdHtmlOptionsDialog : public cppu::WeakImplHelper
<
XExporter,
XExecutableDialog,
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 87ff4ba..0a97c52 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -203,7 +203,7 @@ void AnnotationManagerImpl::init()
}
}
-// WeakComponentImplHelper1
+// WeakComponentImplHelper
void SAL_CALL AnnotationManagerImpl::disposing ()
{
try
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 2eed181..2947315 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include "ViewShellBase.hxx"
@@ -43,7 +43,7 @@ namespace tools {
class EventMultiplexerEvent;
}
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
com::sun::star::document::XEventListener
> AnnotationManagerImplBase;
@@ -54,7 +54,7 @@ public:
void init();
- // WeakComponentImplHelper1
+ // WeakComponentImplHelper
virtual void SAL_CALL disposing () SAL_OVERRIDE;
// XEventListener
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 6a1439b..e5a1133 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -28,7 +28,7 @@
#include "vcl/field.hxx"
#include "svtools/extensionlistbox.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "com/sun/star/lang/Locale.hpp"
#include "com/sun/star/lang/XEventListener.hpp"
@@ -67,7 +67,7 @@ struct ClientBoxEntry
// class ExtensionBox_Impl
class ClientBox;
-class ClientRemovedListener : public ::cppu::WeakImplHelper1<css::lang::XEventListener>
+class ClientRemovedListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
{
VclPtr<ClientBox> m_pParent;
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 95939e1..c5e30e5 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cppuhelper/implbase1.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 36bdacd..fc3a561 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XConfigurationChangeRequest,
::com::sun::star::container::XNamed
> GenericConfigurationChangeRequestInterfaceBase;
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index cd59702..328be89 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XConfigurationChangeRequest,
::com::sun::star::container::XNamed
> UpdateRequestInterfaceBase;
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index f5700d7..aeaf9b6 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -30,14 +30,14 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <osl/mutex.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
namespace {
-typedef ::cppu::WeakComponentImplHelper3 <
+typedef ::cppu::WeakComponentImplHelper <
css::lang::XInitialization,
css::drawing::framework::XResourceFactory,
css::drawing::framework::XConfigurationChangeListener
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index 024af69..6bf54ee 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -29,12 +29,12 @@
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
namespace {
-typedef ::cppu::WeakComponentImplHelper3 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory,
css::lang::XInitialization,
css::lang::XEventListener
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index f2278bb..440bf74 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
#include <boost/shared_ptr.hpp>
@@ -46,7 +46,7 @@ namespace vcl { class Window; }
namespace {
-typedef ::cppu::WeakComponentImplHelper2 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory,
css::lang::XInitialization
> BasicViewFactoryInterfaceBase;
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index ba83dfb..6775f3e 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -26,13 +26,13 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <memory>
namespace {
-typedef ::cppu::ImplInheritanceHelper1 <
+typedef ::cppu::ImplInheritanceHelper <
::sd::framework::Pane,
::com::sun::star::lang::XEventListener
> ChildWindowPaneInterfaceBase;
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index f8e0322..5c08842 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -24,7 +24,7 @@
#include "ViewShellBase.hxx"
#include "facreg.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <tools/diagnose_ex.h>
#include "slideshow.hxx"
@@ -39,7 +39,7 @@ namespace sd { namespace framework {
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <lang::XInitialization> PresentationFactoryProviderInterfaceBase;
+typedef ::cppu::WeakComponentImplHelper <lang::XInitialization> PresentationFactoryProviderInterfaceBase;
class PresentationFactoryProvider
: protected MutexOwner,
@@ -58,7 +58,7 @@ public:
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef ::cppu::WeakComponentImplHelper1 <XView> PresentationViewInterfaceBase;
+typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase;
/** The PresentationView is not an actual view, it is a marker whose
existence in a configuration indicates that a slideshow is running
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index af911db..a51cab1 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -26,11 +26,11 @@
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XConfigurationChangeListener
> CenterViewFocusModuleInterfaceBase;
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index e2d31dd..e675951 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -24,12 +24,12 @@
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <com/sun/star/frame/XController.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XConfigurationChangeListener
> ResourceManagerInterfaceBase;
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index c9033ea..63cb56b 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -30,12 +30,12 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener
> ShellStackGuardInterfaceBase;
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index 36ba62b..67ec89e 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <osl/mutex.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/scoped_ptr.hpp>
namespace sd {
@@ -37,7 +37,7 @@ class ViewShellBase;
namespace sd { namespace framework {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener
> ToolBarModuleInterfaceBase;
}
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index b8bd19b..6bc4350 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -27,11 +27,11 @@
#include <com/sun/star/drawing/framework/XTabBar.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener
> ViewTabBarModuleInterfaceBase;
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index c666e70..a34d3430 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -32,7 +32,7 @@
#include "app.hrc"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <com/sun/star/drawing/framework/XPane.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <svl/lstner.hxx>
#include <sfx2/request.hxx>
@@ -53,7 +53,7 @@ namespace {
//----- CallbackCaller --------------------------------------------------------
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::drawing::framework::XConfigurationChangeListener
> CallbackCallerInterfaceBase;
@@ -110,7 +110,7 @@ private:
//----- LifetimeController ----------------------------------------------------
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::lang::XEventListener
> LifetimeControllerInterfaceBase;
@@ -285,7 +285,7 @@ public:
//----- Framework::DiposeListener ---------------------------------------------
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::lang::XEventListener
> FrameworkHelperDisposeListenerInterfaceBase;
}
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 9464ac1..c183f7b 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 f1ac5a1..92c2918 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 77a5d1d..fae3d8d 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 6bdf397..8281b7a 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 fbb757e..4f9d90a 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 c50ce4d..d298fd5 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 45f82cf..c9802c7 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 525fabc..d9541a9 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 a38ae7b..1fb4586 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 f07edf3..94a6eb0 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 5b38448..39ece98 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 59454e6..67ce818 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 e442243..67ce409 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 37c78e7..0983d6b 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 f77cc5b..6aff89c 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 3504924..99be5f8 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 13b183e..6b9705b 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;
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 965816b..451aaae 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -29,7 +29,7 @@
#include <canvas/canvastools.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -47,7 +47,7 @@ namespace sd { namespace presenter {
/** Wrapper around a sprite that is displayed on a PresenterCanvas.
*/
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::rendering::XCustomSprite
> PresenterCustomSpriteInterfaceBase;
}
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 4f1625b..a4b7c93 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -24,13 +24,13 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
namespace sd { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper2<
+ typedef ::cppu::WeakComponentImplHelper<
css::lang::XInitialization,
css::drawing::XPresenterHelper
> PresenterHelperInterfaceBase;
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index fa680c7..f3999ef 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include "cache/SlsPageCache.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -32,7 +32,7 @@
namespace sd { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper2<
+ typedef ::cppu::WeakComponentImplHelper<
css::lang::XInitialization,
css::drawing::XSlidePreviewCache
> PresenterPreviewCacheInterfaceBase;
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index 2927e38..ac30c3c 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace sd { namespace presenter {
namespace {
- typedef ::cppu::ImplInheritanceHelper1 <
+ typedef ::cppu::ImplInheritanceHelper <
tools::PropertySet,
css::lang::XInitialization
> PresenterTextViewInterfaceBase;
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index f166609..5ba6cfd 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -22,7 +22,7 @@ using namespace ::com::sun::star::frame;
Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator,
sd::Transmitter *aTransmitter ):
- ::cppu::WeakComponentImplHelper1< XSlideShowListener >( m_aMutex ),
+ ::cppu::WeakComponentImplHelper< XSlideShowListener >( m_aMutex ),
mCommunicator( rCommunicator ),
pTransmitter( NULL )
{
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index bb89477..5a27f6d 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -14,7 +14,7 @@
#include <com/sun/star/presentation/XSlideShowListener.hpp>
#include <com/sun/star/presentation/XSlideShowController.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <osl/socket.hxx>
@@ -28,7 +28,7 @@ namespace sd {
*/
class Listener
: protected ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper1< css::presentation::XSlideShowListener >
+ public ::cppu::WeakComponentImplHelper< css::presentation::XSlideShowListener >
{
public:
Listener( const ::rtl::Reference<Communicator>& rServer, sd::Transmitter *aTransmitter );
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index 654fd9d..bdab2d6 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_SIDEBAR_PANELFACTORY_HXX
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_PANELFACTORY_HXX
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx>
#include "framework/Pane.hxx"
@@ -41,7 +41,7 @@ namespace sd { namespace sidebar {
namespace
{
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::ui::XUIElementFactory
> PanelFactoryInterfaceBase;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 705e0a3..4085a4e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -22,8 +22,8 @@
#include "sal/config.h"
#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/compbase1.hxx"
-#include "cppuhelper/compbase2.hxx"
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include "cppuhelper/basemutex.hxx"
#include "cppuhelper/propertysetmixin.hxx"
#include <com/sun/star/awt/XActivateListener.hpp>
@@ -116,7 +116,7 @@ typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap;
class SlideShowListenerProxy : private ::cppu::BaseMutex,
- public ::cppu::WeakImplHelper2< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener >
+ public ::cppu::WeakImplHelper< css::presentation::XSlideShowListener, css::presentation::XShapeEventListener >
{
public:
SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow );
@@ -157,7 +157,7 @@ public:
css::uno::Reference< css::presentation::XSlideShow > mxSlideShow;
};
-typedef ::cppu::WeakComponentImplHelper2< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase;
+typedef ::cppu::WeakComponentImplHelper< css::presentation::XSlideShowController, css::container::XIndexAccess > SlideshowImplBase;
class SlideshowImpl : private ::cppu::BaseMutex, public SlideshowImplBase
{
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 0967f31..c9378b3 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWVIEWIMPL_HXX
#define INCLUDED_SD_SOURCE_UI_SLIDESHOW_SLIDESHOWVIEWIMPL_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/listenernotification.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -159,7 +158,7 @@ protected:
class ShowWindow;
class SlideshowImpl;
-typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::presentation::XSlideShowView,
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::presentation::XSlideShowView,
::com::sun::star::awt::XWindowListener,
::com::sun::star::awt::XMouseListener,
::com::sun::star::awt::XMouseMotionListener > SlideShowView_Base;
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index c00ce56..1e634a9 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <svl/lstner.hxx>
#include <tools/link.hxx>
@@ -48,7 +48,7 @@ class SlideSorter;
namespace sd { namespace slidesorter { namespace controller {
-typedef cppu::WeakComponentImplHelper4<
+typedef cppu::WeakComponentImplHelper<
::com::sun::star::document::XEventListener,
::com::sun::star::beans::XPropertyChangeListener,
::com::sun::star::accessibility::XAccessibleEventListener,
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index 7b79b55..8df8692 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/drawing/framework/XView.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -38,7 +38,7 @@
namespace sd { namespace slidesorter {
namespace {
- typedef ::cppu::WeakComponentImplHelper3 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::XSlideSorterBase,
css::lang::XInitialization,
css::awt::XWindowListener
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index d032fd4..b05d570 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 2b3d4ef..4705bea 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <sfx2/viewfrm.hxx>
using namespace ::com::sun::star;
@@ -51,7 +51,7 @@ static const sal_Int32 ConfigurationUpdateEvent = 2;
namespace sd { namespace tools {
-typedef cppu::WeakComponentImplHelper4<
+typedef cppu::WeakComponentImplHelper<
::com::sun::star::beans::XPropertyChangeListener,
::com::sun::star::frame::XFrameActionListener,
::com::sun::star::view::XSelectionChangeListener,
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 390c81e..f87c75b 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/propertysethelper.hxx>
#include <comphelper/propertysetinfo.hxx>
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::i18n;
namespace sd
{
- class DocumentSettings : public WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >,
+ class DocumentSettings : public WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >,
public comphelper::PropertySetHelper,
public DocumentSettingsSerializer
{
@@ -1197,17 +1197,17 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::
// XInterface
Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
{
- return WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType );
+ return WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType );
}
void SAL_CALL DocumentSettings::acquire( ) throw ()
{
- WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >::acquire();
+ WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::acquire();
}
void SAL_CALL DocumentSettings::release( ) throw ()
{
- WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >::release();
+ WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::release();
}
// XPropertySet
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 3b4d833..22714d9 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include "CustomAnimationPreset.hxx"
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::animations;
namespace sd
{
-typedef ::cppu::WeakImplHelper5< XTimeContainer, XEnumerationAccess, XCloneable, XServiceInfo, XInitialization > RandomAnimationNodeBase;
+typedef ::cppu::WeakImplHelper< XTimeContainer, XEnumerationAccess, XCloneable, XServiceInfo, XInitialization > RandomAnimationNodeBase;
class RandomAnimationNode : public RandomAnimationNodeBase
{
public:
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 13fb23d..c31ec84 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -50,7 +50,7 @@ namespace com
#include <sfx2/sfxuno.hxx>
-class SdFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
+class SdFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
public:
SdFilterDetect();
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index c28814a..b2bde6c 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -27,13 +27,13 @@
#include <cppuhelper/interfacecontainer.h>
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/servicehelper.hxx>
class SdXImpressDocument;
class SdCustomShow;
-class SdXCustomPresentation : public ::cppu::WeakImplHelper5< ::com::sun::star::container::XIndexContainer,
+class SdXCustomPresentation : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexContainer,
::com::sun::star::container::XNamed,
::com::sun::star::lang::XUnoTunnel,
::com::sun::star::lang::XComponent,
@@ -95,14 +95,12 @@ public:
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/implbase3.hxx>
-
#include "unomodel.hxx"
#include "drawdoc.hxx"
class List;
-class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::container::XNameContainer,
+class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer,
::com::sun::star::lang::XSingleServiceFactory,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index feb2893..30f4bb1 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/drawing/XLayer.hpp>
#include <com/sun/star/drawing/XLayerManager.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/servicehelper.hxx>
#include <unomodel.hxx>
@@ -41,7 +41,7 @@ enum LayerAttribute { VISIBLE, PRINTABLE, LOCKED };
/***********************************************************************
* *
***********************************************************************/
-class SdLayer : public ::cppu::WeakImplHelper5< ::com::sun::star::drawing::XLayer,
+class SdLayer : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XLayer,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::container::XChild,
::com::sun::star::lang::XUnoTunnel,
@@ -106,7 +106,7 @@ private:
* *
***********************************************************************/
-class SdLayerManager : public ::cppu::WeakImplHelper5< ::com::sun::star::drawing::XLayerManager,
+class SdLayerManager : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XLayerManager,
::com::sun::star::container::XNameAccess,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel,
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index f6a6cca..fbbdc35 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -48,7 +48,7 @@ namespace com
}
}
-class SdUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
+class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
{
css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 95d217c..47b97e4 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -39,6 +39,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/sfxsids.hrc>
#include <comphelper/extract.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svx/unoprov.hxx>
#include <svx/unoshape.hxx>
@@ -1105,7 +1106,7 @@ uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException
return Any( uno::Reference< style::XStyle >( dynamic_cast< SfxUnoStyleSheet* >( pStyleSheet ) ) );
}
-class SdUnoEventsAccess : public cppu::WeakImplHelper2< com::sun::star::container::XNameReplace, com::sun::star::lang::XServiceInfo >
+class SdUnoEventsAccess : public cppu::WeakImplHelper< com::sun::star::container::XNameReplace, com::sun::star::lang::XServiceInfo >
{
private:
const OUString maStrOnClick;
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index d28d97b..8adba5a 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -30,8 +30,6 @@
#include <editeng/unoipset.hxx>
-#include <cppuhelper/implbase2.hxx>
-
class SdrObject;
class SdXImpressDocument;
class SdAnimationInfo;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 2308701..98e6c33 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/view/PaperOrientation.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <com/sun/star/presentation/EffectNodeType.hpp>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -2609,7 +2610,7 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue )
throw IllegalArgumentException();
}
-class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class SdNavigationOrderAccess : public ::cppu::WeakImplHelper< XIndexAccess >
{
public:
SdNavigationOrderAccess( SdrPage* pPage );
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index 6f3ba5a..8fd35c9 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -29,13 +29,13 @@
#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();
class SdDrawDocument;
class SfxItemSet;
-class SdUnoPageBackground : public ::cppu::WeakImplHelper4<
+class SdUnoPageBackground : public ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertyState,
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 5c9bad5..330a7ce 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
#include <sfx2/app.hxx>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 188a535..1c82bbc 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -19,7 +19,7 @@
#include "DrawViewShell.hxx"
#include <com/sun/star/scanner/ScannerManager.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/sizeitem.hxx>
#include <svx/svdlayer.hxx>
@@ -81,7 +81,7 @@ bool DrawViewShell::mbPipette = false;
// - ScannerEventListener -
-class ScannerEventListener : public ::cppu::WeakImplHelper1< lang::XEventListener >
+class ScannerEventListener : public ::cppu::WeakImplHelper< lang::XEventListener >
{
private:
diff --git a/sd/workben/custompanel/ctp_panel.hxx b/sd/workben/custompanel/ctp_panel.hxx
index 8fa084c..0de2e98 100644
--- a/sd/workben/custompanel/ctp_panel.hxx
+++ b/sd/workben/custompanel/ctp_panel.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/drawing/framework/XResourceId.hpp>
#include <com/sun/star/awt/XPaintListener.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/scoped_ptr.hpp>
@@ -36,7 +36,7 @@ namespace sd { namespace colortoolpanel
{
// class SingleColorPanel
- typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::drawing::framework::XView
+ typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::drawing::framework::XView
, ::com::sun::star::ui::XToolPanel
, ::com::sun::star::awt::XPaintListener
> SingleColorPanel_Base;
More information about the Libreoffice-commits
mailing list