[Libreoffice-commits] .: 2 commits - connectivity/inc connectivity/source

[Tor Lillqvist]

 connectivity/inc/connectivity/sqlparse.hxx     |   13 ++++++++++++-
 connectivity/source/drivers/ado/AStatement.cxx |    2 ++
 connectivity/source/parse/sqlnode.cxx          |   13 -------------
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 1967376c7b3072fefb6f74566cfa70fd03b9bd04
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 18:51:00 2011 +0300

    WaE: deletion of pointer to incomplete type; no destructor called
    
    Move the struct OSQLParser_Data definition to the sqlparse.hxx
    header. A somewhat ugly workaround for warning C4150: deletion of
    pointer to incomplete type 'connectivity::OSQLParser_Data'; no
    destructor called.

diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 1d7f128..8339d20 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/i18n/XLocaleData.hpp>
 #include "connectivity/IParseContext.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
+#include "connectivity/sqlerror.hxx"
 #include <salhelper/singletonref.hxx>
 #include <osl/mutex.hxx>
 
@@ -127,7 +128,17 @@ namespace connectivity
     //==========================================================================
     //= OSQLParser
     //==========================================================================
-    struct OSQLParser_Data;
+    struct OSQLParser_Data
+    {
+        ::com::sun::star::lang::Locale  aLocale;
+        ::connectivity::SQLError        aErrors;
+
+        OSQLParser_Data( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory )
+            :aErrors( _xServiceFactory )
+        {
+        }
+    };
+
     /** Parser for SQL92
     */
     class OOO_DLLPUBLIC_DBTOOLS OSQLParser
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 599128d..f978900 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -68,7 +68,6 @@
 #include <comphelper/stl_types.hxx>
 #include "connectivity/dbtools.hxx"
 #include "connectivity/dbmetadata.hxx"
-#include "connectivity/sqlerror.hxx"
 #include <tools/diagnose_ex.h>
 #include <string.h>
 #include <boost/bind.hpp>
@@ -154,18 +153,6 @@ namespace connectivity
 {
 
 //=============================================================================
-struct OSQLParser_Data
-{
-    ::com::sun::star::lang::Locale  aLocale;
-    ::connectivity::SQLError        aErrors;
-
-    OSQLParser_Data( const Reference< XMultiServiceFactory >& _xServiceFactory )
-        :aErrors( _xServiceFactory )
-    {
-    }
-};
-
-//=============================================================================
 //= SQLParseNodeParameter
 //=============================================================================
 //-----------------------------------------------------------------------------
commit 67a565eabf3dcbf7a76dd4a6b9ab139274fa3da7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 18:43:23 2011 +0300

    WaE: unreachable code

diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2ea1cb5..8548bd2 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -521,6 +521,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti
 sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException)
 {
     return m_eLockType;
+#if 0 // Huh?
     sal_Int32 nValue=0;
     switch(m_eLockType)
     {
@@ -533,6 +534,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R
     }
 
     return nValue;
+#endif
 }
 //------------------------------------------------------------------------------
 sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException)