basic/source/uno/scriptcont.cxx | 1 - connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 2 +- connectivity/source/drivers/mork/MPreparedStatement.hxx | 2 +- cui/source/dialogs/cuigaldlg.cxx | 1 - cui/source/dialogs/scriptdlg.cxx | 1 - dbaccess/source/core/api/KeySet.hxx | 1 - dbaccess/source/core/api/OptimisticSet.hxx | 1 - dbaccess/source/core/api/RowSetCache.hxx | 2 -- dbaccess/source/core/inc/TableDeco.hxx | 1 - dbaccess/source/core/inc/table.hxx | 1 - dbaccess/source/core/misc/DatabaseDataProvider.cxx | 1 - dbaccess/source/core/recovery/storagexmlstream.cxx | 1 - dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 1 - dbaccess/source/filter/xml/xmlExport.hxx | 2 -- dbaccess/source/filter/xml/xmlfilter.hxx | 2 -- dbaccess/source/ui/browser/genericcontroller.cxx | 1 - dbaccess/source/ui/browser/unodatbr.cxx | 1 - dbaccess/source/ui/inc/TableRowExchange.hxx | 1 - dbaccess/source/ui/inc/dbexchange.hxx | 1 - dbaccess/source/ui/inc/exsrcbrw.hxx | 1 - desktop/source/deployment/gui/dp_gui.h | 1 - desktop/source/deployment/gui/license_dialog.cxx | 1 - desktop/source/deployment/inc/dp_xml.h | 1 - desktop/source/deployment/manager/dp_manager.cxx | 1 - desktop/source/deployment/misc/dp_resource.cxx | 1 - desktop/source/deployment/registry/executable/dp_executable.cxx | 1 - desktop/source/migration/services/jvmfwk.hxx | 1 - include/basegfx/tools/unotools.hxx | 1 - include/connectivity/sdbcx/VIndex.hxx | 1 - include/sfx2/sidebar/ControllerItem.hxx | 1 - include/toolkit/awt/vclxaccessiblecomponent.hxx | 1 - lotuswordpro/source/filter/xfilter/xfsaxstream.cxx | 2 -- lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 2 -- 33 files changed, 2 insertions(+), 38 deletions(-)
New commits: commit 0c6c37cb01c242ad9324bc91ac15c974529086c5 Author: Jochen Nitschke <j.nitschke+loger...@ok.de> Date: Tue Dec 6 15:49:59 2016 +0100 cleanup unused includes (related to tdf#88206) cppuhelper/compbase*.hxx and cppuhelper/implbase*.hxx compbase*.hxx includes implbase*.hxx replace compbase*.hxx if only implbase*.hxx stuff is used. Change-Id: I631a20aee411c6a32ffcf470f6e392621755f995 Reviewed-on: https://gerrit.libreoffice.org/31686 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 7e17ba9..e08e1e6 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 dc002b2..2c64888 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 eeed5fd..3fa14ef 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 a4946e4..e7d5631 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 11ef281..855a5be 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 cd18b33..d9d0808 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 84f3b23..8d5f5e1 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 15ec660..3dec5b7 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 b8b8f50..1107014 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 8242102..09c45db 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 3fd1ba2..b792191 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 39ddf6f..bafa405 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 bc80b74..d8272a4 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 3949daf..a950b8e 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 d278af6..6567ab4 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 a1f5ccf..a997b5f 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 52b043c..e442beb 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 1ca3c05..ea931d1 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 b79d9c7..1d3a07c 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 f43c749..2d0aaff 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 6d53692..8ab6ee0 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 119496a..5624865 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 5a78a8d..0bd215e 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 d86f02a..cdb60f0 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 eb64115..f03633d 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 97d38f7..430ae5e 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 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/include/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx index 7cc74a9..f459622 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 4cd32c2..65738a7 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 7623022..3ad467e 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 3f37fd5..6adbc48 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 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 c159fb3..6880b7a 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> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits