summaryrefslogtreecommitdiffstats
path: root/mysqlc/source/mysqlc_connection.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'mysqlc/source/mysqlc_connection.cxx')
-rw-r--r--mysqlc/source/mysqlc_connection.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 492bd2444fb3..281a40f08b7b 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -33,13 +33,11 @@
#include "mysqlc_preparedstatement.hxx"
#include "mysqlc_general.hxx"
-#include <preextstl.h>
#include <cppconn/driver.h>
#include <cppconn/connection.h>
#include <cppconn/statement.h>
#include <cppconn/metadata.h>
#include <cppconn/exception.h>
-#include <postextstl.h>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
@@ -186,10 +184,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
if (bEmbedded == sal_False) {
try {
sql::ConnectOptionsMap connProps;
- 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();
+ 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();
connProps["hostName"] = sql::ConnectPropertyVal(host_str);
connProps["userName"] = sql::ConnectPropertyVal(user_str);
connProps["password"] = sql::ConnectPropertyVal(pass_str);