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

Stephan Bergmann sbergman at redhat.com
Wed Mar 25 07:56:22 PDT 2015


 connectivity/source/drivers/kab/KDriver.cxx |    9 +--------
 connectivity/source/drivers/kab/KDriver.hxx |    4 ----
 2 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 6d3dd1adec0990ee95ad88d252c59766e9cc56ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 25 15:55:44 2015 +0100

    loplugin:constantfunction
    
    Change-Id: Ic95699c514b24886ab1ca6d2b625fe9bd033f4ea

diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 582e85e..3deb36b 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -355,7 +355,7 @@ void KabDriver::disposing()
 
 OUString KabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return OUString::createFromAscii( impl_getAsciiImplementationName() );
+    return OUString("com.sun.star.comp.sdbc." KAB_SERVICE_NAME ".Driver");
 }
 
 Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -444,13 +444,6 @@ void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException
     // not interested in (this is the disposing of the desktop, if any)
 }
 
-const sal_Char* KabDriver::impl_getAsciiImplementationName()
-{
-    return "com.sun.star.comp.sdbc." KAB_SERVICE_NAME ".Driver";
-        // this name is referenced in the configuration and in the kab.xml
-        // Please be careful when changing it.
-}
-
 OUString KabDriver::impl_getConfigurationSettingsPath()
 {
     OUStringBuffer aPath;
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index fb998bc..d33b1cc 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -166,10 +166,6 @@ namespace connectivity
             static OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
             static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
 
-            /** returns the driver's implementation name (being pure ASCII) for reference in various places
-            */
-            static const sal_Char*  impl_getAsciiImplementationName();
-
             /** returns the path of our configuration settings
             */
             static OUString  impl_getConfigurationSettingsPath();


More information about the Libreoffice-commits mailing list