[Libreoffice-commits] core.git: 4 commits - connectivity/source vcl/headless

[Tor Lillqvist]

 connectivity/source/commontools/dbtools2.cxx                        |   16 ----------
 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |    1 
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx         |    2 -
 connectivity/source/parse/sqlnode.cxx                               |    5 ---
 vcl/headless/svpframe.cxx                                           |    2 -
 5 files changed, 1 insertion(+), 25 deletions(-)

New commits:
commit 15dc2626fd29129707a79ba84241090672d2ea71
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 25 21:49:48 2013 +0200

    Remove a FIXME comment
    
    Change-Id: I13127dadcdfeff3d99df819393f6298ac0cb11bc

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 0d4e466..a94e051 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -81,7 +81,7 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
     // fast and easy cross-platform wiping of the data
     memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
     m_aSystemChildData.nSize        = sizeof( SystemChildData );
-#if defined( UNX ) // FIXME: prolly redundant
+#ifdef UNX
     m_aSystemChildData.pSalFrame    = this;
 #if defined(ANDROID) || defined(IOS)
     // We want 32-bit RGBA bitmaps
commit 59a919067563b39729e339f54a0205889eaaf95a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 25 20:12:41 2013 +0200

    Remove a couple of unused private fields
    
    Change-Id: Ia28d6befe63453ced7c623e76abc7a0ec7d6cbeb

diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index a921a44..085e832 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -61,7 +61,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
     ,m_pConnection(_pConnection)
     ,m_nTextEncoding(_pConnection->getTextEncoding())
     ,m_nRowPos(-1)
-    ,m_nLastColumnPos(0)
     ,m_nDriverColumnCount(0)
     ,m_nCurrentFetchState(0)
     ,m_bWasNull(sal_True)
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 42d0348..ccbc613 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -67,14 +67,12 @@ namespace connectivity
             ::std::map<sal_Int32,SWORD>                                         m_aODBCColumnTypes;
 
             SQLHANDLE                                                                   m_aStatementHandle;   // ... until freed
-            SQLHANDLE                                                                   m_aConnectionHandle;
             ::com::sun::star::uno::WeakReferenceHelper                                  m_aStatement;
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>        m_xMetaData;
             SQLUSMALLINT*                               m_pRowStatusArray;
             OConnection*                                m_pConnection;
             rtl_TextEncoding                            m_nTextEncoding;
             sal_Int32                                   m_nRowPos;
-            sal_Int32                                   m_nLastColumnPos;       // used for m_aRow just to know where we are
             sal_Int32                                   m_nDriverColumnCount;   // column count of the driver wich can sometimes be less than the metadata count
             SQLRETURN                                   m_nCurrentFetchState;
             sal_Bool                                    m_bWasNull;
commit aac64d030f8ce2903ba412193f1010112d9d822a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 25 20:03:59 2013 +0200

    Fix warning: unused variable 'aMutex' [loplugin]
    
    Change-Id: I1dc2d18f285bbd7fc4316a7a194a21769b11d545

diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 779b638..cca574d 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1115,11 +1115,6 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const :
                                           const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                                          const Reference< XPropertySet > & xField)
 {
-
-
-    // mutex for parsing
-    static ::osl::Mutex aMutex;
-
     // Guard the parsing
     ::osl::MutexGuard aGuard(getMutex());
     // must be reset
commit 97a72b42c03de3d9286998758e13fc170bc0cba9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 25 20:03:25 2013 +0200

    Fix warning: unused variable 'sColumnName' [loplugin]
    
    Change-Id: I3b4267f9782bc7bc71247523c8fd5940bc8cef38

diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 4d6d802..fdccc15 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -686,22 +686,6 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
         if ( xCurrentRow.is() )
         {
             // after creation the set is positioned before the first record, per definition
-#ifdef DBG_UTIL
-            Reference< XResultSetMetaDataSupplier > xSup(xPrivileges,UNO_QUERY);
-            if ( xSup.is() )
-            {
-                Reference< XResultSetMetaData > xRsMetaData = xSup->getMetaData();
-                if ( xRsMetaData.is() )
-                {
-                    sal_Int32 nCount = xRsMetaData->getColumnCount();
-                    for (sal_Int32 i=1; i<=nCount; ++i)
-                    {
-                        ::rtl::OUString sColumnName = xRsMetaData->getColumnName(i);
-                    }
-                }
-            }
-#endif
-
             ::rtl::OUString sPrivilege, sGrantee;
             while ( xPrivileges->next() )
             {