[Libreoffice-commits] core.git: 2 commits - desktop/source i18npool/source

[Stephan Bergmann]

 desktop/source/splash/splash.cxx          |   18 ++++++++++++++++--
 desktop/source/splash/unxsplash.cxx       |   20 ++++++++++++++++++++
 desktop/source/splash/unxsplash.hxx       |   13 +++++++++++--
 i18npool/source/localedata/localedata.cxx |    6 ++----
 4 files changed, 49 insertions(+), 8 deletions(-)

New commits:
commit 8389519a23470b104b28ad497eb61a66ba92b81e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 8 15:04:56 2014 +0100

    Missing XServiceInfo
    
    Change-Id: Ifc5454bbcd29730002b0a3261d2c34dee8ffb843

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index ad06ead..3ce90a4 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -26,9 +26,11 @@
 #include <vcl/salnativewidgets.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/math.hxx>
@@ -46,7 +48,7 @@ using namespace ::com::sun::star::uno;
 namespace {
 
 class  SplashScreen
-    : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization >
+    : public ::cppu::WeakImplHelper3< XStatusIndicator, XInitialization, XServiceInfo >
     , public IntroWindow
 {
 private:
@@ -99,6 +101,18 @@ public:
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
         throw ( RuntimeException );
 
+    virtual OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return desktop::splash::getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return cppu::supportsService(this, ServiceName); }
+
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException)
+    { return desktop::splash::getSupportedServiceNames(); }
+
     // workwindow
     virtual void Paint( const Rectangle& );
 
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index 665a106..6c1a829 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -22,6 +22,7 @@
 #include <osl/process.h>
 //#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <cppuhelper/implementationentry.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 
@@ -118,6 +119,25 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::
         }
     }
 }
+
+OUString UnxSplashScreen::getImplementationName()
+    throw (css::uno::RuntimeException)
+{
+    return UnxSplash_getImplementationName();
+}
+
+sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> UnxSplashScreen::getSupportedServiceNames()
+    throw (css::uno::RuntimeException)
+{
+    return UnxSplash_getSupportedServiceNames();
+}
+
 }
 
 using namespace desktop;
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index a1282bb..fef8cef 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -16,7 +16,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <osl/mutex.hxx>
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
 
 namespace desktop {
 
-class  UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization >
+class  UnxSplashScreen : public ::cppu::WeakImplHelper3< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo >
 {
 private:
     // don't allow anybody but ourselves to create instances of this class
@@ -58,6 +58,15 @@ public:
 
     // XInitialize
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException );
+
+    virtual OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException);
 };
 
 }
commit 6dfc7d12c56fb585edff2cc4f6f37d53398cf751
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 8 14:51:55 2014 +0100

    Fix LocaleDataImpl::getImplementationName
    
    Change-Id: I36dd015635c30f63e2085c250e159fbd536da611

diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index a2f9490..da49400 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -32,8 +32,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star;
 
-static const sal_Char clocaledata[] = "com.sun.star.i18n.LocaleData";
-
 typedef sal_Unicode**   (SAL_CALL * MyFunc_Type)( sal_Int16&);
 typedef sal_Unicode***  (SAL_CALL * MyFunc_Type2)( sal_Int16&, sal_Int16& );
 typedef sal_Unicode**** (SAL_CALL * MyFunc_Type3)( sal_Int16&, sal_Int16&, sal_Int16& );
@@ -1618,7 +1616,7 @@ sal_Bool OutlineNumbering::hasElements(  ) throw(RuntimeException)
 OUString SAL_CALL
 LocaleDataImpl::getImplementationName() throw( RuntimeException )
 {
-    return OUString(clocaledata);
+    return OUString("com.sun.star.i18n.LocaleDataImpl");
 }
 
 sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName)
@@ -1631,7 +1629,7 @@ Sequence< OUString > SAL_CALL
 LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString(clocaledata);
+    aRet[0] = "com.sun.star.i18n.LocaleData";
     return aRet;
 }