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

Stephan Bergmann sbergman at redhat.com
Wed Mar 25 01:18:30 PDT 2015


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

New commits:
commit 1b37292b9721c3f76bbe4f6d1c7df119768d78ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 25 09:17:44 2015 +0100

    loplugin:constantfunction
    
    Change-Id: Idc231c76175d93a11846d9e3552f3b6eef75b41a

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 1c2881a..290e3e4 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -211,7 +211,7 @@ void MacabDriver::disposing()
 
 OUString MacabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return OUString::createFromAscii( impl_getAsciiImplementationName() );
+    return OUString("com.sun.star.comp.sdbc.macab.Driver");
 }
 
 Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -305,13 +305,6 @@ void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeExcepti
     // not interested in (this is the disposing of the desktop, if any)
 }
 
-const sal_Char* MacabDriver::impl_getAsciiImplementationName()
-{
-    return "com.sun.star.comp.sdbc.macab.Driver";
-        // this name is referenced in the configuration and in the macab.xml
-        // Please be careful when changing it.
-}
-
 OUString MacabDriver::impl_getConfigurationSettingsPath()
 {
     OUStringBuffer aPath;
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index bbec3e4..b783d30 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -136,10 +136,6 @@ namespace connectivity
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
             getComponentContext() const { return m_xContext; }
 
-            /** 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