diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-23 07:19:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-25 19:24:23 +0200 |
| commit | 98de5b40c8a3fd4e57477b6d994e3b1472207f71 (patch) | |
| tree | 567fdbbaecbddbfc19f28a08da5d1f6d5207748c /connectivity | |
| parent | 0552a91acde9dce28c0d92c552d21fbadfcb9184 (diff) | |
Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
Diffstat (limited to 'connectivity')
5 files changed, 6 insertions, 4 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index d956fde6d165..c2f87a2ade2e 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -35,6 +35,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/types.hxx> +#include <tools/string.hxx> using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index bc2e3da7e305..45aaabd7300e 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -32,6 +32,7 @@ #include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> +#include <tools/string.hxx> #include <ucbhelper/content.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 7f0c00c46a15..3e26231dc936 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <tools/string.hxx> #include <tools/urlobj.hxx> #include "file/FDriver.hxx" #include "file/FTable.hxx" diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index bcaacfaba3fa..902304c4f69a 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -23,18 +23,16 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include "connectivity/OSubComponent.hxx" -#ifndef _MAP_ -#include <map> -#endif #include "connectivity/CommonTools.hxx" #include "OTypeInfo.hxx" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include "connectivity/sqlparse.hxx" #include "connectivity/sqliterator.hxx" #include "TConnection.hxx" #include "file/filedllapi.hxx" +#include <map> namespace connectivity { diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index e29d2fb1e597..b18eb0d444be 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -41,6 +41,7 @@ #include <comphelper/propertycontainer.hxx> #include "file/fanalyzer.hxx" #include <comphelper/broadcasthelper.hxx> +#include <tools/string.hxx> #include "TSortIndex.hxx" #define SQL_COLUMN_NOTFOUND STRING_NOTFOUND |