diff options
33 files changed, 2 insertions, 38 deletions
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 7e17ba9cccd1..e08e1e6e16fb 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -57,7 +57,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/util/VetoException.hpp> #include <com/sun/star/script/XLibraryQueryExecutable.hpp> -#include <cppuhelper/implbase1.hxx> #include <memory> namespace basic diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index dc002b2c6d1e..2c64888d3ee6 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/implbase5.hxx> namespace connectivity { diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index eeed5fdb91bb..3fa14ef8da0a 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -23,7 +23,7 @@ #include "MResultSet.hxx" #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XMultipleResults.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/implbase5.hxx> namespace connectivity { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a4946e40a429..e7d56312fe3c 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -35,7 +35,6 @@ #include "cuigaldlg.hxx" #include "helpid.hrc" #include <unotools/syslocale.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 11ef281ba406..855a5be1b615 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> -#include <cppuhelper/implbase1.hxx> #include <comphelper/documentinfo.hxx> #include <comphelper/uno3.hxx> #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index cd18b333a5a3..d9d080847bb0 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -22,7 +22,6 @@ #include "CacheSet.hxx" -#include <cppuhelper/implbase1.hxx> #include <memory> #include <map> #include <vector> diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 84f3b23a6f2e..8d5f5e1beeea 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX #include "KeySet.hxx" -#include <cppuhelper/implbase1.hxx> #include <connectivity/sqlparse.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 15ec6604bf83..3dec5b797ab9 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#include <cppuhelper/compbase11.hxx> #include <comphelper/propertycontainer.hxx> -#include <cppuhelper/implbase5.hxx> #include <comphelper/proparrhlp.hxx> #include "RowSetRow.hxx" #include "RowSetCacheIterator.hxx" diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index b8b8f501fc33..1107014eff74 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/implbase5.hxx> #include "apitools.hxx" #include "datasettings.hxx" #include "column.hxx" diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 824210219018..09c45dbc0d8c 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <cppuhelper/compbase7.hxx> #include "apitools.hxx" #include "datasettings.hxx" #include <column.hxx> diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 3fd1ba2cb751..b7921916e576 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -19,7 +19,6 @@ #include "DatabaseDataProvider.hxx" #include "dbastrings.hrc" -#include "cppuhelper/implbase1.hxx" #include <cppuhelper/supportsservice.hxx> #include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index 39ddf6f80f6e..bafa405c63a3 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> -#include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> #include <tools/diagnose_ex.h> #include <xmloff/attrlist.hxx> diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index bc80b74c3a9e..d8272a41f04c 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -38,7 +38,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> #include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 3949daf2143a..a950b8e4c3dd 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -28,8 +28,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase5.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <osl/diagnose.h> diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index d278af645b35..6567ab41da5e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -28,8 +28,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase5.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index a1f5ccf4ebe6..a997b5f7029d 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -58,7 +58,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <rtl/ustring.hxx> #include <o3tl/functional.hxx> -#include <cppuhelper/implbase1.hxx> #include <limits> #include <unordered_map> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 52b043cd50db..e442bebded81 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -100,7 +100,6 @@ #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase2.hxx> #include <cppuhelper/typeprovider.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 1ca3c0520a89..ea931d189385 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX #include <com/sun/star/beans/PropertyValue.hpp> -#include <cppuhelper/implbase2.hxx> #include <svtools/transfer.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index b79d9c7e38e1..1d3a07c9534a 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <cppuhelper/implbase1.hxx> #include <svx/dbaexchange.hxx> #include <comphelper/uno3.hxx> #include <vector> diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index f43c749519f8..2d0aafff80f1 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -23,7 +23,6 @@ #include "brwctrlr.hxx" #include <comphelper/uno3.hxx> -#include <cppuhelper/implbase2.hxx> // SbaExternalSourceBrowser diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 6d536923fd23..8ab6ee063825 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -26,7 +26,6 @@ #include <rtl/ref.hxx> #include <rtl/instance.hxx> #include <osl/thread.hxx> -#include <cppuhelper/implbase2.hxx> #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 119496aeefa1..5624865ff149 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -18,7 +18,6 @@ */ -#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implementationentry.hxx> #include <unotools/configmgr.hxx> #include <comphelper/servicedecl.hxx> diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index 5a78a8d69cdd..0bd215ed3651 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -22,7 +22,6 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/input/XRoot.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index d86f02a663f1..cdb60f0cfa4f 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -35,7 +35,6 @@ #include <osl/security.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/servicedecl.hxx> #include <comphelper/sequence.hxx> diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index eb64115788b7..f03633df7fe8 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -24,7 +24,6 @@ #include <osl/mutex.hxx> #include <tools/resmgr.hxx> #include <rtl/ustring.h> -#include <cppuhelper/implbase1.hxx> #include <unotools/configmgr.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 97d38f7a4c50..430ae5e8bc5b 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -27,7 +27,6 @@ #include <ucbhelper/content.hxx> #include <comphelper/servicedecl.hxx> #include <svl/inettype.hxx> -#include <cppuhelper/implbase1.hxx> #include "dp_executablebackenddb.hxx" using namespace ::com::sun::star; diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 66e7565f4501..7fe46970fc6d 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/include/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx index 7cc74a974d62..f459622e0429 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/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index 4cd32c218671..65738a7fbaac 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> #include <comphelper/IdPropArrayHelper.hxx> -#include <cppuhelper/compbase2.hxx> #include <cppuhelper/basemutex.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/sdbcx/VTypeDef.hxx> diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 762302220bda..3ad467e49e8e 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -21,7 +21,6 @@ #include <sfx2/ctrlitem.hxx> -#include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <unotools/cmdoptions.hxx> #include <vcl/image.hxx> diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 3f37fd589605..6adbc484bef8 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -27,7 +27,6 @@ #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 <comphelper/accimplaccess.hxx> #include <comphelper/accessiblecomponenthelper.hxx> diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx index 6a5bcd7ccc4a..a7c3565d7afc 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 c159fb3da18d..6880b7aeda38 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> |