Rebased ref, commits from common ancestor:
commit 805b094656b5df04a4291c52364440576869eb79
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Tue Oct 6 03:13:48 2015 -0400
modify application's icon
Change-Id: I2ac122f1be180acfc5ea18d99f355527b9273eea
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c3e1bf6..128f474 100644
Binary files a/sysui/desktop/icons/main.icns and
b/sysui/desktop/icons/main.icns differ
commit 0763344702e69410a25f8a5653e438c6b91a3732
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Sun Oct 4 14:28:33 2015 -0400
tdf#88206 convert to variadic templates in implbase.hxx/compbase.hxx
Change-Id: Ia09c94fdb35ddebab450a868c72a6909240d935f
diff --git
a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
index 604e464..a61d26a 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -22,7 +22,7 @@
#define
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -31,7 +31,7 @@ namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
+typedef ::cppu::ImplHelper< css::accessibility::XAccessibleSelection >
AccessibleBrowseBoxHeaderBarImplHelper;
/** This class represents the accessible object of a header bar of a BrowseBox
diff --git
a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
index 257e192..82cd073 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -22,14 +22,14 @@
#define
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
+typedef ::cppu::ImplHelper< css::accessibility::XAccessibleTable >
AccessibleBrowseBoxTableImplHelper;
/** The BrowseBox accessible table objects inherit from this base class. It
diff --git
a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index efbe7536..a85cfc9 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -22,7 +22,7 @@
#define
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
#include "accessibility/extended/AccessibleGridControlTableBase.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <accessibility/extended/AccessibleGridControlTableCell.hxx>
@@ -31,12 +31,12 @@
namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
- AccessibleGridControlTableImplHelper1;
+typedef ::cppu::ImplHelper< css::accessibility::XAccessibleSelection >
+ AccessibleGridControlTableImplHelper;
/** This class represents the accessible object of the data table of a
Grid control. */
class AccessibleGridControlTable : public AccessibleGridControlTableBase,
- public AccessibleGridControlTableImplHelper1
+ public AccessibleGridControlTableImplHelper
{
public:
AccessibleGridControlTable(
diff --git
a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index 57a38d9..dca9c80 100644
---
a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++
b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -22,14 +22,14 @@
#define
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
#include "accessibility/extended/AccessibleGridControlBase.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
+typedef ::cppu::ImplHelper< css::accessibility::XAccessibleTable >
AccessibleGridControlTableImplHelper;
/** The Grid Control accessible table objects inherit from this base class. It
diff --git
a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
index 5292b0b..e949ec1 100644
--- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include "accessibility/extended/accessibletabbarbase.hxx"
#include <vector>
@@ -41,7 +41,7 @@ namespace accessibility
// class AccessibleTabBarPageList
- typedef ::cppu::ImplHelper3<
+ typedef ::cppu::ImplHelper<
css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
index 391d75b..8899d6a 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
@@ -21,7 +21,7 @@
#define
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX
#include "AccessibleBrowseBox.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <svtools/accessibletableprovider.hxx>
@@ -33,7 +33,7 @@ namespace accessibility {
class AccessibleBrowseBoxTable;
-typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
+typedef ::cppu::ImplHelper < css::accessibility::XAccessible
> AccessibleTabListBox_Base;
/** !!! */
diff --git
a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
index 53659ae..b4c2a0d 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
@@ -22,7 +22,7 @@
#include "AccessibleBrowseBoxTable.hxx"
#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
class SvHeaderTabListBox;
@@ -31,7 +31,7 @@ class SvHeaderTabListBox;
namespace accessibility {
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
+typedef ::cppu::ImplHelper< css::accessibility::XAccessibleSelection >
AccessibleTabListBoxTableImplHelper;
class AccessibleTabListBoxTable : public AccessibleBrowseBoxTable, public
AccessibleTabListBoxTableImplHelper
diff --git
a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
index 11f6c09..54fbcc0 100644
--- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
@@ -22,7 +22,7 @@
#include <accessibility/standard/accessiblemenubasecomponent.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
@@ -31,7 +31,7 @@
typedef ::comphelper::OAccessibleExtendedComponentHelper
AccessibleExtendedComponentHelper_BASE;
-typedef ::cppu::ImplHelper1<
+typedef ::cppu::ImplHelper<
css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index 9c06af7..5db6a72 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -25,10 +25,10 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper3<
+typedef ::cppu::ImplHelper<
css::accessibility::XAccessible,
css::accessibility::XAccessibleValue,
css::accessibility::XAccessibleAction
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
index 49ae032..df50acb 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
@@ -23,14 +23,14 @@
#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
// class VCLXAccessibleMenu
-typedef ::cppu::ImplHelper1 <
+typedef ::cppu::ImplHelper <
css::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE;
class VCLXAccessibleMenu : public VCLXAccessibleMenuItem,
diff --git
a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
index e553e07..136c731 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/accessibletexthelper.hxx>
@@ -33,7 +33,7 @@
// class VCLXAccessibleMenuItem
-typedef ::cppu::ImplHelper3<
+typedef ::cppu::ImplHelper<
css::accessibility::XAccessibleText,
css::accessibility::XAccessibleAction,
css::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
diff --git
a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
index e7e688b..52956ce 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
@@ -22,9 +22,9 @@
#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-typedef ::cppu::ImplHelper1<
+typedef ::cppu::ImplHelper<
css::accessibility::XAccessible
> VCLXAccessible_BASE;
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index 353903b..c458ed5 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -44,7 +44,7 @@
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <config_features.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <osl/mutex.hxx>
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index d0293c6..e8b6786 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/vclptr.hxx>
namespace vcl { class Window; }
@@ -45,7 +45,7 @@ class DialogWindow;
typedef ::comphelper::OAccessibleExtendedComponentHelper
AccessibleExtendedComponentHelper_BASE;
-typedef ::cppu::ImplHelper3<
+typedef ::cppu::ImplHelper<
css::accessibility::XAccessible,
css::lang::XServiceInfo,
css::beans::XPropertyChangeListener >
AccessibleDialogControlShape_BASE;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx
b/basctl/source/inc/accessibledialogwindow.hxx
index bec472a..f219276 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svl/lstner.hxx>
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
@@ -50,7 +50,7 @@ class DlgEdObj;
typedef ::comphelper::OAccessibleExtendedComponentHelper
AccessibleExtendedComponentHelper_BASE;
-typedef ::cppu::ImplHelper3 <
+typedef ::cppu::ImplHelper <
css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo > AccessibleDialogWindow_BASE;
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx
b/comphelper/inc/pch/precompiled_comphelper.hxx
index cfc8055..3c66faa 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -173,7 +173,7 @@
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <config_folders.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/comphelper/source/container/enumerablemap.cxx
b/comphelper/source/container/enumerablemap.cxx
index 5b5f3a1..65dd3e1 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/math.hxx>
@@ -173,10 +173,10 @@ namespace comphelper
// EnumerableMap
- typedef ::cppu::WeakAggComponentImplHelper3 < XInitialization
- , XEnumerableMap
- , XServiceInfo
- > Map_IFace;
+ typedef ::cppu::WeakAggComponentImplHelper < XInitialization
+ , XEnumerableMap
+ , XServiceInfo
+ > Map_IFace;
class COMPHELPER_DLLPRIVATE EnumerableMap :public Map_IFace
,public ComponentBase
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx
b/connectivity/source/drivers/macab/MacabHeader.hxx
index d6ed382..177dcbc 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABHEADER_HXX
#include "MacabRecord.hxx"
-#include <cppuhelper/compbase3.hxx>
namespace connectivity
{
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx
b/connectivity/source/drivers/macab/MacabRecord.hxx
index 0f84bc9..617162b 100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
-#include <cppuhelper/compbase3.hxx>
-
#include <premac.h>
#include <Carbon/Carbon.h>
#include <AddressBook/ABAddressBookC.h>
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index c58caf8..83ae85b 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -30,8 +30,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/component_context.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <rtl/ref.hxx>
@@ -435,7 +434,7 @@ rtl::OUString Parser::getNameAttribute() {
}
class ContentEnumeration:
- public cppu::WeakImplHelper1< css::container::XEnumeration >,
+ public cppu::WeakImplHelper< css::container::XEnumeration >,
private boost::noncopyable
{
public:
@@ -487,7 +486,7 @@ css::beans::Property getDefaultContextProperty() {
}
class SingletonFactory:
- public cppu::WeakImplHelper1<css::lang::XSingleComponentFactory>,
+ public cppu::WeakImplHelper<css::lang::XSingleComponentFactory>,
private boost::noncopyable
{
public:
@@ -539,7 +538,7 @@ SingletonFactory::createInstanceWithArgumentsAndContext(
}
class ImplementationWrapper:
- public cppu::WeakImplHelper3<
+ public cppu::WeakImplHelper<
css::lang::XSingleComponentFactory, css::lang::XSingleServiceFactory,
css::lang::XServiceInfo >,
private boost::noncopyable
diff --git a/cppuhelper/test/testimplhelper.cxx
b/cppuhelper/test/testimplhelper.cxx
index b099d55..4a9ac21 100644
--- a/cppuhelper/test/testimplhelper.cxx
+++ b/cppuhelper/test/testimplhelper.cxx
@@ -25,31 +25,8 @@
#include <stdio.h>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase9.hxx>
-#include <cppuhelper/implbase10.hxx>
-#include <cppuhelper/implbase11.hxx>
-#include <cppuhelper/implbase12.hxx>
-
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/compbase5.hxx>
-#include <cppuhelper/compbase6.hxx>
-#include <cppuhelper/compbase7.hxx>
-#include <cppuhelper/compbase8.hxx>
-#include <cppuhelper/compbase9.hxx>
-#include <cppuhelper/compbase10.hxx>
-#include <cppuhelper/compbase11.hxx>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/diagnose.h>
#include <cppuhelper/servicefactory.hxx>
@@ -78,7 +55,7 @@ using ::rtl::OUStringToOString;
using ::rtl::OString;
-struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
+struct TestImpl : public ImplHelper< CA, DBA, FE, G >
{
sal_Int32 nRef;
@@ -86,7 +63,7 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
{ OSL_TRACE( "> TestImpl dtor called... <\n" ); }
virtual Any SAL_CALL queryInterface( const Type & rType )
throw(RuntimeException)
- { return ImplHelper4< CA, DBA, FE, G >::queryInterface( rType ); }
+ { return ImplHelper< CA, DBA, FE, G >::queryInterface( rType ); }
virtual void SAL_CALL acquire( ) throw()
{ ++nRef; }
virtual void SAL_CALL release( ) throw()
@@ -116,7 +93,7 @@ struct TestImpl : public ImplHelper4< CA, DBA, FE, G >
};
-struct TestWeakAggImpl : public WeakAggImplHelper4< CA, DBA, FE, G >
+struct TestWeakAggImpl : public WeakAggImplHelper< CA, DBA, FE, G >
{
virtual ~TestWeakAggImpl()
{ OSL_TRACE( "> TestWeakAggImpl dtor called... <\n" ); }
@@ -145,7 +122,7 @@ struct TestWeakAggImpl : public WeakAggImplHelper4< CA,
DBA, FE, G >
};
-struct TestWeakImpl : public WeakImplHelper4< CA, DBA, FE, G >
+struct TestWeakImpl : public WeakImplHelper< CA, DBA, FE, G >
{
TestWeakImpl() {}
@@ -189,11 +166,11 @@ protected:
};
-struct TestWeakComponentImpl : public WeakComponentImplHelper4< CA, DBA, FE, G
>
+struct TestWeakComponentImpl : public WeakComponentImplHelper< CA, DBA, FE, G >
{
Mutex m;
TestWeakComponentImpl()
- : WeakComponentImplHelper4< CA, DBA, FE, G >( m )
+ : WeakComponentImplHelper< CA, DBA, FE, G >( m )
{}
virtual ~TestWeakComponentImpl()
{ OSL_TRACE( "> TestWeakComponentImpl dtor called... <\n" ); }
@@ -225,11 +202,11 @@ struct TestWeakComponentImpl : public
WeakComponentImplHelper4< CA, DBA, FE, G >
};
-struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper4< CA, DBA,
FE, G >
+struct TestWeakAggComponentImpl : public WeakAggComponentImplHelper< CA, DBA,
FE, G >
{
Mutex m;
TestWeakAggComponentImpl()
- : WeakAggComponentImplHelper4< CA, DBA, FE, G >( m )
+ : WeakAggComponentImplHelper< CA, DBA, FE, G >( m )
{}
virtual ~TestWeakAggComponentImpl()
{ OSL_TRACE( "> TestWeakAggComponentImpl dtor called... <\n" ); }
@@ -261,27 +238,27 @@ struct TestWeakAggComponentImpl : public
WeakAggComponentImplHelper4< CA, DBA, F
};
-struct TestImplInh : public ImplInheritanceHelper2< TestWeakImpl, H, I >
+struct TestImplInh : public ImplInheritanceHelper< TestWeakImpl, H, I >
{
TestImplInh() {}
explicit TestImplInh(int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1) {}
TestImplInh(int, int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1, 2) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1, 2) {}
TestImplInh(int, int, int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1, 2, 3) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1, 2, 3) {}
TestImplInh(int, int, int, int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1, 2, 3, 4) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1, 2, 3, 4) {}
TestImplInh(int, int, int, int, int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1, 2, 3, 4, 5) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1, 2, 3, 4, 5) {}
TestImplInh(int, int, int, int, int, int):
- ImplInheritanceHelper2< TestWeakImpl, H, I >(1, 2, 3, 4, 5, 6) {}
+ ImplInheritanceHelper< TestWeakImpl, H, I >(1, 2, 3, 4, 5, 6) {}
virtual ~TestImplInh()
{ OSL_TRACE( "> TestWeakImplInh dtor called... <\n" ); }
@@ -295,7 +272,7 @@ struct TestImplInh : public ImplInheritanceHelper2<
TestWeakImpl, H, I >
};
-struct TestAggImplInh : public AggImplInheritanceHelper2< TestWeakAggImpl, H,
I >
+struct TestAggImplInh : public AggImplInheritanceHelper< TestWeakAggImpl, H, I
>
{
virtual ~TestAggImplInh()
{ OSL_TRACE( "> TestAggImplInh dtor called... <\n" ); }
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index 8e98f12..2352b90 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::cppu;
using namespace ::osl;
@@ -424,7 +424,7 @@ Property * getBasicProps()
// test_OPropertySetHelper_Listener
class test_OPropertySetHelper_Listener
- : public WeakImplHelper3< XPropertyChangeListener,
XPropertiesChangeListener, XVetoableChangeListener >
+ : public WeakImplHelper < XPropertyChangeListener,
XPropertiesChangeListener, XVetoableChangeListener >
{
public:
sal_Int32 nDisposing;
diff --git a/dbaccess/source/core/api/query.hxx
b/dbaccess/source/core/api/query.hxx
index 6e63439..dec0320 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_DBACCESS_SOURCE_CORE_API_QUERY_HXX
#include "querydescriptor.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
@@ -39,7 +39,7 @@ namespace dbaccess
{
// OQuery - an object implementing the sdb.Query service
-typedef ::cppu::ImplHelper3 < css::sdbcx::XDataDescriptorFactory,
+typedef ::cppu::ImplHelper < css::sdbcx::XDataDescriptorFactory,
css::beans::XPropertyChangeListener,
css::sdbcx::XRename
> OQuery_Base;
diff --git a/dbaccess/source/core/api/querydescriptor.hxx
b/dbaccess/source/core/api/querydescriptor.hxx
index bd44067..316d8b2 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_QUERYDESCRIPTOR_HXX
#define INCLUDED_DBACCESS_SOURCE_CORE_API_QUERYDESCRIPTOR_HXX
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include <osl/mutex.hxx>
@@ -39,7 +39,7 @@ namespace dbaccess
{
// OQueryDescriptor_Base - a query descriptor (as the name suggests :)
-typedef ::cppu::ImplHelper3<
+typedef ::cppu::ImplHelper<
css::sdbcx::XColumnsSupplier,
css::lang::XUnoTunnel,
css::lang::XServiceInfo > OQueryDescriptor_BASE;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 0b5a75d..739c132 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -56,7 +56,7 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
@@ -146,7 +146,7 @@ typedef cppu::PartialWeakComponentImplHelper<
css::frame::XModel2
,
css::document::XDocumentRecovery
>
ODatabaseDocument_OfficeDocument;
-typedef ::cppu::ImplHelper3< css::frame::XTitle
+typedef ::cppu::ImplHelper < css::frame::XTitle
, css::frame::XTitleChangeBroadcaster
, css::frame::XUntitledNumbers
> ODatabaseDocument_Title;
diff --git a/dbaccess/source/core/inc/statement.hxx
b/dbaccess/source/core/inc/statement.hxx
index 0425c0a..2e2d230 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -35,7 +35,7 @@
#include "apitools.hxx"
#include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
// OStatementBase
@@ -132,10 +132,10 @@ protected:
// OStatement
-typedef ::cppu::ImplHelper3 < css::sdbc::XStatement
- , css::lang::XServiceInfo
- , css::sdbc::XBatchExecution
- > OStatement_IFACE;
+typedef ::cppu::ImplHelper < css::sdbc::XStatement
+ , css::lang::XServiceInfo
+ , css::sdbc::XBatchExecution
+ > OStatement_IFACE;
class OStatement :public OStatementBase
,public OStatement_IFACE
{
diff --git a/desktop/inc/pch/precompiled_deployment.hxx
b/desktop/inc/pch/precompiled_deployment.hxx
index 2a269e9..94e9229 100644
--- a/desktop/inc/pch/precompiled_deployment.hxx
+++ b/desktop/inc/pch/precompiled_deployment.hxx
@@ -109,11 +109,9 @@
#include <comphelper/sequence.hxx>
#include <comphelper/unwrapargs.hxx>
#include <config_features.h>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx
b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 3c4ae1e..d6715eb 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -95,8 +95,7 @@
#include <comphelper/unwrapargs.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/weakref.hxx>
#include <cstddef>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx
b/desktop/inc/pch/precompiled_sofficeapp.hxx
index 40dca82..5e66f2f 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -119,8 +119,8 @@
#include <config_vclplug.h>
#include <config_version.h>
#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cstdio>
#include <i18nlangtag/lang.h>
diff --git a/desktop/source/migration/services/jvmfwk.hxx
b/desktop/source/migration/services/jvmfwk.hxx
index 66e7565..7fe4697 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX
#define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index c18402a..8a77dc5 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -23,7 +23,7 @@
#include "EditBase.hxx"
#include <tools/link.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace dbtools { class FormattedColumnValue; }
struct ImplSVEvent;
@@ -117,7 +117,7 @@ private:
//= OEditControl
-typedef ::cppu::ImplHelper3< css::awt::XFocusListener,
+typedef ::cppu::ImplHelper < css::awt::XFocusListener,
css::awt::XKeyListener,
css::form::XChangeBroadcaster >
OEditControl_BASE;
diff --git a/forms/source/component/FormattedFieldWrapper.hxx
b/forms/source/component/FormattedFieldWrapper.hxx
index 5115700..e0fec84 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
#include "FormComponent.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XCloneable.hpp>
@@ -32,10 +32,10 @@ class OEditModel;
//= OFormattedFieldWrapper
-typedef ::cppu::WeakAggImplHelper3 < css::io::XPersistObject
- , css::lang::XServiceInfo
- , css::util::XCloneable
- > OFormattedFieldWrapper_Base;
+typedef ::cppu::WeakAggImplHelper < css::io::XPersistObject
+ , css::lang::XServiceInfo
+ , css::util::XCloneable
+ > OFormattedFieldWrapper_Base;
class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base
{
diff --git a/forms/source/component/clickableimage.hxx
b/forms/source/component/clickableimage.hxx
index 1b852dd..d259201 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/graphic/XGraphicObject.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
class SfxMedium;
@@ -49,7 +49,7 @@ namespace frm
// OClickableImageBaseModel
- typedef ::cppu::ImplHelper3 < css::form::XImageProducerSupplier
+ typedef ::cppu::ImplHelper < css::form::XImageProducerSupplier
, css::awt::XImageProducer
, css::form::submission::XSubmissionSupplier
> OClickableImageBaseModel_Base;
@@ -176,7 +176,7 @@ namespace frm
// OClickableImageBaseControl
- typedef ::cppu::ImplHelper3 < css::form::XApproveActionBroadcaster
+ typedef ::cppu::ImplHelper < css::form::XApproveActionBroadcaster
, css::form::submission::XSubmission
, css::frame::XDispatchProviderInterception
> OClickableImageBaseControl_BASE;
diff --git a/forms/source/component/entrylisthelper.hxx
b/forms/source/component/entrylisthelper.hxx
index 7f6c5c0..55f0a9e 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/form/binding/XListEntryListener.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -39,7 +39,7 @@ namespace frm
//= OEntryListHelper
- typedef ::cppu::ImplHelper3 < css::form::binding::XListEntrySink
+ typedef ::cppu::ImplHelper < css::form::binding::XListEntrySink
, css::form::binding::XListEntryListener
, css::util::XRefreshable
> OEntryListHelper_BASE;
diff --git a/forms/source/inc/FormComponent.hxx
b/forms/source/inc/FormComponent.hxx
index 7b77af4..d2fd28a 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -64,11 +64,7 @@
#include <comphelper/sequence.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/component.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
@@ -147,10 +143,10 @@ namespace frm
//= OControl
//= base class for form layer controls
-typedef ::cppu::ImplHelper3 < css::awt::XControl
- , css::lang::XEventListener
- , css::lang::XServiceInfo
- > OControl_BASE;
+typedef ::cppu::ImplHelper < css::awt::XControl
+ , css::lang::XEventListener
+ , css::lang::XServiceInfo
+ > OControl_BASE;
class OControl :public ::cppu::OComponentHelper
,public OControl_BASE
@@ -261,8 +257,8 @@ private:
};
// a form control implementing the XBoundControl interface
-typedef ::cppu::ImplHelper1 < css::form::XBoundControl
- > OBoundControl_BASE;
+typedef ::cppu::ImplHelper < css::form::XBoundControl
+ > OBoundControl_BASE;
class OBoundControl :public OControl
,public OBoundControl_BASE
{
@@ -313,7 +309,7 @@ protected:
//added for exporting OCX control
#define INVALID_OBJ_ID_IN_MSO 0xFFFF
-typedef ::cppu::ImplHelper7 < css::form::XFormComponent
+typedef ::cppu::ImplHelper < css::form::XFormComponent
, css::io::XPersistObject
, css::container::XNamed
, css::lang::XServiceInfo
@@ -542,7 +538,7 @@ public:
//= OBoundControlModel
//= model of a form layer control which is bound to a data source field
-typedef ::cppu::ImplHelper4 < css::form::XLoadListener
+typedef ::cppu::ImplHelper < css::form::XLoadListener
, css::form::XReset
, css::beans::XPropertyChangeListener
, css::sdb::XRowSetChangeListener
@@ -550,16 +546,16 @@ typedef ::cppu::ImplHelper4 < css::form::XLoadListener
// separated into an own base class since derivees can disable the support for
this
// interface, thus we want to easily exclude it in the queryInterface and
getTypes
-typedef ::cppu::ImplHelper1 < css::form::XBoundComponent
+typedef ::cppu::ImplHelper < css::form::XBoundComponent
> OBoundControlModel_COMMITTING;
// dito
-typedef ::cppu::ImplHelper2 < css::form::binding::XBindableValue
+typedef ::cppu::ImplHelper < css::form::binding::XBindableValue
, css::util::XModifyListener
> OBoundControlModel_BINDING;
// dito
-typedef ::cppu::ImplHelper2 <
css::form::validation::XValidityConstraintListener
+typedef ::cppu::ImplHelper <
css::form::validation::XValidityConstraintListener
,
css::form::validation::XValidatableFormComponent
> OBoundControlModel_VALIDATION;
diff --git a/forms/source/richtext/richtextmodel.hxx
b/forms/source/richtext/richtextmodel.hxx
index 7964aca..c26eb63 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/link.hxx>
#include <memory>
@@ -41,7 +41,7 @@ namespace frm
//= ORichTextModel
- typedef ::cppu::ImplHelper3 < css::awt::XControlModel
+ typedef ::cppu::ImplHelper < css::awt::XControlModel
, css::lang::XUnoTunnel
, css::util::XModifyBroadcaster
> ORichTextModel_BASE;
diff --git a/include/basegfx/tools/unopolypolygon.hxx
b/include/basegfx/tools/unopolypolygon.hxx
index 3baca23..2d8e743 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/FillRule.hpp>
#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
@@ -33,7 +33,7 @@ namespace basegfx
{
namespace unotools
{
- typedef ::cppu::WeakComponentImplHelper3<
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::rendering::XLinePolyPolygon2D,
::com::sun::star::rendering::XBezierPolyPolygon2D,
::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase;
diff --git a/include/basegfx/tools/unotools.hxx
b/include/basegfx/tools/unotools.hxx
index cc10e35..34f18b9 100644
--- a/include/basegfx/tools/unotools.hxx
+++ b/include/basegfx/tools/unotools.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_BASEGFX_TOOLS_UNOTOOLS_HXX
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/FillRule.hpp>
diff --git a/include/connectivity/sdbcx/VTypeDef.hxx
b/include/connectivity/sdbcx/VTypeDef.hxx
index c931a57..2393636 100644
--- a/include/connectivity/sdbcx/VTypeDef.hxx
+++ b/include/connectivity/sdbcx/VTypeDef.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -29,7 +29,7 @@ namespace connectivity
{
namespace sdbcx
{
- typedef ::cppu::WeakComponentImplHelper3<
::com::sun::star::sdbcx::XColumnsSupplier,
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::container::XNamed,
::com::sun::star::lang::XServiceInfo> ODescriptor_BASE;
}
diff --git a/include/svtools/genericunodialog.hxx
b/include/svtools/genericunodialog.hxx
index 5765e65..784baff 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/NotInitializedException.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
@@ -58,7 +58,7 @@ namespace svt
- typedef ::cppu::WeakImplHelper3 <
com::sun::star::ui::dialogs::XExecutableDialog
+ typedef ::cppu::WeakImplHelper <
com::sun::star::ui::dialogs::XExecutableDialog
, com::sun::star::lang::XServiceInfo
, com::sun::star::lang::XInitialization
> OGenericUnoDialogBase;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 48c5b5b..8aab4d5 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_SVDPAGV_HXX
#include <com/sun/star/awt/XControlContainer.hpp>
-#include <cppuhelper/implbase4.hxx>
#include <rtl/ustring.hxx>
#include <svl/lstner.hxx>
#include <svx/svdhlpln.hxx>
@@ -29,7 +28,6 @@
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
-#include <cppuhelper/implbase3.hxx>
#include <vector>
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/include/toolkit/awt/animatedimagespeer.hxx
b/include/toolkit/awt/animatedimagespeer.hxx
index 1881877..22ec9a6 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -37,7 +37,7 @@ namespace toolkit
//= AnimatedImagesPeer
struct AnimatedImagesPeer_Data;
- typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow
+ typedef ::cppu::ImplInheritanceHelper < VCLXWindow
,
::com::sun::star::awt::XAnimation
,
::com::sun::star::container::XContainerListener
,
::com::sun::star::util::XModifyListener
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 13233a4..e008821 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -27,8 +27,8 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/accimplaccess.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
@@ -52,7 +52,7 @@ class AccessibleStateSetHelper;
typedef ::comphelper::OAccessibleExtendedComponentHelper
AccessibleExtendedComponentHelper_BASE;
-typedef ::cppu::ImplHelper1<
+typedef ::cppu::ImplHelper<
::com::sun::star::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
class VCLExternalSolarLock;
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index 1985154..6c1df00 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -78,12 +78,10 @@
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Date.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <vcl/pointr.hxx>
#include <vcl/image.hxx>
@@ -145,7 +143,7 @@ public:
// class VCLXButton
-typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl
+typedef ::cppu::ImplInheritanceHelper < VCLXGraphicControl
, ::com::sun::star::awt::XButton
,
::com::sun::star::awt::XToggleButton
> VCLXButton_Base;
@@ -751,7 +749,7 @@ public:
// class VCLXListBox
-typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow
+typedef ::cppu::ImplInheritanceHelper < VCLXWindow
, ::com::sun::star::awt::XListBox
,
::com::sun::star::awt::XTextLayoutConstrains
,
::com::sun::star::awt::XItemListListener
@@ -828,7 +826,7 @@ public:
// class VCLXComboBox
-typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit
+typedef ::cppu::ImplInheritanceHelper < VCLXEdit
, ::com::sun::star::awt::XComboBox
,
::com::sun::star::awt::XItemListListener > VCLXComboBox_Base;
class VCLXComboBox : public VCLXComboBox_Base
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx
b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 091a7e2..0377661 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -29,8 +29,7 @@
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
@@ -45,7 +44,7 @@
// class ControlModelContainerBase
typedef UnoControlModel ControlModel_Base;
-typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base
+typedef ::cppu::AggImplInheritanceHelper < ControlModel_Base
, ::com::sun::star::lang::XMultiServiceFactory
, ::com::sun::star::container::XContainer
, ::com::sun::star::container::XNameContainer
@@ -208,7 +207,7 @@ class ResourceListener :public
::com::sun::star::util::XModifyListener,
bool
m_bListening;
};
-typedef ::cppu::AggImplInheritanceHelper3 < UnoControlContainer
+typedef ::cppu::AggImplInheritanceHelper < UnoControlContainer
, ::com::sun::star::container::XContainerListener
, ::com::sun::star::util::XChangesListener
, ::com::sun::star::util::XModifyListener
diff --git a/include/toolkit/controls/dialogcontrol.hxx
b/include/toolkit/controls/dialogcontrol.hxx
index 347fc20..399309d 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -31,14 +31,13 @@
#include <toolkit/helper/macros.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <list>
-typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase
- ,
::com::sun::star::awt::XUnoControlDialog
- ,
::com::sun::star::awt::XWindowListener
- > UnoDialogControl_Base;
+typedef ::cppu::AggImplInheritanceHelper < ControlContainerBase
+ ,
::com::sun::star::awt::XUnoControlDialog
+ ,
::com::sun::star::awt::XWindowListener
+ > UnoDialogControl_Base;
class UnoDialogControl : public UnoDialogControl_Base
{
private:
diff --git a/include/toolkit/controls/roadmapcontrol.hxx
b/include/toolkit/controls/roadmapcontrol.hxx
index a935bad..7c64c43 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -32,9 +32,7 @@
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/awt/XItemListener.hpp>
#include <com/sun/star/awt/XItemEventBroadcaster.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
@@ -47,7 +45,7 @@ namespace toolkit
typedef GraphicControlModel UnoControlRoadmapModel_Base;
- typedef ::cppu::ImplHelper3 < css::lang::XSingleServiceFactory
+ typedef ::cppu::ImplHelper < css::lang::XSingleServiceFactory
, css::container::XContainer
, css::container::XIndexContainer
> UnoControlRoadmapModel_IBase;
@@ -55,7 +53,7 @@ namespace toolkit
typedef UnoControlBase UnoControlRoadmap_Base;
- typedef ::cppu::ImplHelper4 < css::awt::XItemEventBroadcaster
+ typedef ::cppu::ImplHelper < css::awt::XItemEventBroadcaster
, css::container::XContainerListener
, css::awt::XItemListener
, css::beans::XPropertyChangeListener
@@ -64,7 +62,7 @@ namespace toolkit
- typedef ::cppu::ImplHelper2< css::container::XContainerListener,
+ typedef ::cppu::ImplHelper < css::container::XContainerListener,
css::awt::XItemEventBroadcaster>
SVTXRoadmap_Base;
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 8efc227..1e2d74b 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -27,8 +27,7 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/io/XStream.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
class SvStream;
@@ -37,7 +36,7 @@ namespace utl
//= OInputStreamWrapper
-typedef ::cppu::WeakImplHelper1 < css::io::XInputStream
+typedef ::cppu::WeakImplHelper < css::io::XInputStream
> InputStreamWrapper_Base;
// needed for some compilers
/// helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
@@ -73,12 +72,12 @@ protected:
//= OSeekableInputStreamWrapper
-typedef ::cppu::ImplHelper1 < css::io::XSeekable
+typedef ::cppu::ImplHelper < css::io::XSeekable
> OSeekableInputStreamWrapper_Base;
/** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
*/
-class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public
::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, css::io::XSeekable >
+class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public
::cppu::ImplInheritanceHelper < OInputStreamWrapper, css::io::XSeekable >
{
protected:
OSeekableInputStreamWrapper() {}
@@ -94,7 +93,7 @@ public:
//= OOutputStreamWrapper
-typedef ::cppu::WeakImplHelper1<css::io::XOutputStream>
OutputStreamWrapper_Base;
+typedef ::cppu::WeakImplHelper<css::io::XOutputStream>
OutputStreamWrapper_Base;
// needed for some compilers
class OOutputStreamWrapper : public OutputStreamWrapper_Base
{
@@ -118,7 +117,7 @@ protected:
//= OSeekableOutputStreamWrapper
-typedef ::cppu::ImplHelper1 < css::io::XSeekable
+typedef ::cppu::ImplHelper < css::io::XSeekable
> OSeekableOutputStreamWrapper_Base;
/** helper class for wrapping an SvStream into an
com.sun.star.io::XOutputStream
which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
@@ -144,7 +143,7 @@ private:
virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-class UNOTOOLS_DLLPUBLIC OStreamWrapper : public
::cppu::ImplInheritanceHelper3 < OSeekableInputStreamWrapper, css::io::XStream,
css::io::XOutputStream, css::io::XTruncate >
+class UNOTOOLS_DLLPUBLIC OStreamWrapper : public ::cppu::ImplInheritanceHelper
< OSeekableInputStreamWrapper, css::io::XStream, css::io::XOutputStream,
css::io::XTruncate >
{
public:
OStreamWrapper(SvStream& _rStream);
diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 8100c0f..6a6170f 100644
--- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
@@ -23,9 +23,9 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
-class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3<
+class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper <
::com::sun::star::xml::sax::XExtendedDocumentHandler,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization>
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index dda7903..7a3a952 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -31,11 +31,11 @@
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
struct SvXMLAttributeList_Impl;
-class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper3<
+class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper <
::com::sun::star::xml::sax::XAttributeList,
::com::sun::star::util::XCloneable,
::com::sun::star::lang::XUnoTunnel>
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index d13a69f..5aa7db3 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -28,14 +28,14 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SvUnoAttributeContainer_CreateInstance();
class SvXMLAttrContainerData;
class XMLOFF_DLLPUBLIC SvUnoAttributeContainer:
- public ::cppu::WeakAggImplHelper3<
+ public ::cppu::WeakAggImplHelper <
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel,
::com::sun::star::container::XNameContainer >
diff --git a/lotuswordpro/inc/pch/precompiled_lwpft.hxx
b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
index fe3db8d..c7bc530 100644
--- a/lotuswordpro/inc/pch/precompiled_lwpft.hxx
+++ b/lotuswordpro/inc/pch/precompiled_lwpft.hxx
@@ -38,8 +38,7 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <i18nlangtag/languagetagicu.hxx>
#include <limits.h>
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index 6a5bcd7..a7c3565 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -60,8 +60,6 @@
#include "xfsaxstream.hxx"
#include "xfsaxattrlist.hxx"
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/document/XFilter.hpp>
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index f2fb10d..27a5718 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -62,8 +62,6 @@
#include "ixfstream.hxx"
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 511e901..d16f767 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -37,7 +37,7 @@
#include <cppconn/driver.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <rtl/string.hxx>
@@ -64,7 +64,7 @@ namespace connectivity
typedef ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess > my_XNameAccessRef;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
- typedef ::cppu::WeakComponentImplHelper3<
::com::sun::star::sdbc::XConnection,
+ typedef ::cppu::WeakComponentImplHelper <
::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index 4b7590d..88bd5fc 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -35,18 +35,7 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
cppuhelper/access_control.hxx \
cppuhelper/basemutex.hxx \
cppuhelper/bootstrap.hxx \
- cppuhelper/compbase1.hxx \
- cppuhelper/compbase10.hxx \
- cppuhelper/compbase11.hxx \
- cppuhelper/compbase12.hxx \
- cppuhelper/compbase2.hxx \
- cppuhelper/compbase3.hxx \
- cppuhelper/compbase4.hxx \
- cppuhelper/compbase5.hxx \
- cppuhelper/compbase6.hxx \
- cppuhelper/compbase7.hxx \
- cppuhelper/compbase8.hxx \
- cppuhelper/compbase9.hxx \
+ cppuhelper/compbase.hxx \
cppuhelper/compbase_ex.hxx \
cppuhelper/component.hxx \
cppuhelper/component_context.hxx \
@@ -54,19 +43,7 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
cppuhelper/exc_hlp.hxx \
cppuhelper/factory.hxx \
cppuhelper/findsofficepath.h \
- cppuhelper/implbase1.hxx \
- cppuhelper/implbase10.hxx \
- cppuhelper/implbase11.hxx \
- cppuhelper/implbase12.hxx \
- cppuhelper/implbase13.hxx \
- cppuhelper/implbase2.hxx \
- cppuhelper/implbase3.hxx \
- cppuhelper/implbase4.hxx \
- cppuhelper/implbase5.hxx \
- cppuhelper/implbase6.hxx \
- cppuhelper/implbase7.hxx \
- cppuhelper/implbase8.hxx \
- cppuhelper/implbase9.hxx \
+ cppuhelper/implbase.hxx \
cppuhelper/implbase_ex.hxx \
cppuhelper/implbase_ex_post.hxx \
cppuhelper/implbase_ex_pre.hxx \
diff --git
a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index def4910..d69afa3 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -33,7 +33,7 @@
*
*************************************************************************/
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -70,7 +70,7 @@ static OUString getImplementationName_MyService2Impl()
return OUString("my_module.my_sc_implementation.MyService2");
}
-class MyService2Impl : public ::cppu::WeakImplHelper3<
+class MyService2Impl : public ::cppu::WeakImplHelper <
::my_module::XSomething, lang::XServiceInfo, lang::XInitialization >
{
OUString m_sData;
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
index dee2dc3..6bbd892 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
@@ -45,7 +45,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <map>
@@ -55,7 +55,7 @@ namespace connectivity
namespace skeleton
{
- typedef ::cppu::WeakComponentImplHelper3<
::com::sun::star::sdbc::XConnection,
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
index aa9d82b..aea2d87 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
@@ -43,9 +43,8 @@
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -60,7 +59,7 @@ enum FilterType
/* This component will be instantiated for both import or export. Whether it
calls
* setSourceDocument or setTargetDocument determines which Impl function the
filter
* member calls */
-class FilterDetect : public cppu::WeakImplHelper3
<com::sun::star::document::XExtendedFilterDetection,
+class FilterDetect : public cppu::WeakImplHelper
<com::sun::star::document::XExtendedFilterDetection,
com::sun::star::lang::XInitialization,
com::sun::star::lang::XServiceInfo>
{
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 0dc302a..65287b7 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -34,9 +34,7 @@
*************************************************************************/
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
#include <uno/lbnames.h>
@@ -73,7 +71,7 @@ using namespace ::com::sun::star::xml::sax;
namespace XFlatXml {
-class XFlatXml : public WeakImplHelper3< XImportFilter, XExportFilter,
XDocumentHandler>
+class XFlatXml : public WeakImplHelper< XImportFilter, XExportFilter,
XDocumentHandler>
{
private:
// the UNO ServiceFactory
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index 4ee22a0..aca1ce2 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -26,8 +26,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XControlNotificationListener.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#define MYPROTOCOLHANDLER_IMPLEMENTATIONNAME "vnd.demo.Impl.ProtocolHandler"
#define MYPROTOCOLHANDLER_SERVICENAME "vnd.demo.ProtocolHandler"
@@ -49,7 +48,7 @@ namespace com
}
-class MyProtocolHandler : public cppu::WeakImplHelper3
+class MyProtocolHandler : public cppu::WeakImplHelper
<
com::sun::star::frame::XDispatchProvider,
com::sun::star::lang::XInitialization,
@@ -100,7 +99,7 @@ sal_Bool SAL_CALL MyProtocolHandler_supportsService( const
::rtl::OUString& Serv
SAL_CALL MyProtocolHandler_createInstance( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &
rContext)
throw ( ::com::sun::star::uno::Exception );
-class BaseDispatch : public cppu::WeakImplHelper2
+class BaseDispatch : public cppu::WeakImplHelper
<
::com::sun::star::frame::XDispatch,
::com::sun::star::frame::XControlNotificationListener
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index a5b0a53..e9772eb 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -21,7 +21,7 @@
#include <sal/config.h>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace rptxml
OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum&
_eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute);
-typedef ::cppu::WeakAggImplHelper3<
::com::sun::star::xml::sax::XDocumentHandler
+typedef ::cppu::WeakAggImplHelper <
::com::sun::star::xml::sax::XDocumentHandler
, ::com::sun::star::lang::XInitialization
, ::com::sun::star::lang::XServiceInfo>
ExportDocumentHandler_BASE;
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 6b1a638..52d04ff 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -21,7 +21,7 @@
#include <sal/config.h>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -34,7 +34,7 @@
class SvXMLTokenMap;
namespace rptxml
{
-typedef ::cppu::WeakAggImplHelper3<
::com::sun::star::xml::sax::XDocumentHandler
+typedef ::cppu::WeakAggImplHelper <
::com::sun::star::xml::sax::XDocumentHandler
, ::com::sun::star::lang::XInitialization
, ::com::sun::star::lang::XServiceInfo>
ImportDocumentHandler_BASE;
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx
b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 61601eb..4059bfd 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -35,7 +35,7 @@ namespace rptui
//= DefaultComponentInspectorModel
- typedef ::cppu::WeakAggImplHelper3 <
::com::sun::star::inspection::XObjectInspectorModel
+ typedef ::cppu::WeakAggImplHelper <
::com::sun::star::inspection::XObjectInspectorModel
,
::com::sun::star::lang::XServiceInfo
,
::com::sun::star::lang::XInitialization
>
DefaultComponentInspectorModel_Base;
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx
b/sc/inc/pch/precompiled_vbaobj.hxx
index 90120f4..19f08e4 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -206,9 +206,6 @@
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <filter/msfilter/msvbahelper.hxx>
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx
b/sc/source/ui/inc/AccessibleDocument.hxx
index 6e45caf..bd01df0 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -24,7 +24,7 @@
#include "viewdata.hxx"
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include <svx/IAccessibleViewForwarder.hxx>
@@ -44,7 +44,7 @@ namespace utl
<code>AccessibleContext</code> service.
*/
-typedef cppu::ImplHelper3<
::com::sun::star::accessibility::XAccessibleSelection,
+typedef cppu::ImplHelper <
::com::sun::star::accessibility::XAccessibleSelection,
::com::sun::star::accessibility::XAccessibleExtendedAttributes,
::com::sun::star::view::XSelectionChangeListener >
ScAccessibleDocumentImpl;
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 9efff8a..7f2d8ec 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -262,9 +262,6 @@
#include <cppuhelper/compbase6.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index a3605b2..b0d97df 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -28,15 +28,14 @@
#include <unordered_map>
#include <vector>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace sdr { namespace table {
typedef std::vector< ::com::sun::star::beans::Property > PropertyVector;
typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash,
std::equal_to< OUString > > PropertyMap;
-class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1<
::com::sun::star::beans::XPropertySetInfo >
+class FastPropertySetInfo : public ::cppu::WeakAggImplHelper <
::com::sun::star::beans::XPropertySetInfo >
{
public:
explicit FastPropertySetInfo( const PropertyVector& rProps );
@@ -59,7 +58,7 @@ private:
-class FastPropertySet : public ::cppu::WeakAggImplHelper3<
::com::sun::star::beans::XPropertySet,
::com::sun::star::beans::XMultiPropertySet,
::com::sun::star::beans::XFastPropertySet >
+class FastPropertySet : public ::cppu::WeakAggImplHelper <
::com::sun::star::beans::XPropertySet,
::com::sun::star::beans::XMultiPropertySet,
::com::sun::star::beans::XFastPropertySet >
{
public:
explicit FastPropertySet( const rtl::Reference< FastPropertySetInfo >&
xInfo );
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 20133ca..d297b2e 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
@@ -42,7 +42,7 @@ public:
};
class SvxShapeCollection :
- public cppu::WeakAggImplHelper3<drawing::XShapes, lang::XServiceInfo,
lang::XComponent>,
+ public cppu::WeakAggImplHelper<drawing::XShapes, lang::XServiceInfo,
lang::XComponent>,
public SvxShapeCollectionMutex
{
private:
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx
b/sw/inc/pch/precompiled_vbaswobj.hxx
index 15c2d2c..a386235 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -109,9 +109,6 @@
#include <comphelper/unwrapargs.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <editeng/acorrcfg.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx
index 19826a3..41e0b54 100644
--- a/uui/inc/pch/precompiled_uui.hxx
+++ b/uui/inc/pch/precompiled_uui.hxx
@@ -107,8 +107,7 @@
#include <comphelper/string.hxx>
#include <cppu/macros.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <iostream>
#include <memory>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 4d147ed..e8a85cb 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -278,7 +278,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
diff --git a/vcl/source/components/fontident.cxx
b/vcl/source/components/fontident.cxx
index a7e6f36..a8264d6 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star::uno;
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::awt;
namespace vcl
{
-class FontIdentificator : public ::cppu::WeakAggImplHelper3< XMaterialHolder,
XInitialization, XServiceInfo >
+class FontIdentificator : public ::cppu::WeakAggImplHelper < XMaterialHolder,
XInitialization, XServiceInfo >
{
Font m_aFont;
public:
diff --git a/xmloff/inc/pch/precompiled_xo.hxx
b/xmloff/inc/pch/precompiled_xo.hxx
index b78a28a..5bbdfe8 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -499,8 +499,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
#include <functional>
diff --git a/xmloff/source/core/PropertySetMerger.cxx
b/xmloff/source/core/PropertySetMerger.cxx
index 872f6d5..6dc3deb 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -25,9 +25,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
-class PropertySetMergerImpl : public ::cppu::WeakAggImplHelper3< XPropertySet,
XPropertyState, XPropertySetInfo >
+class PropertySetMergerImpl : public ::cppu::WeakAggImplHelper< XPropertySet,
XPropertyState, XPropertySetInfo >
{
private:
Reference< XPropertySet > mxPropSet1;
commit 68396b8fe5dc4fd9815e0f3539f0eb196a814136
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Sun Oct 4 22:19:14 2015 -0400
vba: convert to variadic InheritedHelperInterfaceImpl&WeakImpl etc
Variadic templates ~-i.e. templates, which can take an arbitrary
number of arguments of any type-~ is new C++11 feature
note that uno::Reference and cppu::UnoType can only take one parameter
thus leave XNamedObjectCollectionHelper non-variadic in
vbacollectionimpl.hxx
Change-Id: I22e60fa050ee31d39ae8bb7cac06cf243c4587b1
diff --git a/include/vbahelper/vbaapplicationbase.hxx
b/include/vbahelper/vbaapplicationbase.hxx
index 0c89e3f..f8e9f3a 100644
--- a/include/vbahelper/vbaapplicationbase.hxx
+++ b/include/vbahelper/vbaapplicationbase.hxx
@@ -24,7 +24,7 @@
#include <vbahelper/vbahelperinterface.hxx>
#include <sfx2/objsh.hxx>
-typedef InheritedHelperInterfaceImpl1< ov::XApplicationBase >
ApplicationBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XApplicationBase >
ApplicationBase_BASE;
struct VbaApplicationBase_Impl;
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 2fbb617..d3d20fd 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -28,10 +28,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase1.hxx>
-
#include <vbahelper/vbahelper.hxx>
#include <vbahelper/vbahelperinterface.hxx>
@@ -39,7 +35,7 @@
-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration >
EnumerationHelper_BASE;
+typedef ::cppu::WeakImplHelper< css::container::XEnumeration >
EnumerationHelper_BASE;
@@ -139,13 +135,13 @@ public:
-typedef ::cppu::WeakImplHelper3< css::container::XNameAccess,
css::container::XIndexAccess, css::container::XEnumerationAccess >
XNamedCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< css::container::XNameAccess,
css::container::XIndexAccess, css::container::XEnumerationAccess >
XNamedCollectionHelper_BASE;
-template< typename Ifc1 >
+template< typename OneIfc >
class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
{
public:
-typedef std::vector< css::uno::Reference< Ifc1 > > XNamedVec;
+typedef std::vector< css::uno::Reference< OneIfc > > XNamedVec;
private:
class XNamedEnumerationHelper : public EnumerationHelper_BASE
@@ -174,7 +170,7 @@ protected:
public:
XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap
), cachePos(mXNamedVec.begin()) {}
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType( ) throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return
cppu::UnoType<Ifc1>::get(); }
+ virtual css::uno::Type SAL_CALL getElementType( ) throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return
cppu::UnoType< OneIfc >::get(); }
virtual sal_Bool SAL_CALL hasElements( ) throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return (
mXNamedVec.size() > 0 ); }
// XNameAcess
virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw
(css::container::NoSuchElementException, css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE
@@ -228,10 +224,10 @@ public:
};
// including a HelperInterface implementation
-template< typename Ifc1 >
-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+template< typename... Ifc >
+class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc... >
{
-typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
+typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase;
protected:
css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
@@ -324,24 +320,24 @@ public:
};
-typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
+typedef ::cppu::WeakImplHelper<ov::XCollection> XCollection_InterfacesBASE;
-typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
+typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase;
// compatible with the old collections ( pre XHelperInterface base class ) (
some internal objects still use this )
-class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase1
+class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase
{
public:
- ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface >
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess )
throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext,
xIndexAccess){}
+ ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface >
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess )
throw( css::uno::RuntimeException ) : CollImplBase( xParent, xContext,
xIndexAccess){}
};
-template <typename Ifc> // where Ifc must implement XCollectionTest
-class CollTestImplHelper : public ScVbaCollectionBase<
::cppu::WeakImplHelper1< Ifc > >
+template < typename... Ifc > // where Ifc must implement XCollectionTest
+class CollTestImplHelper : public ScVbaCollectionBase<
::cppu::WeakImplHelper< Ifc... > >
{
-typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > ImplBase1;
+typedef ScVbaCollectionBase< ::cppu::WeakImplHelper< Ifc... > > ImplBase;
public:
- CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >&
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool
bIgnoreCase = false ) throw( css::uno::RuntimeException ) : ImplBase1( xParent,
xContext, xIndexAccess, bIgnoreCase ) {}
+ CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >&
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool
bIgnoreCase = false ) throw( css::uno::RuntimeException ) : ImplBase( xParent,
xContext, xIndexAccess, bIgnoreCase ) {}
};
diff --git a/include/vbahelper/vbadialogbase.hxx
b/include/vbahelper/vbadialogbase.hxx
index 276cc9a..27d6246 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -19,12 +19,11 @@
#ifndef INCLUDED_VBAHELPER_VBADIALOGBASE_HXX
#define INCLUDED_VBAHELPER_VBADIALOGBASE_HXX
-#include <cppuhelper/implbase1.hxx>
#include <ooo/vba/XDialogBase.hpp>
#include <vbahelper/vbahelperinterface.hxx>
#include <com/sun/star/frame/XModel.hpp>
-typedef InheritedHelperInterfaceImpl1< ov::XDialogBase > VbaDialogBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase > VbaDialogBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
{
diff --git a/include/vbahelper/vbadialogsbase.hxx
b/include/vbahelper/vbadialogsbase.hxx
index 239995a..3197232 100644
--- a/include/vbahelper/vbadialogsbase.hxx
+++ b/include/vbahelper/vbadialogsbase.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX
#define INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX
-#include <cppuhelper/implbase1.hxx>
#include <ooo/vba/XHelperInterface.hpp>
#include <ooo/vba/XDialogsBase.hpp>
#include <vbahelper/vbahelperinterface.hxx>
#include <com/sun/star/frame/XModel.hpp>
-typedef InheritedHelperInterfaceImpl1< ov::XDialogsBase > VbaDialogsBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XDialogsBase >
VbaDialogsBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE
{
diff --git a/include/vbahelper/vbadocumentbase.hxx
b/include/vbahelper/vbadocumentbase.hxx
index 9fd0ed4..3aebefd 100644
--- a/include/vbahelper/vbadocumentbase.hxx
+++ b/include/vbahelper/vbadocumentbase.hxx
@@ -23,7 +23,7 @@
#include <ooo/vba/XDocumentBase.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentBase >
VbaDocumentBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XDocumentBase >
VbaDocumentBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDocumentBase : public VbaDocumentBase_BASE
{
diff --git a/include/vbahelper/vbafontbase.hxx
b/include/vbahelper/vbafontbase.hxx
index 8c759ea..ee64977 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -19,13 +19,11 @@
#ifndef INCLUDED_VBAHELPER_VBAFONTBASE_HXX
#define INCLUDED_VBAHELPER_VBAFONTBASE_HXX
-#include <cppuhelper/implbase1.hxx>
-
#include <ooo/vba/XFontBase.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ov::XFontBase > VbaFontBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XFontBase > VbaFontBase_BASE;
class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE
{
diff --git a/include/vbahelper/vbaglobalbase.hxx
b/include/vbahelper/vbaglobalbase.hxx
index fec13ae..96e26d9 100644
--- a/include/vbahelper/vbaglobalbase.hxx
+++ b/include/vbahelper/vbaglobalbase.hxx
@@ -22,7 +22,7 @@
#include <vbahelper/vbahelperinterface.hxx>
#include <ooo/vba/XGlobalsBase.hpp>
-typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XGlobalsBase > Globals_BASE;
class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE
{
protected:
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index bf413ba..7c4956a 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/awt/XUnitConversion.hpp>
#include <basic/basmgr.hxx>
#include <basic/sberrors.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
diff --git a/include/vbahelper/vbahelperinterface.hxx
b/include/vbahelper/vbahelperinterface.hxx
index 2c97100..989101c 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -19,9 +19,7 @@
#ifndef INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX
#define INCLUDED_VBAHELPER_VBAHELPERINTERFACE_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <ooo/vba/XHelperInterface.hpp>
#include <vbahelper/vbahelper.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -53,8 +51,8 @@
// }
//
-template< typename Ifc1 >
-class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceImpl : public Ifc1
+template< typename... Ifc >
+class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceImpl : public Ifc...
{
protected:
css::uno::WeakReference< ov::XHelperInterface > mxParent;
@@ -99,34 +97,14 @@ public:
}
};
-template< typename Ifc1 >
-class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceImpl1 : public
InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
+template <typename... Ifc >
+class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceWeakImpl : public
InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > >
{
- typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
Base;
+ typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > >
Base;
public:
- InheritedHelperInterfaceImpl1< Ifc1 >() {}
- InheritedHelperInterfaceImpl1< Ifc1 >( const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
- InheritedHelperInterfaceImpl1< Ifc1 >( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
-};
-
-template< typename Ifc1, typename Ifc2 >
-class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceImpl2 : public
InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
-{
- typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2
> > Base;
-public:
- InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >() {}
- InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >( const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
- InheritedHelperInterfaceImpl2< Ifc1, Ifc2 >( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
-};
-
-template< typename Ifc1, typename Ifc2, typename Ifc3 >
-class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceImpl3 : public
InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
-{
- typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2,
Ifc3 > > Base;
-public:
- InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >() {}
- InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >( const
css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext
) {}
- InheritedHelperInterfaceImpl3< Ifc1, Ifc2, Ifc3 >( const
css::uno::Reference< ov::XHelperInterface >& xParent, const
css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent,
xContext ) {}
+ InheritedHelperInterfaceWeakImpl< Ifc... >() {}
+ InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
+ InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
};
diff --git a/include/vbahelper/vbapagesetupbase.hxx
b/include/vbahelper/vbapagesetupbase.hxx
index 7ee5d2c..aea83ec 100644
--- a/include/vbahelper/vbapagesetupbase.hxx
+++ b/include/vbahelper/vbapagesetupbase.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX
#define INCLUDED_VBAHELPER_VBAPAGESETUPBASE_HXX
-#include <cppuhelper/implbase1.hxx>
#include <ooo/vba/XPageSetupBase.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ooo::vba::XPageSetupBase >
VbaPageSetupBase_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XPageSetupBase >
VbaPageSetupBase_BASE;
class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE
{
diff --git a/include/vbahelper/vbapropvalue.hxx
b/include/vbahelper/vbapropvalue.hxx
index 0abc159..072578d 100644
--- a/include/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
@@ -19,11 +19,11 @@
#ifndef SC_VBA_PROPVALULE_HXX
#define SC_VBA_PROPVALULE_HXX
#include <ooo/vba/XPropValue.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vbahelper/vbahelper.hxx>
-typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
+typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE;
class VBAHELPER_DLLPUBLIC PropListener
{
diff --git a/include/vbahelper/vbareturntypes.hxx
b/include/vbahelper/vbareturntypes.hxx
index 99885d6..2c5b387 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_VBAHELPER_VBARETURNTYPES_HXX
#define INCLUDED_VBAHELPER_VBARETURNTYPES_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/script/XDefaultProperty.hpp>
#include <ooo/vba/msforms/XReturnInteger.hpp>
#include <ooo/vba/msforms/XReturnBoolean.hpp>
@@ -34,7 +34,7 @@ namespace ooo
namespace vba
{
template< typename T1, typename T2 >
- class DefaultReturnHelper : public ::cppu::WeakImplHelper2< T2,
css::script::XDefaultProperty >
+ class DefaultReturnHelper : public ::cppu::WeakImplHelper< T2,
css::script::XDefaultProperty >
{
T1 mnValue;
public:
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 5cedd99..0670b39 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -26,11 +26,11 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <ooo/vba/msforms/XShape.hpp>
#include <ooo/vba/msforms/XLineFormat.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vbahelper/vbahelperinterface.hxx>
-typedef ::cppu::WeakImplHelper2< ov::msforms::XShape,
css::lang::XEventListener > ListeningShape;
+typedef ::cppu::WeakImplHelper< ov::msforms::XShape,
css::lang::XEventListener > ListeningShape;
typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
diff --git a/include/vbahelper/vbatextframe.hxx
b/include/vbahelper/vbatextframe.hxx
index 5a17563..ea6c892 100644
--- a/include/vbahelper/vbatextframe.hxx
+++ b/include/vbahelper/vbatextframe.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ov::msforms::XTextFrame >
VbaTextFrame_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XTextFrame >
VbaTextFrame_BASE;
class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE
{
diff --git a/include/vbahelper/vbawindowbase.hxx
b/include/vbahelper/vbawindowbase.hxx
index cd2b8a7..b8c70ed 100644
--- a/include/vbahelper/vbawindowbase.hxx
+++ b/include/vbahelper/vbawindowbase.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ov::XWindowBase > WindowBaseImpl_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::XWindowBase >
WindowBaseImpl_BASE;
class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE
{
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 6f10b66..d60eb29 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -23,7 +23,7 @@
#include <ooo/vba/excel/XChart.hpp>
#include <vbahelper/vbahelperinterface.hxx>
#include <memory>
-typedef InheritedHelperInterfaceImpl1< ov::excel::XAxis > ScVbaAxis_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::excel::XAxis > ScVbaAxis_BASE;
class ScVbaChart;
class ScVbaAxis : public ScVbaAxis_BASE
{
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index b540585..7f94c6b 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -35,7 +35,7 @@ using namespace ::ooo::vba;
using namespace ::ooo::vba::excel;
typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base;
-typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base;
+typedef InheritedHelperInterfaceWeakImpl<excel::XBorder > ScVbaBorder_Base;
// #TODO sort these indexes to match the order in which Excel iterates over the
// borders, the enumeration will match the order in this list
diff --git a/sc/source/ui/vba/vbacharacters.hxx
b/sc/source/ui/vba/vbacharacters.hxx
index d91bd3f..03853af 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -25,7 +25,7 @@
#include <vbahelper/vbahelperinterface.hxx>
#include "vbapalette.hxx"
-typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters >
ScVbaCharacters_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::excel::XCharacters >
ScVbaCharacters_BASE;
class ScVbaCharacters : public ScVbaCharacters_BASE
{
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 34cfb47..e80f7c2 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -33,7 +33,7 @@
#include <ooo/vba/excel/XSeries.hpp>
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE;
+typedef InheritedHelperInterfaceWeakImpl<ov::excel::XChart > ChartImpl_BASE;
class ScVbaChart : public ChartImpl_BASE
{
diff --git a/sc/source/ui/vba/vbachartobject.hxx
b/sc/source/ui/vba/vbachartobject.hxx
index cdf5cea..081dc43 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -29,7 +29,7 @@
#include <vbahelper/vbahelperinterface.hxx>
#include <memory>
-typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject >
ChartObjectImpl_BASE;
+typedef InheritedHelperInterfaceWeakImpl<ov::excel::XChartObject >
ChartObjectImpl_BASE;
class ScVbaChartObject : public ChartObjectImpl_BASE
{
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 9f7e004..1ad3d50 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -29,7 +29,7 @@
#include <vbahelper/vbahelperinterface.hxx>
-typedef InheritedHelperInterfaceImpl1< ov::excel::XComment > ScVbaComment_BASE;
+typedef InheritedHelperInterfaceWeakImpl< ov::excel::XComment >
ScVbaComment_BASE;
class ScVbaComment : public ScVbaComment_BASE
{
diff --git a/sc/source/ui/vba/vbacondition.cxx
b/sc/source/ui/vba/vbacondition.cxx
index 2b60b2f..32ebb1c 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -28,15 +28,15 @@ using namespace ::com::sun::star;
const sal_Int32 ISFORMULA = 98765432;
-template< typename Ifc1 >
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
