Kaydet (Commit) a0c50b73 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Further fallout from the connectivity SQL parser changes

A couple of headers now need to be public because they are indirectly
included in other modules.

Change-Id: Id01945197b67183a0a042e854289875ae147a0eb
üst 986b39aa
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "internalnode.hxx"
#include <algorithm> #include <algorithm>
#include <connectivity/sqlparse.hxx> #include <connectivity/sqlparse.hxx>
#include <connectivity/internalnode.hxx>
using namespace connectivity; using namespace connectivity;
......
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
#include <vector> #include <vector>
#include <string.h> #include <string.h>
#include "parse/sqlbison_exports.hxx"
#include <connectivity/sqlnode.hxx> #include <connectivity/sqlnode.hxx>
#include <connectivity/sqlparse.hxx> #include <connectivity/sqlparse.hxx>
#include <internalnode.hxx> #include <connectivity/sqlbison_exports.hxx>
#include <connectivity/sqlscan.hxx>
#include <connectivity/internalnode.hxx>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
...@@ -40,7 +41,6 @@ ...@@ -40,7 +41,6 @@
#include <com/sun/star/i18n/KParseType.hpp> #include <com/sun/star/i18n/KParseType.hpp>
#include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseTokens.hpp>
#include "sqlscan.hxx"
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include "connectivity/dbconversion.hxx" #include "connectivity/dbconversion.hxx"
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include "internalnode.hxx" #include <connectivity/internalnode.hxx>
#ifndef _CONNECTIVITY_SQLYACC_HXX #ifndef _CONNECTIVITY_SQLYACC_HXX
#define _CONNECTIVITY_SQLYACC_HXX #define _CONNECTIVITY_SQLYACC_HXX
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
#undef SQLyylex #undef SQLyylex
#undef SQLyyerror #undef SQLyyerror
#endif #endif
#include "sqlscan.hxx"
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <connectivity/sqlparse.hxx> #include <connectivity/sqlparse.hxx>
#include <connectivity/sqlscan.hxx>
#if defined __SUNPRO_CC #if defined __SUNPRO_CC
#pragma disable_warn #pragma disable_warn
......
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "parse/sqlbison_exports.hxx"
#include <sal/macros.h> #include <sal/macros.h>
#include <connectivity/sqlnode.hxx> #include <connectivity/sqlnode.hxx>
#include <connectivity/sqlerror.hxx> #include <connectivity/sqlerror.hxx>
#include <internalnode.hxx> #include <connectivity/sqlbison_exports.hxx>
#include <connectivity/internalnode.hxx>
#define YYBISON 1 #define YYBISON 1
#include <sqlbison.hxx> #include <sqlbison.hxx>
#include <connectivity/sqlparse.hxx> #include <connectivity/sqlparse.hxx>
#include <connectivity/sqlscan.hxx>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp>
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
#include "TConnection.hxx" #include "TConnection.hxx"
#include "sqlscan.hxx"
#include <comphelper/numbers.hxx> #include <comphelper/numbers.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/stl_types.hxx> #include <comphelper/stl_types.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment