[Libreoffice-commits] core.git: include/sfx2 sd/source svx/source

[Noel Grandin]

 include/sfx2/shell.hxx               |    2 --
 sd/source/ui/dlg/PaneShells.cxx      |    4 ++--
 svx/source/toolbars/extrusionbar.cxx |    2 +-
 svx/source/toolbars/fontworkbar.cxx  |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0e0be1be40687b3c6131a3027a06080c6a0f1a51
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Mar 20 16:58:02 2015 +0200

    remove SFX_SLOTMAP macro
    
    an impediment to understanding
    
    Change-Id: Ic88f52a921a9f6f3e4244b73d4e1e8970c77677f

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 7679eec..b2f88a8 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -537,8 +537,6 @@ inline void SfxShell::SetPool
     pPool = pNewPool;
 }
 
-#define SFX_SLOTMAP(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] =
-
 #define SFX_DECL_INTERFACE(nId)                                             \
             static SfxInterface*                pInterface;                 \
             static SfxInterface*                GetStaticInterface();       \
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index e22c1cb..ce6c512 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -31,7 +31,7 @@ namespace sd {
 
 //===== LeftImpressPaneShell ==================================================
 
-SFX_SLOTMAP(LeftImpressPaneShell)
+static SfxSlot aLeftImpressPaneShellSlots_Impl[] =
 {
     { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
@@ -57,7 +57,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell (void)
 
 //===== LeftDrawPaneShell =====================================================
 
-SFX_SLOTMAP(LeftDrawPaneShell)
+static SfxSlot aLeftDrawPaneShellSlots_Impl[] =
 {
     { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 68d5a3a..d9c6902 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::uno;
 
 // Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also
 // tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
-SFX_SLOTMAP(ExtrusionBar)
+static SfxSlot aExtrusionBarSlots_Impl[] =
 {
     { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 98e87f7..b5e282b 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -167,7 +167,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
 
 // Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also
 // tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
-SFX_SLOTMAP(FontworkBar)
+static SfxSlot aFontworkBarSlots_Impl[] =
 {
     { 0, 0, 0, SfxSlotMode::NONE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };