diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-19 17:18:27 +0200 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-19 17:18:27 +0200 |
commit | d85257a241a0adf5915bf74219d6db9fc06de457 (patch) | |
tree | 35ac1b95952adf808ea5b0506775c4eda3fe5d8d | |
parent | a11f3f5a7ef96d3863a20663a492db2fedb97017 (diff) |
DEV300 masterfix: #i10000#: juggle inclusion order to make mysqlc compilable on STLPort platformsooo/DEV300_m77
-rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 16 | ||||
-rw-r--r-- | mysqlc/source/mysqlc_general.hxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index b14e6af..681d0f3 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -26,14 +26,6 @@ * 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" @@ -43,6 +35,14 @@ #include "mysqlc_preparedstatement.hxx" #include "mysqlc_general.hxx" +#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 <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index 781c5a7..a32ddea 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -30,13 +30,13 @@ #ifndef _MYSQLC_GENERAL_ #define _MYSQLC_GENERAL_ +#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> + #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> - namespace mysqlc_sdbc_driver { rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny); |