summaryrefslogtreecommitdiff
path: root/sfx2/source/doc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc')
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx8
-rw-r--r--sfx2/source/doc/docfile.cxx1
-rw-r--r--sfx2/source/doc/doctemplates.cxx6
-rw-r--r--sfx2/source/doc/doctemplateslocal.hxx4
-rw-r--r--sfx2/source/doc/iframe.cxx4
-rw-r--r--sfx2/source/doc/objserv.cxx3
-rw-r--r--sfx2/source/doc/objxtor.cxx4
-rw-r--r--sfx2/source/doc/ownsubfilterservice.cxx4
-rw-r--r--sfx2/source/doc/plugin.cxx4
-rw-r--r--sfx2/source/doc/printhelper.cxx4
-rw-r--r--sfx2/source/doc/printhelper.hxx4
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx7
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx4
13 files changed, 29 insertions, 28 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 27e31f02e0fd..8556b0ebaaf3 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -79,7 +79,7 @@
#include <limits>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
#include <com/sun/star/beans/PropertyBag.hpp>
@@ -115,7 +115,7 @@ namespace {
typedef std::vector<std::vector<std::pair<const char*, OUString> > >
AttrVector;
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::WeakComponentImplHelper<
css::lang::XServiceInfo,
css::document::XDocumentProperties,
css::lang::XInitialization,
@@ -353,7 +353,7 @@ protected:
void createUserDefined();
};
-typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
+typedef ::cppu::ImplInheritanceHelper< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 88a24ee9bafe..f4732d2d55c4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -60,7 +60,6 @@
#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/logging/DocumentIOLogRing.hpp>
#include <com/sun/star/logging/XSimpleLogRing.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 6b0f3a3e52f0..85c308d9d985 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -30,7 +30,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -156,7 +156,7 @@ class GroupData_Impl;
typedef vector< GroupData_Impl* > GroupList_Impl;
-class TplTaskEnvironment : public ::cppu::WeakImplHelper1< ucb::XCommandEnvironment >
+class TplTaskEnvironment : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment >
{
uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
uno::Reference< ucb::XProgressHandler > m_xProgressHandler;
@@ -2205,7 +2205,7 @@ bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
}
-class SfxDocTplService: public ::cppu::WeakImplHelper3< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
+class SfxDocTplService: public ::cppu::WeakImplHelper< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
{
SfxDocTplService_Impl *pImp;
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 626f15e7d2f7..9f22fc1ede5b 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-class DocTemplLocaleHelper : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
+class DocTemplLocaleHelper : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler >
{
// Relations info related strings
OUString m_aGroupListElement;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 0564141cb174..319baed8e9a2 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <svtools/miscopt.hxx>
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
namespace {
-class IFrameObject : public ::cppu::WeakImplHelper6 <
+class IFrameObject : public ::cppu::WeakImplHelper <
css::util::XCloseable,
css::lang::XEventListener,
css::frame::XSynchronousFrameLoader,
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 23ebbaf0aebe..82dd1496b69e 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -102,6 +102,7 @@
#include "guisaveas.hxx"
#include <sfx2/templatedlg.hxx>
#include <boost/scoped_ptr.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -122,7 +123,7 @@ void SfxObjectShell::InitInterface_Impl()
{
}
-class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
+class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener >
{
bool m_bGotOwnership;
bool m_bPreventClose;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 335b6f8e8f46..ff4e1eaae115 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -22,7 +22,7 @@
#include "arrdecl.hxx"
#include <map>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
@@ -148,7 +148,7 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent )
-class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
+class SfxModelListener_Impl : public ::cppu::WeakImplHelper< ::com::sun::star::util::XCloseListener >
{
SfxObjectShell* mpDoc;
public:
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index a3e9f2e0cc92..d82b51797ca2 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XStream.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sfx2/objsh.hxx>
@@ -33,7 +33,7 @@ using namespace css;
namespace {
-class OwnSubFilterService : public cppu::WeakImplHelper2 < document::XFilter
+class OwnSubFilterService : public cppu::WeakImplHelper < document::XFilter
,lang::XServiceInfo >
{
uno::Reference< frame::XModel > m_xModel;
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index f51d38174b63..d53b0b84fe8b 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
@@ -81,7 +81,7 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl()
return aPluginPropertyMap_Impl;
}
-class PluginObject : public ::cppu::WeakImplHelper5 <
+class PluginObject : public ::cppu::WeakImplHelper <
css::util::XCloseable,
css::lang::XEventListener,
css::frame::XSynchronousFrameLoader,
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 660c52127733..e29380245589 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -42,7 +42,7 @@
#include <ucbhelper/content.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/settings.hxx>
#include <sfx2/viewfrm.hxx>
@@ -93,7 +93,7 @@ Size impl_Size_Struct2Object( const awt::Size& aSize )
return aReturnValue ;
}
-class SfxPrintJob_Impl : public cppu::WeakImplHelper1
+class SfxPrintJob_Impl : public cppu::WeakImplHelper
<
com::sun::star::view::XPrintJob
>
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index ef4e31d2bd03..0eb1242f1d45 100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -32,13 +32,13 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
struct IMPL_PrintListener_DataContainer;
class SfxViewShell;
class SfxPrinter;
-class SfxPrintHelper : public cppu::WeakImplHelper3
+class SfxPrintHelper : public cppu::WeakImplHelper
< com::sun::star::view::XPrintable
, com::sun::star::view::XPrintJobBroadcaster
, com::sun::star::lang::XInitialization >
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 928dcc55dcf6..51baa58d7400 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <comphelper/enumhelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <comphelper/processfactory.hxx>
@@ -141,7 +142,7 @@ using ::com::sun::star::frame::XModel;
/** This Listener is used to get notified when the XDocumentProperties of the
XModel change.
*/
-class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
+class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper<
util::XModifyListener >
{
@@ -315,7 +316,7 @@ sal_Int64 IMPL_SfxBaseModel_DataContainer::g_nInstanceCounter = 0;
// Listener that forwards notifications from the PrintHelper to the "real" listeners
-class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper1< view::XPrintJobListener >
+class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper< view::XPrintJobListener >
{
public:
IMPL_SfxBaseModel_DataContainer* m_pData;
@@ -1126,7 +1127,7 @@ void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XContr
namespace
{
- typedef ::cppu::WeakImplHelper1< XUndoAction > ControllerLockUndoAction_Base;
+ typedef ::cppu::WeakImplHelper< XUndoAction > ControllerLockUndoAction_Base;
class ControllerLockUndoAction : public ControllerLockUndoAction_Base
{
public:
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index c1844560e0ef..f9ba31284413 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/namedvaluecollection.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
@@ -57,7 +57,7 @@ namespace sfx2
//= SfxModelFactory - declaration
- typedef ::cppu::WeakImplHelper2 < XSingleServiceFactory
+ typedef ::cppu::WeakImplHelper < XSingleServiceFactory
, XServiceInfo
> SfxModelFactory_Base;
/** implements a XSingleServiceFactory which can be used to created instances
generated by cgit (git 2.34.1) at 2025-01-01 09:29:44 +0000