[Libreoffice-commits] core.git: dbaccess/source

[Matúš Kukan]

 dbaccess/source/core/api/RowSet.cxx |   19 ++++---------------
 dbaccess/source/core/api/RowSet.hxx |    4 ----
 2 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 9e36549c68ecb4d96c56614df5d9f369db95e128
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Nov 20 21:29:36 2015 +0100

    dbaccess: small cleanup
    
    Change-Id: Id0a0aa66ffd5788873fa5dc99fcc1b912c0e90fa

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 04a7ada..0772ef2 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -27,9 +27,7 @@
 #include "RowSet.hxx"
 #include "dbastrings.hrc"
 #include "sdbcoretools.hxx"
-#include "services.hxx"
 #include "SingleSelectQueryComposer.hxx"
-#include "module_dba.hxx"
 #include "CRowSetColumn.hxx"
 #include "CRowSetDataColumn.hxx"
 #include "RowSetCache.hxx"
@@ -76,6 +74,7 @@
 #include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/solar.h>
 #include <unotools/configmgr.hxx>
 
 using namespace utl;
@@ -483,15 +482,10 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti
     return aRet;
 }
 
-OUString ORowSet::getImplementationName_static(  ) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.dba.ORowSet");
-}
-
 // css::XServiceInfo
-OUString SAL_CALL ORowSet::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ORowSet::getImplementationName() throw(RuntimeException, std::exception)
 {
-    return getImplementationName_static();
+    return OUString("com.sun.star.comp.dba.ORowSet");
 }
 
 sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
@@ -499,7 +493,7 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) thro
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > ORowSet::getSupportedServiceNames_static(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSNS( 5 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -510,11 +504,6 @@ Sequence< OUString > ORowSet::getSupportedServiceNames_static(  ) throw (Runtime
     return aSNS;
 }
 
-Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
-{
-    return getSupportedServiceNames_static();
-}
-
 // OComponentHelper
 void SAL_CALL ORowSet::disposing()
 {
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 4e406d1..f8d52df 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -267,10 +267,6 @@ namespace dbaccess
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
 
-    // css::lang::XServiceInfo - static methods
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
-        static OUString getImplementationName_static() throw( css::uno::RuntimeException );
-
     // OComponentHelper
         virtual void SAL_CALL disposing() override;