From 0c6c37cb01c242ad9324bc91ac15c974529086c5 Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Tue, 6 Dec 2016 15:49:59 +0100
Subject: 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.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 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 -
 15 files changed, 18 deletions(-)

(limited to 'dbaccess')

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
 
-- 
cgit