diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-03-12 09:15:29 +0000 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-03-12 09:15:29 +0000 |
commit | ce744c8437ca04701394aedb244a29928e12aea4 (patch) | |
tree | 91e2c4025b4e579b5694d4c4843df9e9279c9923 /mysqlc/source/mysqlc_connection.cxx | |
parent | cd8457ee4ff0ddf490539b8d620c38638ee08ae2 (diff) |
cmcfixes73: #i110068# unify headers in one place
Diffstat (limited to 'mysqlc/source/mysqlc_connection.cxx')
-rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
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); |