[Libreoffice-commits] core.git: 2 commits - include/sfx2

[Stephan Bergmann]

 include/sfx2/objface.hxx |    2 --
 include/sfx2/shell.hxx   |    5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e73ee8db850f292aadbc2c7c853c6b4fb1dd5100
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 21 12:35:49 2014 +0200

    Remove unused SfxInterface::GetResManager_Impl
    
    Change-Id: Ia9ad8072b07f0121af18377445c90480ff7c2600

diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 35d9357..8a83741 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -93,8 +93,6 @@ public:
 
     SAL_DLLPRIVATE bool     ContainsSlot_Impl( const SfxSlot *pSlot ) const
                             { return pSlot >= pSlots && pSlot < pSlots + Count(); }
-    SAL_DLLPRIVATE ResMgr*  GetResManager_Impl() const
-                            { return aNameResId.GetResMgr(); }
 };
 
 
commit 5309cab855f2ccd129de97834d781524e2aa961e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 21 12:35:30 2014 +0200

    Remove unused pSfxFormalArgs_Impl
    
    Change-Id: I0c1e8c42fd03bd861323cbff172031f5405c1597

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index c574b6f..05c5e48 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -567,12 +567,10 @@ inline void SfxShell::SetPool
     pPool = pNewPool;
 }
 
-#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
-                                static SfxSlot a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] =
 
 #define SFX_DECL_INTERFACE(nId)                                             \
             static SfxInterface*                pInterface;                 \
-            static const SfxFormalArgument*     pSfxFormalArgs_Impl;        \
             static SfxInterface*                GetStaticInterface();       \
             static SfxInterfaceId               GetInterfaceId() {return SfxInterfaceId(nId);} \
             static void                         RegisterInterface(SfxModule* pMod=NULL); \
@@ -581,7 +579,6 @@ inline void SfxShell::SetPool
 #define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId)                      \
                                                                             \
     SfxInterface* Class::pInterface = 0;                                    \
-    const SfxFormalArgument* Class::pSfxFormalArgs_Impl = a##Class##Args_Impl;\
     SfxInterface* Class::GetStaticInterface()                      \
     {                                                                       \
         if ( !pInterface )                                                  \