summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appdispatchprovider.cxx4
-rw-r--r--sfx2/source/appl/appinit.cxx4
-rw-r--r--sfx2/source/appl/appopen.cxx1
-rw-r--r--sfx2/source/appl/childwin.cxx4
-rw-r--r--sfx2/source/appl/helpdispatch.hxx4
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx9
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx3
-rw-r--r--sfx2/source/appl/imestatuswindow.hxx4
-rw-r--r--sfx2/source/appl/macroloader.cxx1
-rw-r--r--sfx2/source/appl/newhelp.hxx1
-rw-r--r--sfx2/source/appl/opengrf.cxx1
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx4
-rw-r--r--sfx2/source/appl/shutdownicon.cxx4
-rw-r--r--sfx2/source/appl/shutdownicon.hxx4
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm4
-rw-r--r--sfx2/source/appl/xpackcreator.cxx4
16 files changed, 26 insertions, 30 deletions
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 51a08a8a96bb..0b00f72e937e 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -32,7 +32,7 @@
#include <basic/basmgr.hxx>
#include <basic/sbuno.hxx>
#include <comphelper/sequence.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sfx2/app.hxx>
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno;
namespace {
-class SfxAppDispatchProvider : public ::cppu::WeakImplHelper3< css::frame::XAppDispatchProvider,
+class SfxAppDispatchProvider : public ::cppu::WeakImplHelper< css::frame::XAppDispatchProvider,
css::lang::XServiceInfo,
css::lang::XInitialization >
{
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 0c1b6d752929..de9c673a87ec 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -43,7 +43,7 @@
#include <unotools/pathoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/edit.hxx>
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
-class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateListener, XServiceInfo >
+class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper< XTerminateListener, XServiceInfo >
{
public:
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 2a11004328d2..144f6fd09f67 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -42,7 +42,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 3c7464305316..4ba7106c9678 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/app.hxx>
@@ -69,7 +69,7 @@ struct SfxChildWindow_Impl
-class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+class DisposeListener : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener >
{
public:
DisposeListener( SfxChildWindow* pOwner ,
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index 199b26a4f329..93c03b3638b0 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -20,11 +20,11 @@
#define INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
#include <com/sun/star/frame/XDispatch.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "helpinterceptor.hxx"
-class HelpDispatch_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatch >
+class HelpDispatch_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XDispatch >
{
private:
HelpInterceptor_Impl& m_rInterceptor;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index f5ce4bb9d1ac..47d9c74df6a7 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
#define INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
-#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
@@ -43,7 +42,7 @@ struct HelpHistoryEntry_Impl
typedef ::std::vector< HelpHistoryEntry_Impl* > HelpHistoryList_Impl;
class SfxHelpWindow_Impl;
-class HelpInterceptor_Impl : public ::cppu::WeakImplHelper3<
+class HelpInterceptor_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XDispatchProviderInterceptor,
::com::sun::star::frame::XInterceptorInfo,
@@ -116,7 +115,7 @@ public:
// HelpListener_Impl -----------------------------------------------------
-class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
+class HelpListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener >
{
private:
HelpInterceptor_Impl* pInterceptor;
@@ -137,7 +136,7 @@ public:
// HelpStatusListener_Impl -----------------------------------------------------
class HelpStatusListener_Impl : public
-::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
+::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener >
{
private:
::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDispatch;
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 2d4416d93b45..84ee426cdbe3 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -41,9 +41,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <vcl/svapp.hxx>
+#include <cppuhelper/implbase.hxx>
//TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver
-class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star::beans::XPropertyChangeListener>
+class WeakPropertyChangeListener : public ::cppu::WeakImplHelper<com::sun::star::beans::XPropertyChangeListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener> mxOwner;
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 27a17f2fb0af..99bd17697c45 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
namespace com { namespace sun { namespace star {
@@ -35,7 +35,7 @@ namespace sfx2 { namespace appl {
// The MS compiler needs this typedef work-around to accept the using
// declarations within ImeStatusWindow:
-typedef cppu::WeakImplHelper1< com::sun::star::beans::XPropertyChangeListener >
+typedef cppu::WeakImplHelper< com::sun::star::beans::XPropertyChangeListener >
ImeStatusWindow_Impl;
/** Control the behavior of any (platform-dependent) IME status windows.
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 7d6304c556bc..f1634ca14274 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/frame/DispatchResultState.hpp>
#include <basic/basmgr.hxx>
#include <basic/sbuno.hxx>
-#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <framework/documentundoguard.hxx>
#include <rtl/ref.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index fd5e3d67404b..f3e35895b095 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 4c001886d296..82015b06bf9d 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -19,7 +19,6 @@
#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 2f378d79c5a3..006189d0cc47 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -32,7 +32,7 @@
#include <vcl/pngwrite.hxx>
#include <osl/file.hxx>
#include <unotools/localfilehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::util;
-class StringLength : public ::cppu::WeakImplHelper1< XStringWidth >
+class StringLength : public ::cppu::WeakImplHelper< XStringWidth >
{
public:
StringLength() {}
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 81bed2151734..572f4ca4cddf 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -49,7 +49,7 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/fcontnr.hxx>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sfx2/dispatch.hxx>
#include <comphelper/extract.hxx>
@@ -83,7 +83,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
# endif
#endif
-class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
+class SfxNotificationListener_Impl : public cppu::WeakImplHelper< XDispatchResultListener >
{
public:
virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 2744e11eaa07..0950d18427e4 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -30,7 +30,7 @@
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <sfx2/sfxuno.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <sfx2/dllapi.h>
#include <tools/link.hxx>
@@ -40,7 +40,7 @@ namespace sfx2
class FileDialogHelper;
}
-typedef ::cppu::WeakComponentImplHelper4<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::lang::XInitialization,
::com::sun::star::frame::XTerminateListener,
::com::sun::star::lang::XServiceInfo,
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 234329f35e9e..19d9eafd5c65 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -34,7 +34,7 @@
#include <com/sun/star/util/XStringWidth.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <set>
#include <vector>
@@ -137,7 +137,7 @@ struct RecentMenuEntry
rtl::OUString aPassword;
};
-class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
+class RecentFilesStringLength : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth >
{
public:
RecentFilesStringLength() {}
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 380b3ba02c93..cc8e06b79f30 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sot/stg.hxx>
@@ -38,7 +38,7 @@ using namespace css;
namespace {
-class OPackageStructureCreator : public ::cppu::WeakImplHelper2< embed::XPackageStructureCreator,
+class OPackageStructureCreator : public ::cppu::WeakImplHelper< embed::XPackageStructureCreator,
lang::XServiceInfo >
{
public:
generated by cgit (git 2.34.1) at 2025-01-16 18:05:24 +0000