From 513057276131e67876c0a8c324d4dc2661e1d369 Mon Sep 17 00:00:00 2001
From: Douglas Mencken <dougmencken@gmail.com>
Date: Mon, 12 Oct 2015 13:30:33 -0400
Subject: connectivity: drop unused headers

add to MacabRecord.hxx only what's really needed

Change-Id: I7b11fb6f403957009ac590714b9972e2989d7aff
Reviewed-on: https://gerrit.libreoffice.org/19332
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 connectivity/source/cpool/ZPooledConnection.cxx                  | 1 -
 connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 1 -
 connectivity/source/drivers/macab/MacabHeader.hxx                | 1 -
 connectivity/source/drivers/macab/MacabRecord.hxx                | 4 +++-
 connectivity/source/inc/dbase/DDriver.hxx                        | 1 -
 connectivity/source/inc/flat/EDriver.hxx                         | 1 -
 6 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'connectivity')

diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index e98e2888482b..87b76690dff8 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/compbase1.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index c31de9614290..67e066adee05 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -24,7 +24,6 @@
 #include <uno/mapping.hxx>
 #include <uno/environment.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/component_context.hxx>
 #include "accesslog.hxx"
 #include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index d6ed3820a19b..177dcbc4a6bc 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABHEADER_HXX
 
 #include "MacabRecord.hxx"
-#include <cppuhelper/compbase3.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index 0f84bc98c43c..5d0cb1dfa5e7 100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
 
-#include <cppuhelper/compbase3.hxx>
+#include <sal/types.h>
+#include <osl/diagnose.h>
+#include <rtl/ustring.hxx>
 
 #include <premac.h>
 #include <Carbon/Carbon.h>
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index 54c204e14e07..63695c5a10af 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/compbase2.hxx>
 #include <connectivity/CommonTools.hxx>
 #include "file/FDriver.hxx"
 
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 2db505997e92..501696293e62 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDRIVER_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/compbase2.hxx>
 #include <connectivity/CommonTools.hxx>
 #include "file/FDriver.hxx"
 
-- 
cgit