From ce744c8437ca04701394aedb244a29928e12aea4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Fri, 12 Mar 2010 09:15:29 +0000
Subject: cmcfixes73: #i110068# unify headers in one place

---
 mysqlc/source/mysqlc_connection.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mysqlc/source/mysqlc_connection.cxx')

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);
-- 
cgit