From 0a14f36501e2e0ce8373464dc1655fdb1e9550b6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 16 Mar 2012 15:31:10 +0000
Subject: split macros to elide unneeded methods

---
 framework/inc/macros/xserviceinfo.hxx | 10 +++++++---
 framework/inc/tabwin/tabwindow.hxx    |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'framework/inc')

diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index f031a37ff8b4..5eadc5a2b655 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -207,7 +207,8 @@ ________________________________________________________________________________
 //  public
 //  declaration of XServiceInfo and helper functions
 //*****************************************************************************************************************
-#define DECLARE_XSERVICEINFO                                                                                                                                                                                                            \
+
+#define DECLARE_XSERVICEINFO_NOFACTORY                                                                                                                                                                                                  \
     /* interface XServiceInfo */                                                                                                                                                                                                        \
     virtual ::rtl::OUString                                        SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException );   \
     virtual sal_Bool                                               SAL_CALL supportsService                    ( const ::rtl::OUString&                                        sServiceName    ) throw( css::uno::RuntimeException );   \
@@ -215,11 +216,14 @@ ________________________________________________________________________________
     /* Helper for XServiceInfo */                                                                                                                                                                                                       \
     static css::uno::Sequence< ::rtl::OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );                                       \
     static ::rtl::OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );                                       \
+    /* Helper for initialization of service by using own reference! */                                                                                                                                                                  \
+    virtual void                                                   SAL_CALL impl_initService                   (                                                                               );                                       \
+
+#define DECLARE_XSERVICEINFO                                                                                                                                                                                                            \
+    DECLARE_XSERVICEINFO_NOFACTORY \
     /* Helper for registry */                                                                                                                                                                                                           \
     static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );          \
     static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );                                       \
-    /* Helper for initialization of service by using own reference! */                                                                                                                                                                  \
-    virtual void                                                   SAL_CALL impl_initService                   (                                                                               );                                       \
 
 //*****************************************************************************************************************
 //  public
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index bbad1e22a51a..0cfe4507c048 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -85,7 +85,7 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
 
         //  XInterface, XTypeProvider, XServiceInfo
         FWK_DECLARE_XINTERFACE
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
         FWK_DECLARE_XTYPEPROVIDER
 
         using ::cppu::OPropertySetHelper::disposing;
-- 
cgit