summaryrefslogtreecommitdiff
path: root/mysqlc/source
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-03-12 09:15:29 +0000
committerCaolán McNamara <cmc@openoffice.org>2010-03-12 09:15:29 +0000
commitce744c8437ca04701394aedb244a29928e12aea4 (patch)
tree91e2c4025b4e579b5694d4c4843df9e9279c9923 /mysqlc/source
parentcd8457ee4ff0ddf490539b8d620c38638ee08ae2 (diff)
cmcfixes73: #i110068# unify headers in one place
Diffstat (limited to 'mysqlc/source')
-rw-r--r--mysqlc/source/makefile.mk3
-rw-r--r--mysqlc/source/mysqlc_connection.cxx10
-rw-r--r--mysqlc/source/mysqlc_connection.hxx2
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx32
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.hxx6
-rw-r--r--mysqlc/source/mysqlc_driver.cxx2
-rw-r--r--mysqlc/source/mysqlc_driver.hxx2
-rw-r--r--mysqlc/source/mysqlc_general.cxx6
-rw-r--r--mysqlc/source/mysqlc_general.hxx6
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.cxx10
-rw-r--r--mysqlc/source/mysqlc_preparedstatement.hxx2
-rw-r--r--mysqlc/source/mysqlc_resultsetmetadata.hxx4
-rw-r--r--mysqlc/source/mysqlc_statement.hxx2
13 files changed, 55 insertions, 32 deletions
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index ff1c8c83f7c4..302444758115 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -116,6 +116,9 @@ CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
.ELSE
CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
+.IF "$(USE_SYSTEM_STL)"!="YES"
+CDEFS += -DADAPT_EXT_STL
+.ENDIF
.ENDIF
# --------------- MySQL settings ------------------
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index c839e235f369..a62716ee444a 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -26,11 +26,13 @@
* for a copy of the LGPLv3 License.
************************************************************************/
+#include <tools/preextstl.h>
#include <cppconn/driver.h>
#include <cppconn/connection.h>
#include <cppconn/statement.h>
#include <cppconn/metadata.h>
#include <cppconn/exception.h>
+#include <tools/postextstl.h>
#include "mysqlc_connection.hxx"
#include "mysqlc_databasemetadata.hxx"
@@ -186,10 +188,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
if (bEmbedded == sal_False) {
try {
sql::ConnectOptionsMap connProps;
- std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr();
- std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr();
- std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr();
- std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr();
+ ext_std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr();
+ ext_std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr();
+ ext_std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr();
+ ext_std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr();
connProps["hostName"] = sql::ConnectPropertyVal(host_str);
connProps["userName"] = sql::ConnectPropertyVal(user_str);
connProps["password"] = sql::ConnectPropertyVal(pass_str);
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 0b17a0a362e2..b59fb630ac37 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -46,7 +46,9 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
+#include <tools/preextstl.h>
#include <cppconn/driver.h>
+#include <tools/postextstl.h>
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/weakref.hxx>
#include <rtl/string.hxx>
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 30911dda97cf..076435c01d9b 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -54,13 +54,15 @@ using namespace com::sun::star::sdbc;
using ::rtl::OUString;
using mysqlc_sdbc_driver::getStringFromAny;
+#include <tools/preextstl.h>
#include <cppconn/connection.h>
#include <cppconn/resultset.h>
#include <cppconn/metadata.h>
#include <cppconn/statement.h>
#include <cppconn/prepared_statement.h>
+#include <tools/postextstl.h>
-static std::string wild("%");
+static ext_std::string wild("%");
using ::rtl::OUStringToOString;
@@ -114,7 +116,7 @@ ODatabaseMetaData::~ODatabaseMetaData()
/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
-OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() )
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData;
@@ -133,7 +135,7 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName,
/* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */
-OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() )
+OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData;
@@ -1654,7 +1656,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()),
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -1696,7 +1698,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
OSL_TRACE("ODatabaseMetaData::getColumns");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()),
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -1750,11 +1752,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
- std::list<sql::SQLString> tabTypes;
+ ext_std::list<sql::SQLString> tabTypes;
for (const OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) {
tabTypes.push_back(OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr());
}
@@ -1822,7 +1824,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -1882,7 +1884,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
OSL_TRACE("ODatabaseMetaData::getExportedKeys");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
@@ -1924,7 +1926,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
@@ -1965,7 +1967,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
@@ -2008,7 +2010,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
@@ -2051,7 +2053,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
@@ -2092,7 +2094,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -2157,7 +2159,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
std::vector< std::vector< Any > > rRows;
- std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
+ ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()),
pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()),
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 8e6680c3ac20..f7f659ce97b8 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -39,7 +39,9 @@
#include <cppuhelper/implbase1.hxx>
#endif
+#include <tools/preextstl.h>
#include <cppconn/metadata.h>
+#include <tools/postextstl.h>
namespace connectivity
{
@@ -67,8 +69,8 @@ namespace connectivity
bool identifier_quote_string_set;
private:
- OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
- OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() );
+ OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() );
+ OUString impl_getStringMetaData( const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() );
OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() );
OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() );
sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() );
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index af312af89d00..3513b8072d60 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -38,11 +38,13 @@ using namespace connectivity::mysqlc;
using ::rtl::OUString;
#include <stdio.h>
+#include <tools/preextstl.h>
#include <cppconn/exception.h>
#ifdef SYSTEM_MYSQL_CPPCONN
#include <mysql_driver.h>
#endif
+#include <tools/postextstl.h>
/* {{{ MysqlCDriver::MysqlCDriver() -I- */
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index ede8eb9002f0..06e399ca6542 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -36,7 +36,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/compbase2.hxx>
+#include <tools/preextstl.h>
#include <cppconn/driver.h>
+#include <tools/postextstl.h>
#include <osl/module.h>
namespace connectivity
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index 54058f0cef8c..ff37568aba64 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -162,14 +162,14 @@ int mysqlToOOOType(int cppConnType)
}
-::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
+::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding)
{
return ::rtl::OUString( _string.c_str(), _string.size(), encoding );
}
-::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding)
+::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding)
{
- return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() );
+ return ::ext_std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() );
}
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 43cf1c8ef86e..166c7f2e76e6 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -30,7 +30,9 @@
#ifndef _MYSQLC_GENERAL_
#define _MYSQLC_GENERAL_
+#include <tools/preextstl.h>
#include <cppconn/exception.h>
+#include <tools/postextstl.h>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
@@ -58,9 +60,9 @@ namespace mysqlc_sdbc_driver
int mysqlToOOOType(int mysqlType) throw ();
- ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
+ ::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding);
- ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding);
+ ::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding);
}
#endif
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index a6c1cedb2acb..0bf2f6fdab7a 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
checkParameterIndex(parameter);
try {
- std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
+ ext_std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie);
} catch (sql::MethodNotImplementedException) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
@@ -344,7 +344,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- std::string dateStr;
+ ext_std::string dateStr;
char buf[20];
dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Year));
dateStr.append("-", 1);
@@ -372,7 +372,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- std::string timeStr;
+ ext_std::string timeStr;
char buf[20];
timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Hours));
timeStr.append(":", 1);
@@ -400,7 +400,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- std::string timeStr;
+ ext_std::string timeStr;
char buf[20];
timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Year));
timeStr.append("-", 1);
@@ -805,7 +805,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence<
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
checkParameterIndex(parameter);
- std::string blobby((char *)x.getConstArray(), x.getLength());
+ ext_std::string blobby((char *)x.getConstArray(), x.getLength());
try {
((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby);
} catch (sql::MethodNotImplementedException) {
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index f58e59982aaa..eb53bdcbd839 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -48,7 +48,9 @@
#include <com/sun/star/io/XInputStream.hpp>
#endif
+#include <tools/preextstl.h>
#include <cppconn/prepared_statement.h>
+#include <tools/postextstl.h>
namespace connectivity
{
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 7793179a0844..ca3844d63351 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -35,7 +35,9 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
+#include <tools/preextstl.h>
#include <cppconn/resultset_metadata.h>
+#include <tools/postextstl.h>
namespace connectivity
{
@@ -62,7 +64,7 @@ namespace connectivity
{
}
- inline ::rtl::OUString convert( const ::std::string& _string ) const
+ inline ::rtl::OUString convert( const ::ext_std::string& _string ) const
{
return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding );
}
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index e33244e987fd..34273f617d58 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -13,7 +13,9 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/util/XCancellable.hpp>
+#include <tools/preextstl.h>
#include <cppconn/statement.h>
+#include <tools/postextstl.h>
#include <cppuhelper/compbase5.hxx>
#include <list>