dbaccess/source/core/api/CacheSet.hxx | 4 -
dbaccess/source/core/api/PrivateRow.hxx | 4 -
dbaccess/source/core/api/resultset.hxx | 4 -
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 4 -
dbaccess/source/core/dataaccess/ModelImpl.cxx | 5 +-
dbaccess/source/core/dataaccess/SharedConnection.hxx | 6 +-
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 18 ++++----
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 13 ++---
dbaccess/source/core/dataaccess/databasecontext.cxx | 6 +-
dbaccess/source/core/dataaccess/databasecontext.hxx | 10 ++--
dbaccess/source/core/dataaccess/datasource.cxx | 5 +-
dbaccess/source/core/dataaccess/datasource.hxx | 26 +++++------
dbaccess/source/core/dataaccess/documentdefinition.cxx | 13 +++--
dbaccess/source/core/dataaccess/documentevents.hxx | 6 +-
dbaccess/source/core/dataaccess/intercept.hxx | 8 +--
dbaccess/source/core/inc/ContainerMediator.hxx | 4 -
dbaccess/source/core/inc/ContentHelper.hxx | 22 ++++-----
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 10 ++--
dbaccess/source/core/inc/PropertyForward.hxx | 6 +-
dbaccess/source/core/inc/TableDeco.hxx | 20 ++++----
dbaccess/source/core/inc/column.hxx | 9 +---
dbaccess/source/core/inc/veto.hxx | 6 +-
dbaccess/source/core/recovery/subcomponentloader.hxx | 6 +-
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 5 +-
dbaccess/source/ext/macromigration/progresscapture.hxx | 6 +-
dbaccess/source/filter/xml/dbloader2.cxx | 6 +-
dbaccess/source/sdbtools/connection/connectiontools.hxx | 10 ++--
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 6 +-
dbaccess/source/sdbtools/connection/objectnames.hxx | 6 +-
dbaccess/source/sdbtools/connection/tablename.hxx | 6 +-
dbaccess/source/ui/app/subcomponentmanager.hxx | 6 +-
dbaccess/source/ui/browser/dbloader.cxx | 4 -
dbaccess/source/ui/control/dbtreelistbox.cxx | 6 +-
dbaccess/source/ui/control/sqledit.cxx | 3 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 5 +-
dbaccess/source/ui/dlg/finteraction.hxx | 6 +-
dbaccess/source/ui/inc/TokenWriter.hxx | 4 -
dbaccess/source/ui/inc/formadapter.hxx | 29 ++++++-------
dbaccess/source/ui/inc/singledoccontroller.hxx | 8 +--
dbaccess/source/ui/misc/controllerframe.cxx | 6 +-
dbaccess/source/ui/uno/copytablewizard.cxx | 8 +--
dbaccess/source/ui/uno/dbinteraction.hxx | 8 +--
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 10 ++--
include/dbaccess/dbsubcomponentcontroller.hxx | 10 ++--
include/dbaccess/genericcontroller.hxx | 26 +++++------
45 files changed, 202 insertions(+), 197 deletions(-)
New commits:
commit 7fa29ecc727c04159cee92aebc14fc5b1037a965
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Fri Jul 17 11:59:26 2015 +0900
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for dbaccess.
Change-Id: I60921b1b1d3b65fb9087552ed118c60dc9f89032
Reviewed-on: https://gerrit.libreoffice.org/17146
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/dbaccess/source/core/api/CacheSet.hxx
b/dbaccess/source/core/api/CacheSet.hxx
index 30b4352..5897949 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -29,14 +29,14 @@
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include "RowSetRow.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <list>
namespace com{ namespace sun { namespace star{namespace sdbc{ class
XParameters; } } } }
namespace dbaccess
{
- class OCacheSet : public ::cppu::WeakImplHelper1<
::com::sun::star::sdbc::XRow>
+ class OCacheSet : public ::cppu::WeakImplHelper<
::com::sun::star::sdbc::XRow>
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>
m_xDriverSet;
diff --git a/dbaccess/source/core/api/PrivateRow.hxx
b/dbaccess/source/core/api/PrivateRow.hxx
index 99583b7..e949904 100644
--- a/dbaccess/source/core/api/PrivateRow.hxx
+++ b/dbaccess/source/core/api/PrivateRow.hxx
@@ -19,13 +19,13 @@
#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
#define INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
#include "RowSetRow.hxx"
namespace dbaccess
{
- class OPrivateRow : public ::cppu::WeakImplHelper1<
::com::sun::star::sdbc::XRow>
+ class OPrivateRow : public ::cppu::WeakImplHelper<
::com::sun::star::sdbc::XRow>
{
ORowSetValueVector::Vector m_aRow;
sal_Int32 m_nPos;
diff --git a/dbaccess/source/core/api/resultset.hxx
b/dbaccess/source/core/api/resultset.hxx
index 52a913f..4b03600 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -39,12 +39,12 @@
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
#include <osl/diagnose.h>
-#include <cppuhelper/compbase11.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
namespace dbaccess
{
- typedef ::cppu::WeakComponentImplHelper11< css::sdbc::XWarningsSupplier,
+ typedef ::cppu::WeakComponentImplHelper< css::sdbc::XWarningsSupplier,
css::sdbc::XResultSet,
css::sdbc::XResultSetMetaDataSupplier,
css::sdbc::XRow,
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 3c9d0b1..7708a6a 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/property.hxx>
#include "definitioncolumn.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
@@ -52,7 +52,7 @@ namespace dbaccess
{
/// helper class for column property change events which holds the
OComponentDefinition weak
-typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener >
TColumnPropertyListener_BASE;
+typedef ::cppu::WeakImplHelper< XPropertyChangeListener >
TColumnPropertyListener_BASE;
class OColumnPropertyListener:
public TColumnPropertyListener_BASE, private boost::noncopyable
{
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index b69e84a..858c32f 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -48,6 +48,7 @@
#include <comphelper/sequence.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <rtl/digest.h>
#include <sfx2/signaturestate.hxx>
@@ -108,8 +109,8 @@ bool VosMutexFacade::tryToAcquire()
}
// DocumentStorageAccess
-class DocumentStorageAccess : public ::cppu::WeakImplHelper2<
XDocumentSubStorageSupplier
- ,
XTransactionListener >
+class DocumentStorageAccess : public ::cppu::WeakImplHelper<
XDocumentSubStorageSupplier
+ ,
XTransactionListener >
{
typedef ::std::map< OUString, Reference< XStorage > > NamedStorages;
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx
b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index afc5603..aa9a5ce 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -22,7 +22,7 @@
#include "connectivity/ConnectionWrapper.hxx"
#include <cppuhelper/component.hxx>
#include <connectivity/CommonTools.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
@@ -40,8 +40,8 @@ namespace dbaccess
// All methods will be forwarded with exception of the set methods, which
are not allowed
// to be called on shared connections. Instances of this class will be
created when the
// datasource is asked for not isolated connection.
- typedef ::cppu::WeakComponentImplHelper1<
::com::sun::star::sdbc::XConnection
- > OSharedConnection_BASE;
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbc::XConnection
+ > OSharedConnection_BASE;
typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
class OSharedConnection : public ::comphelper::OBaseMutex
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index b14bfbd..6f88eff 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -26,7 +26,7 @@
#include <vector>
#include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -43,14 +43,14 @@ namespace dbaccess
// OBookmarkContainer - base class of collections of database definition
// documents
-typedef ::cppu::WeakImplHelper6 <
- ::com::sun::star::container::XIndexAccess
- , ::com::sun::star::container::XNameContainer
- ,
::com::sun::star::container::XEnumerationAccess
- , ::com::sun::star::container::XContainer
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::container::XChild
- > OBookmarkContainer_Base;
+typedef ::cppu::WeakImplHelper<
+ ::com::sun::star::container::XIndexAccess
+ , ::com::sun::star::container::XNameContainer
+ ,
::com::sun::star::container::XEnumerationAccess
+ , ::com::sun::star::container::XContainer
+ , ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::container::XChild
+ > OBookmarkContainer_Base;
class OBookmarkContainer
:public OBookmarkContainer_Base
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index ae63130..ebb461b 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -33,8 +33,7 @@
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace dbaccess
@@ -67,8 +66,8 @@ namespace dbaccess
// DataAccessDescriptor
typedef ::comphelper::OMutexAndBroadcastHelper
DataAccessDescriptor_MutexBase;
- typedef ::cppu::WeakImplHelper1 < XServiceInfo
- >
DataAccessDescriptor_TypeBase;
+ typedef ::cppu::WeakImplHelper< XServiceInfo
+ > DataAccessDescriptor_TypeBase;
typedef ::comphelper::OPropertyContainer
DataAccessDescriptor_PropertyBase;
@@ -213,9 +212,9 @@ namespace dbaccess
}
// DataAccessDescriptorFactory
- typedef ::cppu::WeakImplHelper2 < XServiceInfo
- , XDataAccessDescriptorFactory
- > DataAccessDescriptorFactory_Base;
+ typedef ::cppu::WeakImplHelper< XServiceInfo
+ , XDataAccessDescriptorFactory
+ > DataAccessDescriptorFactory_Base;
class DataAccessDescriptorFactory : public DataAccessDescriptorFactory_Base
{
public:
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index b643646..9f88b7d 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -54,7 +54,7 @@
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -92,8 +92,8 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING_PATH;
namespace dbaccess
{
- typedef ::cppu::WeakImplHelper1 < XTerminateListener
- > DatabaseDocumentLoader_Base;
+ typedef ::cppu::WeakImplHelper< XTerminateListener
+ > DatabaseDocumentLoader_Base;
class DatabaseDocumentLoader : public DatabaseDocumentLoader_Base
{
private:
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx
b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 512ae33..d48a603 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -42,7 +42,7 @@
#include <com/sun/star/uno/XAggregation.hpp>
#include <basic/basicmanagerrepository.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <boost/shared_ptr.hpp>
@@ -63,10 +63,10 @@ class DatabaseDocumentLoader;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&);
-typedef ::cppu::WeakComponentImplHelper3 <
::com::sun::star::lang::XServiceInfo
- ,
::com::sun::star::sdb::XDatabaseContext
- ,
::com::sun::star::lang::XUnoTunnel
- > DatabaseAccessContext_Base;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::lang::XServiceInfo
+ ,
::com::sun::star::sdb::XDatabaseContext
+ , ::com::sun::star::lang::XUnoTunnel
+ > DatabaseAccessContext_Base;
class ODatabaseContext :public DatabaseAccessContext_Base
,public ::basic::BasicManagerCreationListener
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 1c2764f..5568cb8 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -50,6 +50,7 @@
#include <com/sun/star/view/XPrintable.hpp>
#include <comphelper/guarding.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/property.hxx>
@@ -95,7 +96,7 @@ namespace dbaccess
{
// FlushNotificationAdapter
-typedef ::cppu::WeakImplHelper1< XFlushListener >
FlushNotificationAdapter_Base;
+typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
/** helper class which implements a XFlushListener, and forwards all
notification events to another XFlushListener
@@ -259,7 +260,7 @@ void SAL_CALL
OAuthenticationContinuation::setRememberAccount( RememberAuthentic
/** The class OSharedConnectionManager implements a structure to share
connections.
It owns the master connections which will be disposed when the last
connection proxy is gone.
*/
-typedef ::cppu::WeakImplHelper1< XEventListener > OConnectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< XEventListener > OConnectionHelper_BASE;
// need to hold the digest
struct TDigestHolder
{
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx
b/dbaccess/source/core/dataaccess/datasource.hxx
index 6e0adef..ff4d338 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -33,7 +33,7 @@
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/compbase11.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/embed/XTransactionListener.hpp>
#include "apitools.hxx"
#include "bookmarkcontainer.hxx"
@@ -58,18 +58,18 @@ namespace dbaccess
class OSharedConnectionManager;
// ODatabaseSource
-typedef ::cppu::WeakComponentImplHelper11 <
::com::sun::star::lang::XServiceInfo
- ,
::com::sun::star::sdbc::XDataSource
- ,
::com::sun::star::sdb::XBookmarksSupplier
- ,
::com::sun::star::sdb::XQueryDefinitionsSupplier
- ,
::com::sun::star::sdb::XCompletedConnection
- ,
::com::sun::star::container::XContainerListener
- ,
::com::sun::star::sdbc::XIsolatedConnection
- ,
::com::sun::star::sdbcx::XTablesSupplier
- ,
::com::sun::star::util::XFlushable
- ,
::com::sun::star::util::XFlushListener
- ,
::com::sun::star::sdb::XDocumentDataSource
- > ODatabaseSource_Base;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::sdbc::XDataSource
+ ,
::com::sun::star::sdb::XBookmarksSupplier
+ ,
::com::sun::star::sdb::XQueryDefinitionsSupplier
+ ,
::com::sun::star::sdb::XCompletedConnection
+ ,
::com::sun::star::container::XContainerListener
+ ,
::com::sun::star::sdbc::XIsolatedConnection
+ ,
::com::sun::star::sdbcx::XTablesSupplier
+ , ::com::sun::star::util::XFlushable
+ ,
::com::sun::star::util::XFlushListener
+ ,
::com::sun::star::sdb::XDocumentDataSource
+ > ODatabaseSource_Base;
class ODatabaseSource :public ModelDependentComponent // must be first
,public ODatabaseSource_Base
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 0618f43..d0d9695 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -89,8 +89,9 @@
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/task/XInteractionDisapprove.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/mimeconfighelper.hxx>
@@ -157,7 +158,7 @@ namespace dbaccess
}
// OEmbedObjectHolder
- typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener >
TEmbedObjectHolder;
+ typedef ::cppu::WeakComponentImplHelper< embed::XStateChangeListener >
TEmbedObjectHolder;
class OEmbedObjectHolder : public ::comphelper::OBaseMutex
,public TEmbedObjectHolder
{
@@ -219,8 +220,8 @@ namespace dbaccess
}
// OEmbeddedClientHelper
- typedef ::cppu::WeakImplHelper1 < XEmbeddedClient
- > EmbeddedClientHelper_BASE;
+ typedef ::cppu::WeakImplHelper< XEmbeddedClient
+ > EmbeddedClientHelper_BASE;
class OEmbeddedClientHelper : public EmbeddedClientHelper_BASE
{
ODocumentDefinition* m_pClient;
@@ -276,8 +277,8 @@ namespace dbaccess
};
// LifetimeCoupler
- typedef ::cppu::WeakImplHelper1 < css::lang::XEventListener
- > LifetimeCoupler_Base;
+ typedef ::cppu::WeakImplHelper< css::lang::XEventListener
+ > LifetimeCoupler_Base;
/** helper class which couples the lifetime of a component to the lifetime
of another component
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx
b/dbaccess/source/core/dataaccess/documentevents.hxx
index 61a9c63..669dc00 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
#include <map>
@@ -38,8 +38,8 @@ namespace dbaccess
// DocumentEvents
struct DocumentEvents_Data;
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::container::XNameReplace
- > DocumentEvents_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XNameReplace
+ > DocumentEvents_Base;
class DocumentEvents :public DocumentEvents_Base
,public ::boost::noncopyable
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx
b/dbaccess/source/core/dataaccess/intercept.hxx
index ea2060c..2786dfc 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_INTERCEPT_HXX
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
@@ -34,9 +34,9 @@ namespace dbaccess
{
-class OInterceptor : public ::cppu::WeakImplHelper4<
::com::sun::star::frame::XDispatchProviderInterceptor,
-
::com::sun::star::frame::XInterceptorInfo,
-
::com::sun::star::frame::XDispatch,
+class OInterceptor : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XDispatchProviderInterceptor,
+
::com::sun::star::frame::XInterceptorInfo,
+
::com::sun::star::frame::XDispatch,
::com::sun::star::document::XDocumentEventListener>
{
DECL_LINK( OnDispatch, void* _aURL );
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx
b/dbaccess/source/core/inc/ContainerMediator.hxx
index e0360bf..2615c64 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <map>
@@ -37,7 +37,7 @@ namespace dbaccess
class OPropertyForward;
class OContainerMediator : public ::comphelper::OBaseMutex
- ,public ::cppu::WeakImplHelper1<
::com::sun::star::container::XContainerListener >
+ ,public ::cppu::WeakImplHelper<
::com::sun::star::container::XContainerListener >
{
private:
typedef ::rtl::Reference< OPropertyForward >
TPropertyForward;
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx
b/dbaccess/source/core/inc/ContentHelper.hxx
index 62b2a3a..9165978 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/beans/Property.hpp>
@@ -80,16 +80,16 @@ namespace dbaccess
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
- typedef ::cppu::WeakComponentImplHelper9 <
::com::sun::star::ucb::XContent
- ,
::com::sun::star::ucb::XCommandProcessor
- ,
::com::sun::star::lang::XServiceInfo
- ,
::com::sun::star::beans::XPropertiesChangeNotifier
- ,
::com::sun::star::beans::XPropertyContainer
- ,
::com::sun::star::lang::XInitialization
- ,
::com::sun::star::lang::XUnoTunnel
- ,
::com::sun::star::container::XChild
- ,
::com::sun::star::sdbcx::XRename
- > OContentHelper_COMPBASE;
+ typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::ucb::XContent
+ ,
::com::sun::star::ucb::XCommandProcessor
+ ,
::com::sun::star::lang::XServiceInfo
+ ,
::com::sun::star::beans::XPropertiesChangeNotifier
+ ,
::com::sun::star::beans::XPropertyContainer
+ ,
::com::sun::star::lang::XInitialization
+ ,
::com::sun::star::lang::XUnoTunnel
+ ,
::com::sun::star::container::XChild
+ , ::com::sun::star::sdbcx::XRename
+ > OContentHelper_COMPBASE;
class OContentHelper : public OContentHelper_MBASE
,public OContentHelper_COMPBASE
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index baa9202..9dc8494 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/container/XChild.hpp>
-#include "cppuhelper/compbase4.hxx"
+#include <cppuhelper/compbase.hxx>
#include "cppuhelper/basemutex.hxx"
#include "cppuhelper/propertysetmixin.hxx"
#include <cppuhelper/implementationentry.hxx>
@@ -44,10 +44,10 @@
namespace dbaccess
{
-typedef ::cppu::WeakComponentImplHelper4<
::com::sun::star::chart2::data::XDatabaseDataProvider
- , ::com::sun::star::container::XChild
- ,
::com::sun::star::chart::XComplexDescriptionAccess
- ,
::com::sun::star::lang::XServiceInfo > TDatabaseDataProvider;
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::chart2::data::XDatabaseDataProvider
+ , ::com::sun::star::container::XChild
+ ,
::com::sun::star::chart::XComplexDescriptionAccess
+ ,
::com::sun::star::lang::XServiceInfo > TDatabaseDataProvider;
class DatabaseDataProvider: private ::cppu::BaseMutex,
public TDatabaseDataProvider,
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx
b/dbaccess/source/core/inc/PropertyForward.hxx
index 0f27db6..c0eec82 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <vector>
@@ -32,8 +32,8 @@ namespace dbaccess
{
// OPropertyForward
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::beans::XPropertyChangeListener
- > OPropertyForward_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertyChangeListener
+ > OPropertyForward_Base;
class OPropertyForward :public ::comphelper::OBaseMutex
,public OPropertyForward_Base
{
diff --git a/dbaccess/source/core/inc/TableDeco.hxx
b/dbaccess/source/core/inc/TableDeco.hxx
index 73b8b2a..3fdfb7f2 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase5.hxx>
#include "apitools.hxx"
#include "datasettings.hxx"
@@ -42,15 +42,15 @@
namespace dbaccess
{
- typedef ::cppu::WeakComponentImplHelper9<
::com::sun::star::sdbcx::XColumnsSupplier,
-
::com::sun::star::sdbcx::XKeysSupplier,
-
::com::sun::star::container::XNamed,
-
::com::sun::star::lang::XServiceInfo,
-
::com::sun::star::sdbcx::XDataDescriptorFactory,
-
::com::sun::star::sdbcx::XIndexesSupplier,
-
::com::sun::star::sdbcx::XRename,
-
::com::sun::star::lang::XUnoTunnel,
-
::com::sun::star::sdbcx::XAlterTable> OTableDescriptor_BASE;
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbcx::XColumnsSupplier,
+
::com::sun::star::sdbcx::XKeysSupplier,
+
::com::sun::star::container::XNamed,
+
::com::sun::star::lang::XServiceInfo,
+
::com::sun::star::sdbcx::XDataDescriptorFactory,
+
::com::sun::star::sdbcx::XIndexesSupplier,
+
::com::sun::star::sdbcx::XRename,
+
::com::sun::star::lang::XUnoTunnel,
+
::com::sun::star::sdbcx::XAlterTable> OTableDescriptor_BASE;
// OTables
class ODBTableDecorator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator >
ODBTableDecorator_PROP;
diff --git a/dbaccess/source/core/inc/column.hxx
b/dbaccess/source/core/inc/column.hxx
index 00f48ba..8788f71 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -46,8 +46,7 @@
#include <connectivity/FValue.hxx>
#include <connectivity/TColumnsHelper.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/propshlp.hxx>
#include <osl/diagnose.h>
@@ -58,9 +57,9 @@ namespace dbaccess
// OColumn
- typedef ::cppu::WeakComponentImplHelper2<
::com::sun::star::lang::XServiceInfo,
-
::com::sun::star::container::XNamed
- > OColumnBase;
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::lang::XServiceInfo,
+
::com::sun::star::container::XNamed
+ > OColumnBase;
class OColumn :public comphelper::OBaseMutex
,public OColumnBase
diff --git a/dbaccess/source/core/inc/veto.hxx
b/dbaccess/source/core/inc/veto.hxx
index f3757c7..1e31b85 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -22,14 +22,14 @@
#include <com/sun/star/util/XVeto.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace dbaccess
{
// Veto
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XVeto
- > Veto_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::util::XVeto
+ > Veto_Base;
/** implements ::com::sun::star::util::XVeto
*/
class Veto : public Veto_Base
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx
b/dbaccess/source/core/recovery/subcomponentloader.hxx
index a6aa241..c82cb96 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -27,14 +27,14 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace dbaccess
{
// SubComponentLoader
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XWindowListener
- > SubComponentLoader_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::awt::XWindowListener
+ > SubComponentLoader_Base;
struct SubComponentLoader_Data;
/** is a helper class which loads/opens a given sub component as soon as
the main application
window becomes visible.
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 59c55b7..580b766 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <comphelper/namedvaluecollection.hxx>
+#include <cppuhelper/implbase.hxx>
#include <connectivity/dbtools.hxx>
#include <tools/diagnose_ex.h>
#include <xmloff/XMLSettingsExportContext.hxx>
@@ -237,8 +238,8 @@ namespace dbaccess
}
// SettingsDocumentHandler
- typedef ::cppu::WeakImplHelper1 < XDocumentHandler
- > SettingsDocumentHandler_Base;
+ typedef ::cppu::WeakImplHelper< XDocumentHandler
+ > SettingsDocumentHandler_Base;
class DBACCESS_DLLPRIVATE SettingsDocumentHandler : public
SettingsDocumentHandler_Base
{
public:
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx
b/dbaccess/source/ext/macromigration/progresscapture.hxx
index e7633af..f366302 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -32,8 +32,8 @@ namespace dbmm
class IMigrationProgress;
// ProgressCapture
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::task::XStatusIndicator
- > ProgressCapture_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::task::XStatusIndicator
+ > ProgressCapture_Base;
struct ProgressCapture_Data;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx
b/dbaccess/source/filter/xml/dbloader2.cxx
index 93cf4c0..45aa339 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -58,7 +58,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/types.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <sfx2/docfile.hxx>
@@ -92,7 +92,7 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
namespace dbaxml
{
-class DBTypeDetection : public ::cppu::WeakImplHelper2<
XExtendedFilterDetection, XServiceInfo>
+class DBTypeDetection : public ::cppu::WeakImplHelper<
XExtendedFilterDetection, XServiceInfo>
{
const Reference< XComponentContext > m_aContext;
@@ -223,7 +223,7 @@ extern "C" void SAL_CALL
createRegistryInfo_DBTypeDetection()
namespace dbaxml
{
-class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader,
XServiceInfo>
+class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader,
XServiceInfo>
{
private:
const Reference< XComponentContext > m_aContext;
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx
b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 844a828..658d2fb 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -29,16 +29,16 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
namespace sdbtools
{
// ConnectionTools
- typedef ::cppu::WeakImplHelper3 <
::com::sun::star::sdb::tools::XConnectionTools
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::lang::XInitialization
- > ConnectionTools_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::sdb::tools::XConnectionTools
+ , ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::lang::XInitialization
+ > ConnectionTools_Base;
/** implements the com::sun::star::sdb::tools::XConnectionTools
functionality
*/
class ConnectionTools :public ConnectionTools_Base
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index 87ae21e..ea1ddf5 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/sdb/tools/XDataSourceMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -32,8 +32,8 @@ namespace sdbtools
{
// DataSourceMetaData
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::sdb::tools::XDataSourceMetaData
- > DataSourceMetaData_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::sdb::tools::XDataSourceMetaData
+ > DataSourceMetaData_Base;
struct DataSourceMetaData_Impl;
/** default implementation for XDataSourceMetaData
*/
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx
b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 833d165..cc0b2b0 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/sdb/tools/XObjectNames.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -32,8 +32,8 @@ namespace sdbtools
{
// ObjectNames
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::sdb::tools::XObjectNames
- > ObjectNames_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::sdb::tools::XObjectNames
+ > ObjectNames_Base;
struct ObjectNames_Impl;
/** default implementation for XObjectNames
*/
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx
b/dbaccess/source/sdbtools/connection/tablename.hxx
index d74a554..c5eef8b 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/sdb/tools/XTableName.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -32,8 +32,8 @@ namespace sdbtools
{
// TableName
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::sdb::tools::XTableName
- > TableName_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::sdb::tools::XTableName
+ > TableName_Base;
struct TableName_Impl;
/** default implementation for XTableName
*/
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx
b/dbaccess/source/ui/app/subcomponentmanager.hxx
index 76bde5d..74a34e3 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <comphelper/sharedmutex.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -37,8 +37,8 @@ namespace dbaui
class OApplicationController;
// SubComponentManager
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::beans::XPropertyChangeListener
- > SubComponentManager_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertyChangeListener
+ > SubComponentManager_Base;
class SubComponentManager : public SubComponentManager_Base
{
public:
diff --git a/dbaccess/source/ui/browser/dbloader.cxx
b/dbaccess/source/ui/browser/dbloader.cxx
index 206790b..a0f36d8 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace dbaui;
-class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader,
XServiceInfo>
+class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader,
XServiceInfo>
{
private:
OUString m_aURL;
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index d8346df..e68b22a 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <vcl/help.hxx>
#include <dbaccess/IController.hxx>
@@ -521,8 +521,8 @@ namespace
}
}
// SelectionSupplier
- typedef ::cppu::WeakImplHelper1 < XSelectionSupplier
- > SelectionSupplier_Base;
+ typedef ::cppu::WeakImplHelper< XSelectionSupplier
+ > SelectionSupplier_Base;
class SelectionSupplier : public SelectionSupplier_Base
{
public:
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index 9384046..6831b57 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -35,11 +35,12 @@
#include "QueryDesignView.hxx"
#include <svl/smplhint.hxx>
#include <vcl/settings.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace dbaui;
class OSqlEdit::ChangesListener:
- public cppu::WeakImplHelper1< css::beans::XPropertiesChangeListener >
+ public cppu::WeakImplHelper< css::beans::XPropertiesChangeListener >
{
public:
ChangesListener(OSqlEdit & editor): editor_(editor) {}
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 71cf17d..180b2f8 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -45,6 +45,7 @@
#include <dbaccess/AsynchronousLink.hxx>
#include <sfx2/filedlghelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -878,8 +879,8 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
namespace
{
- typedef ::cppu::WeakImplHelper1 < XTerminateListener
- > AsyncLoader_Base;
+ typedef ::cppu::WeakImplHelper< XTerminateListener
+ > AsyncLoader_Base;
class AsyncLoader : public AsyncLoader_Base
{
private:
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx
b/dbaccess/source/ui/dlg/finteraction.hxx
index 2d86566..e3ae83f 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -20,15 +20,15 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_FINTERACTION_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_DLG_FINTERACTION_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
namespace dbaui
{
// OFilePickerInteractionHandler
- typedef ::cppu::WeakImplHelper1 <
::com::sun::star::task::XInteractionHandler
- > OFilePickerInteractionHandler_Base;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::task::XInteractionHandler
+ > OFilePickerInteractionHandler_Base;
/** a InteractionHandler implementation which extends another handler with
some customizability
*/
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx
b/dbaccess/source/ui/inc/TokenWriter.hxx
index d1b87f0..390991e 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/stream.hxx>
#include <svx/dataaccessdescriptor.hxx>
@@ -48,7 +48,7 @@ namespace dbaui
{
// ODatabaseImportExport base class for import/export
class ODatabaseExport;
- typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener>
ODatabaseImportExport_BASE;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener>
ODatabaseImportExport_BASE;
class ODatabaseImportExport : public ODatabaseImportExport_BASE
{
private:
diff --git a/dbaccess/source/ui/inc/formadapter.hxx
b/dbaccess/source/ui/inc/formadapter.hxx
index 6b0e944..f35bef0 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -55,6 +55,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <comphelper/uno3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase12.hxx>
#include <cppuhelper/implbase10.hxx>
#include "moduledbu.hxx"
@@ -63,20 +64,20 @@ namespace dbaui
{
// SbaXFormAdapter
- typedef ::cppu::WeakImplHelper12<
::com::sun::star::sdbc::XResultSetMetaDataSupplier
- , ::com::sun::star::sdb::XResultSetAccess
- ,
::com::sun::star::sdbc::XResultSetUpdate
- , ::com::sun::star::sdbc::XRowSet
- ,
::com::sun::star::sdb::XRowSetApproveBroadcaster
- , ::com::sun::star::sdbcx::XRowLocate
- , ::com::sun::star::sdbc::XRowUpdate
- , ::com::sun::star::sdbc::XRow
- ,
::com::sun::star::sdbcx::XColumnsSupplier
- , ::com::sun::star::sdbc::XColumnLocate
- // ---
stardiv::one::form::component::DatabaseForm ---
- , ::com::sun::star::sdbc::XParameters
- , ::com::sun::star::sdbcx::XDeleteRows
- > SbaXFormAdapter_BASE1;
+ typedef ::cppu::WeakImplHelper<
::com::sun::star::sdbc::XResultSetMetaDataSupplier
+ , ::com::sun::star::sdb::XResultSetAccess
+ , ::com::sun::star::sdbc::XResultSetUpdate
+ , ::com::sun::star::sdbc::XRowSet
+ ,
::com::sun::star::sdb::XRowSetApproveBroadcaster
+ , ::com::sun::star::sdbcx::XRowLocate
+ , ::com::sun::star::sdbc::XRowUpdate
+ , ::com::sun::star::sdbc::XRow
+ , ::com::sun::star::sdbcx::XColumnsSupplier
+ , ::com::sun::star::sdbc::XColumnLocate
+ // ---
stardiv::one::form::component::DatabaseForm ---
+ , ::com::sun::star::sdbc::XParameters
+ , ::com::sun::star::sdbcx::XDeleteRows
+ > SbaXFormAdapter_BASE1;
typedef ::cppu::ImplHelper12 <
::com::sun::star::sdbc::XWarningsSupplier
, ::com::sun::star::sdbc::XCloseable
, ::com::sun::star::form::XLoadable
diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx
b/dbaccess/source/ui/inc/singledoccontroller.hxx
index fe9588e..e6730b0 100644
--- a/dbaccess/source/ui/inc/singledoccontroller.hxx
+++ b/dbaccess/source/ui/inc/singledoccontroller.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
class SfxUndoAction;
class SfxUndoManager;
@@ -34,9 +34,9 @@ namespace dbaui
// OSingleDocumentController
struct OSingleDocumentController_Data;
- typedef ::cppu::ImplInheritanceHelper1 < DBSubComponentController
- ,
::com::sun::star::document::XUndoManagerSupplier
- > OSingleDocumentController_Base;
+ typedef ::cppu::ImplInheritanceHelper< DBSubComponentController
+ ,
::com::sun::star::document::XUndoManagerSupplier
+ > OSingleDocumentController_Base;
class OSingleDocumentController : public OSingleDocumentController_Base
{
protected:
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx
b/dbaccess/source/ui/misc/controllerframe.cxx
index fae7d75..31452e2 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/frame/XController2.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <sfx2/objsh.hxx>
#include <tools/diagnose_ex.h>
@@ -66,8 +66,8 @@ namespace dbaui
using ::com::sun::star::awt::XWindow;
// FrameWindowActivationListener
- typedef ::cppu::WeakImplHelper1 < XTopWindowListener
- > FrameWindowActivationListener_Base;
+ typedef ::cppu::WeakImplHelper< XTopWindowListener
+ > FrameWindowActivationListener_Base;
class FrameWindowActivationListener : public
FrameWindowActivationListener_Base
{
public:
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx
b/dbaccess/source/ui/uno/copytablewizard.cxx
index bf5a006..1ba6934 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -63,7 +63,7 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustrbuf.hxx>
#include <svtools/genericunodialog.hxx>
#include <tools/diagnose_ex.h>
@@ -141,9 +141,9 @@ namespace dbaui
// CopyTableWizard
typedef ::svt::OGenericUnoDialog CopyTableWizard_DialogBase;
- typedef ::cppu::ImplInheritanceHelper1 < CopyTableWizard_DialogBase
- , XCopyTableWizard
- > CopyTableWizard_Base;
+ typedef ::cppu::ImplInheritanceHelper< CopyTableWizard_DialogBase
+ , XCopyTableWizard
+ > CopyTableWizard_Base;
class CopyTableWizard
:public CopyTableWizard_Base
,public ::comphelper::OPropertyArrayUsageHelper< CopyTableWizard >
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx
b/dbaccess/source/ui/uno/dbinteraction.hxx
index 075adf9..07ded2d 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX
#define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include "moduledbu.hxx"
#include "apitools.hxx"
@@ -45,9 +45,9 @@ namespace dbaui
{
// BasicInteractionHandler
- typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo
- ,
::com::sun::star::task::XInteractionHandler2
- > BasicInteractionHandler_Base;
+ typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo
+ ,
::com::sun::star::task::XInteractionHandler2
+ > BasicInteractionHandler_Base;
/** implements an <type
scope="com.sun.star.task">XInteractionHandler</type> for
database related interaction requests.
<p/>
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 9744b5a..1b2dea5 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -32,7 +32,7 @@
#include <comphelper/processfactory.hxx>
#include <svtools/genericunodialog.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace dbaui
{
@@ -56,15 +56,15 @@ namespace dbaui
// OTextConnectionSettingsDialog
class OTextConnectionSettingsDialog;
- typedef ::cppu::ImplInheritanceHelper1 < ODatabaseAdministrationDialog
- ,
::com::sun::star::sdb::XTextConnectionSettings
- >
OTextConnectionSettingsDialog_BASE;
+ typedef ::cppu::ImplInheritanceHelper< ODatabaseAdministrationDialog
+ ,
::com::sun::star::sdb::XTextConnectionSettings
+ >
OTextConnectionSettingsDialog_BASE;
typedef ::comphelper::OPropertyArrayUsageHelper<
OTextConnectionSettingsDialog > OTextConnectionSettingsDialog_PBASE;
class OTextConnectionSettingsDialog
:public OTextConnectionSettingsDialog_BASE
,public OTextConnectionSettingsDialog_PBASE
- ,public ::cppu::WeakImplHelper1<
com::sun::star::sdb::XTextConnectionSettings >
+ ,public ::cppu::WeakImplHelper<
com::sun::star::sdb::XTextConnectionSettings >
{
OModuleClient m_aModuleClient;
PropertyValues m_aPropertyValues;
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx
b/include/dbaccess/dbsubcomponentcontroller.hxx
index 6cf592e..9406a3e 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -33,7 +33,7 @@
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/dbmetadata.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -47,10 +47,10 @@ namespace dbaui
class DBSubComponentController;
- typedef ::cppu::ImplInheritanceHelper2 < OGenericUnoController
- ,
::com::sun::star::document::XScriptInvocationContext
- ,
::com::sun::star::util::XModifiable
- > DBSubComponentController_Base;
+ typedef ::cppu::ImplInheritanceHelper< OGenericUnoController
+ ,
::com::sun::star::document::XScriptInvocationContext
+ ,
::com::sun::star::util::XModifiable
+ > DBSubComponentController_Base;
struct DBSubComponentController_Impl;
class DBACCESS_DLLPUBLIC DBSubComponentController : public
DBSubComponentController_Base
diff --git a/include/dbaccess/genericcontroller.hxx
b/include/dbaccess/genericcontroller.hxx
index f195321..3b40f65 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -54,7 +54,7 @@
#include <comphelper/sharedmutex.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <connectivity/dbexception.hxx>
-#include <cppuhelper/compbase11.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <boost/optional.hpp>
@@ -188,18 +188,18 @@ namespace dbaui
typedef ::comphelper::SharedMutexBase OGenericUnoController_MBASE;
- typedef ::cppu::WeakComponentImplHelper11 <
::com::sun::star::frame::XDispatch
- ,
::com::sun::star::frame::XDispatchProviderInterceptor
- ,
::com::sun::star::util::XModifyListener
- ,
::com::sun::star::frame::XFrameActionListener
- ,
::com::sun::star::lang::XInitialization
- ,
::com::sun::star::lang::XServiceInfo
- ,
::com::sun::star::frame::XDispatchInformationProvider
- ,
::com::sun::star::frame::XController2
- ,
::com::sun::star::frame::XTitle
- ,
::com::sun::star::frame::XTitleChangeBroadcaster
- ,
::com::sun::star::awt::XUserInputInterception
- > OGenericUnoController_Base;
+ typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::frame::XDispatch
+ ,
::com::sun::star::frame::XDispatchProviderInterceptor
+ ,
::com::sun::star::util::XModifyListener
+ ,
::com::sun::star::frame::XFrameActionListener
+ ,
::com::sun::star::lang::XInitialization
+ ,
::com::sun::star::lang::XServiceInfo
+ ,
::com::sun::star::frame::XDispatchInformationProvider
+ ,
::com::sun::star::frame::XController2
+ , ::com::sun::star::frame::XTitle
+ ,
::com::sun::star::frame::XTitleChangeBroadcaster
+ ,
::com::sun::star::awt::XUserInputInterception
+ > OGenericUnoController_Base;
struct OGenericUnoController_Data;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
