You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/06/08 19:28:02 UTC
svn commit: r1747440 - in /openoffice/trunk/main/connectivity:
inc/connectivity/sqlparse.hxx source/parse/sqlnode.cxx
Author: damjan
Date: Wed Jun 8 19:28:02 2016
New Revision: 1747440
URL: http://svn.apache.org/viewvc?rev=1747440&view=rev
Log:
#i126917# windows build breaks in module connectivity/source/parse/sqliterator.cxx
Fix compile errors in Patricia's patch in #1747439.
Patch by: me
Modified:
openoffice/trunk/main/connectivity/inc/connectivity/sqlparse.hxx
openoffice/trunk/main/connectivity/source/parse/sqlnode.cxx
Modified: openoffice/trunk/main/connectivity/inc/connectivity/sqlparse.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/inc/connectivity/sqlparse.hxx?rev=1747440&r1=1747439&r2=1747440&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/inc/connectivity/sqlparse.hxx (original)
+++ openoffice/trunk/main/connectivity/inc/connectivity/sqlparse.hxx Wed Jun 8 19:28:02 2016
@@ -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
Modified: openoffice/trunk/main/connectivity/source/parse/sqlnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/parse/sqlnode.cxx?rev=1747440&r1=1747439&r2=1747440&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/parse/sqlnode.cxx (original)
+++ openoffice/trunk/main/connectivity/source/parse/sqlnode.cxx Wed Jun 8 19:28:02 2016
@@ -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