mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mork: Clean up unused includes

Browse Source 
Change-Id: Ideff092f49bd84ce829f3ae142de7ff2d32391ab
Reviewed-on: https://gerrit.libreoffice.org/22128
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2016-02-04 21:17:15 +01:00
parent 939abe5a79
commit 6e38a392c8
22 changed files with 5 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
connectivity/source/drivers/mork/MCatalog.cxx
View File

@@ -20,19 +20,12 @@
#include "MCatalog.hxx" #include "MCatalog.hxx"
#include "MConnection.hxx" #include "MConnection.hxx"
#include "MTables.hxx" #include "MTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <cppuhelper/interfacecontainer.h>
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::cppu;
OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)

6
connectivity/source/drivers/mork/MColumnAlias.cxx
View File

@@ -17,12 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/macros.h>
#include "MColumnAlias.hxx" #include "MColumnAlias.hxx"
#include "MConnection.hxx"
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <officecfg/Office/DataAccess.hxx> #include <officecfg/Office/DataAccess.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
@@ -30,11 +27,8 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
using namespace ::connectivity;
using namespace ::connectivity::mork; using namespace ::connectivity::mork;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;

14
connectivity/source/drivers/mork/MColumns.cxx
View File

@@ -19,26 +19,14 @@
#include "MColumns.hxx" #include "MColumns.hxx"
#include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/sdbcx/VColumn.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include "MTable.hxx"
#include "MTables.hxx"
#include "MCatalog.hxx"
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
using namespace ::comphelper;
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace connectivity::sdbcx; using namespace connectivity::sdbcx;
using namespace connectivity; using namespace connectivity;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
sdbcx::ObjectType OColumns::createObject(const OUString& _rName) sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
{ {

5
connectivity/source/drivers/mork/MConnection.cxx
View File

@@ -14,18 +14,13 @@
#include "MPreparedStatement.hxx" #include "MPreparedStatement.hxx"
#include "MorkParser.hxx" #include "MorkParser.hxx"
#include <connectivity/dbcharset.hxx>
#include <connectivity/dbexception.hxx> #include <connectivity/dbexception.hxx>
#include <connectivity/sqlerror.hxx>
#include "resource/mork_res.hrc" #include "resource/mork_res.hrc"
#include "resource/common_res.hrc" #include "resource/common_res.hrc"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp>
#include <comphelper/officeresourcebundle.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
using namespace dbtools; using namespace dbtools;

6
connectivity/source/drivers/mork/MConnection.hxx
View File

@@ -10,18 +10,12 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX
#include <connectivity/CommonTools.hxx>
#include <connectivity/OSubComponent.hxx> #include <connectivity/OSubComponent.hxx>
#include "TConnection.hxx" #include "TConnection.hxx"
#include "MColumnAlias.hxx" #include "MColumnAlias.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <cppuhelper/weakref.hxx>
// do we want here namespace too? // do we want here namespace too?
class MorkParser; class MorkParser;

13
connectivity/source/drivers/mork/MDatabaseMetaData.cxx
View File

@@ -7,31 +7,22 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "MConnection.hxx"
#include "MDatabaseMetaData.hxx" #include "MDatabaseMetaData.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp>
#include <connectivity/FValue.hxx>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp>
#include "resource/common_res.hrc" #include "resource/common_res.hrc"
#include <vector> #include <vector>
#include "MDatabaseMetaDataHelper.hxx" #include "MDatabaseMetaDataHelper.hxx"
#include "MorkParser.hxx"
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
using namespace dbtools;
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace connectivity; using namespace connectivity;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx;
namespace connectivity namespace connectivity

11
connectivity/source/drivers/mork/MDatabaseMetaData.hxx
View File

@@ -10,19 +10,8 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX
#include <connectivity/CommonTools.hxx>
#include <connectivity/OSubComponent.hxx>
#include "MConnection.hxx"
#include "MDatabaseMetaDataHelper.hxx"
#include "TDatabaseMetaDataBase.hxx" #include "TDatabaseMetaDataBase.hxx"
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <cppuhelper/weakref.hxx>
namespace connectivity namespace connectivity
{ {
namespace mork namespace mork

8
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
View File

@@ -7,18 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "MConnection.hxx"
#include "MDatabaseMetaDataHelper.hxx" #include "MDatabaseMetaDataHelper.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
#include <connectivity/dbexception.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/sequence.hxx>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
// do we need it? // do we need it?
static ::osl::Mutex m_aMetaMutex; static ::osl::Mutex m_aMetaMutex;
#include <osl/diagnose.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>

7
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
View File

@@ -10,14 +10,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include "FDatabaseMetaDataResultSet.hxx" #include "FDatabaseMetaDataResultSet.hxx"
#include "MErrorResource.hxx"
#include "MConnection.hxx"
#include <com/sun/star/uno/Sequence.hxx>
namespace connectivity namespace connectivity
{ {

5
connectivity/source/drivers/mork/MDriver.cxx
View File

@@ -7,15 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <cppuhelper/supportsservice.hxx>
#include "MDriver.hxx" #include "MDriver.hxx"
#include "MConnection.hxx" #include "MConnection.hxx"
#include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
#include <com/sun/star/mozilla/MozillaProductType.hpp>
#include "resource/mork_res.hrc"
#include "resource/common_res.hrc"
using namespace connectivity::mork; using namespace connectivity::mork;

15
connectivity/source/drivers/mork/MDriver.hxx
View File

@@ -10,25 +10,12 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX
#include <sal/config.h>
#include <cassert>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdbc/DriverPropertyInfo.hpp> #include <com/sun/star/sdbc/DriverPropertyInfo.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#define MORK_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MorkDriver" #define MORK_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MorkDriver"

2
connectivity/source/drivers/mork/MErrorResource.hxx
View File

@@ -20,8 +20,6 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX
#include <rtl/ustring.hxx>
namespace connectivity namespace connectivity
{ {
namespace mork namespace mork

11
connectivity/source/drivers/mork/MPreparedStatement.cxx
View File

@@ -7,17 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <osl/diagnose.h>
#include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/sdbcx/VColumn.hxx>
#include "MPreparedStatement.hxx" #include "MPreparedStatement.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include "MResultSetMetaData.hxx" #include "MResultSetMetaData.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp>
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
@@ -30,12 +23,8 @@ using namespace ::comphelper;
using namespace connectivity; using namespace connectivity;
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbc;
using namespace com::sun::star::sdbcx;
using namespace com::sun::star::container; using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::util; using namespace com::sun::star::util;
IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedStatement","com.sun.star.sdbc.PreparedStatement");

4
connectivity/source/drivers/mork/MPreparedStatement.hxx
View File

@@ -21,11 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX
#include "MResultSet.hxx" #include "MResultSet.hxx"
#include "MStatement.hxx"
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/sdbc/XMultipleResults.hpp> #include <com/sun/star/sdbc/XMultipleResults.hpp>
#include <cppuhelper/compbase5.hxx> #include <cppuhelper/compbase5.hxx>

2
connectivity/source/drivers/mork/MQueryHelper.cxx
View File

@@ -31,9 +31,7 @@
#include <string.h> #include <string.h>
#include "resource/mork_res.hrc" #include "resource/mork_res.hrc"
#include "resource/common_res.hrc"
#include <connectivity/dbexception.hxx>
#include <unotools/textsearch.hxx> #include <unotools/textsearch.hxx>
using namespace connectivity::mork; using namespace connectivity::mork;

6
connectivity/source/drivers/mork/MQueryHelper.hxx
View File

@@ -20,14 +20,8 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MQUERYHELPER_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MQUERYHELPER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MQUERYHELPER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MQUERYHELPER_HXX
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#include <connectivity/FValue.hxx> #include <connectivity/FValue.hxx>
#include "MErrorResource.hxx" #include "MErrorResource.hxx"
#include <unordered_map>
namespace connectivity namespace connectivity
{ {

12
connectivity/source/drivers/mork/MResultSet.cxx
View File

@@ -17,24 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/extract.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/sdbc/FetchDirection.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
#include <TSortIndex.hxx>
#include <rtl/string.hxx>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include "MResultSet.hxx" #include "MResultSet.hxx"

15
connectivity/source/drivers/mork/MStatement.cxx
View File

@@ -18,32 +18,17 @@
*/ */
#include <osl/diagnose.h>
#include <comphelper/property.hxx>
#include <comphelper/uno3.hxx>
#include <osl/thread.h>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/FetchDirection.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/sequence.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx> #include <connectivity/dbexception.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <algorithm> #include <algorithm>
#include "MDriver.hxx" #include "MDriver.hxx"
#include "MStatement.hxx" #include "MStatement.hxx"
#include "sqlbison.hxx" #include "sqlbison.hxx"
#include "MConnection.hxx"
#include "MResultSet.hxx" #include "MResultSet.hxx"
#include "MDatabaseMetaData.hxx"
#include "resource/mork_res.hrc" #include "resource/mork_res.hrc"
#include "resource/common_res.hrc" #include "resource/common_res.hrc"

13
connectivity/source/drivers/mork/MStatement.hxx
View File

@@ -20,23 +20,10 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XBatchExecution.hpp>
#include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx> #include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <list>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sqliterator.hxx> #include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx> #include <connectivity/sqlparse.hxx>
#include <connectivity/FValue.hxx>
#include "TSortIndex.hxx" #include "TSortIndex.hxx"
#include "MConnection.hxx"
#include "MTable.hxx" #include "MTable.hxx"
#include <memory> #include <memory>

20
connectivity/source/drivers/mork/MTable.cxx
View File

@@ -18,33 +18,13 @@
*/ */
#include "MTable.hxx" #include "MTable.hxx"
#include "MTables.hxx"
#include "MColumns.hxx" #include "MColumns.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/sdbc/KeyRule.hpp>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <comphelper/sequence.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/TKeys.hxx> #include <connectivity/TKeys.hxx>
#include <connectivity/TIndexes.hxx> #include <connectivity/TIndexes.hxx>
#include "MCatalog.hxx"
using namespace ::comphelper;
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace connectivity; using namespace connectivity;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,

1
connectivity/source/drivers/mork/MTable.hxx
View File

@@ -21,7 +21,6 @@
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLE_HXX
#include <connectivity/TTableHelper.hxx> #include <connectivity/TTableHelper.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include "MConnection.hxx" #include "MConnection.hxx"
namespace connectivity namespace connectivity

17
connectivity/source/drivers/mork/MTables.cxx
View File

@@ -19,30 +19,13 @@
#include "MTables.hxx" #include "MTables.hxx"
#include "MTable.hxx" #include "MTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/KeyRule.hpp>
#include <com/sun/star/sdbcx/KeyType.hpp>
#include "MCatalog.hxx" #include "MCatalog.hxx"
#include "MConnection.hxx"
#include <comphelper/extract.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
using namespace ::comphelper;
using namespace connectivity; using namespace connectivity;
using namespace ::cppu;
using namespace connectivity::mork; using namespace connectivity::mork;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace dbtools;
sdbcx::ObjectType OTables::createObject(const OUString& _rName) sdbcx::ObjectType OTables::createObject(const OUString& _rName)
{ {