connectivity/inc/connectivity/sqlparse.hxx | 11 ++++++++++-
connectivity/source/parse/sqlnode.cxx | 15 ++++++---------
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 2c0ab85572965aa49e6c8645c00578ee317411e9
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jun 8 19:42:58 2016 +0000
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Fix a *nix build breaker from my 2 previous commits.
Patch by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index 16705f2..445f8e6 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -137,7 +137,7 @@ namespace connectivity
::com::sun::star::lang::Locale aLocale;
::connectivity::SQLError aErrors;
- ::connectivity::OSQLParser_Data( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
>& _xServiceFactory );
+ OSQLParser_Data( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
};
/** Parser for SQL92
commit 606c0d90a51178db4ea452eb55b1e6a0b734ab7d
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jun 8 19:28:02 2016 +0000
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Fix compile errors in Patricia's patch in #1747439.
Patch by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index a489422..16705f2 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -137,7 +137,7 @@ namespace connectivity
::com::sun::star::lang::Locale aLocale;
::connectivity::SQLError aErrors;
- ::connectivity::OSQLParser_Data( const Reference< XMultiServiceFactory
>& _xServiceFactory );
+ ::connectivity::OSQLParser_Data( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
>& _xServiceFactory );
};
/** Parser for SQL92
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index e828b45..d9c91da 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -148,16 +148,13 @@ namespace connectivity
{
//=============================================================================
-struct OSQLParser_Data
+//= OSQLParser_Data
+//=============================================================================
+//-----------------------------------------------------------------------------
+OSQLParser_Data::OSQLParser_Data( const Reference< XMultiServiceFactory >&
_xServiceFactory )
+ :aErrors( _xServiceFactory )
{
- ::com::sun::star::lang::Locale aLocale;
- ::connectivity::SQLError aErrors;
-
- OSQLParser_Data( const Reference< XMultiServiceFactory >& _xServiceFactory
)
- :aErrors( _xServiceFactory )
- {
- }
-};
+}
//=============================================================================
//= SQLParseNodeParameter
commit 89b86d9fa3254051752815cfcdd40ae0916ddde4
Author: Damjan Jovanovic <dam...@apache.org>
Date: Wed Jun 8 19:19:50 2016 +0000
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Commit Patricia's initial broken patch which starts in the right direction,
and fix it in my next commit.
Patch by: pats
Review by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index 53ee457..a489422 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -37,8 +37,10 @@
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XLocaleData.hpp>
+#include <com/sun/star/lang/Locale.hpp>
#include "connectivity/IParseContext.hxx"
#include "connectivity/dbtoolsdllapi.hxx"
+#include "connectivity/sqlerror.hxx"
#include <salhelper/singletonref.hxx>
#include <osl/mutex.hxx>
@@ -130,7 +132,14 @@ namespace connectivity
//==========================================================================
//= OSQLParser
//==========================================================================
- struct OSQLParser_Data;
+ struct OSQLParser_Data
+ {
+ ::com::sun::star::lang::Locale aLocale;
+ ::connectivity::SQLError aErrors;
+
+ ::connectivity::OSQLParser_Data( const Reference< XMultiServiceFactory
>& _xServiceFactory );
+
+ };
/** Parser for SQL92
*/
class OOO_DLLPUBLIC_DBTOOLS OSQLParser
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
