diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
commit | c38b9009367579c1d70b5c5afb3ea39619ea21fb (patch) | |
tree | bfc165ba427fd47c1b3aced486ed68c8170f6bf9 | |
parent | 0ecc71e2e47f0039805ecb5e143085039bd47643 (diff) | |
parent | a46ea227ef5236bcb0f5fa0333b8678ee88e6203 (diff) |
CWS-TOOLING: integrate CWS cmcfixes77ooo/DEV300_m87
-rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_connection.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_databasemetadata.cxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_databasemetadata.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_driver.cxx | 5 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_driver.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_general.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_preparedstatement.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_statement.hxx | 4 |
10 files changed, 20 insertions, 21 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 681d0f3..17bf54f 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -35,13 +35,13 @@ #include "mysqlc_preparedstatement.hxx" #include "mysqlc_general.hxx" -#include <tools/preextstl.h> +#include <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 <postextstl.h> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 06eb92f..4315f85 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -46,9 +46,9 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/driver.h> -#include <tools/postextstl.h> +#include <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 ae09401..af6dc8e 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -54,13 +54,13 @@ using namespace com::sun::star::sdbc; using ::rtl::OUString; using mysqlc_sdbc_driver::getStringFromAny; -#include <tools/preextstl.h> +#include <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> +#include <postextstl.h> static ext_std::string wild("%"); diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 9d33995..586aeb1 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -39,9 +39,9 @@ #include <cppuhelper/implbase1.hxx> #endif -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/metadata.h> -#include <tools/postextstl.h> +#include <postextstl.h> namespace connectivity { diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 7f384c3..c28d6eb 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -38,13 +38,12 @@ using namespace connectivity::mysqlc; using ::rtl::OUString; #include <stdio.h> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/exception.h> - #ifdef SYSTEM_MYSQL_CPPCONN #include <mysql_driver.h> #endif -#include <tools/postextstl.h> +#include <postextstl.h> /* {{{ MysqlCDriver::MysqlCDriver() -I- */ diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index c1f07e1..c88c4f7 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -36,9 +36,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/driver.h> -#include <tools/postextstl.h> +#include <postextstl.h> #include <osl/module.h> namespace connectivity diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index a32ddea..ee8825d 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -33,9 +33,9 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/sdbc/SQLException.hpp> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/exception.h> -#include <tools/postextstl.h> +#include <postextstl.h> namespace mysqlc_sdbc_driver { diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index d156b9e..18d1a0c 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -48,9 +48,9 @@ #include <com/sun/star/io/XInputStream.hpp> #endif -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/prepared_statement.h> -#include <tools/postextstl.h> +#include <postextstl.h> namespace connectivity { diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index 9795ab6..b245ed4 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -35,9 +35,9 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/resultset_metadata.h> -#include <tools/postextstl.h> +#include <postextstl.h> namespace connectivity { diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index cba44f5..d4142dd 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -13,9 +13,9 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XCancellable.hpp> -#include <tools/preextstl.h> +#include <preextstl.h> #include <cppconn/statement.h> -#include <tools/postextstl.h> +#include <postextstl.h> #include <cppuhelper/compbase5.hxx> #include <list> |