diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-20 16:58:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-23 09:05:24 +0200 |
| commit | 0e0be1be40687b3c6131a3027a06080c6a0f1a51 (patch) | |
| tree | a51b401a9ed40abc29462aaa29d6309875a808fa | |
| parent | fe889944d1faa84d4ccf9aae6926f18e392c68f5 (diff) | |
remove SFX_SLOTMAP macro
an impediment to understanding
Change-Id: Ic88f52a921a9f6f3e4244b73d4e1e8970c77677f
| -rw-r--r-- | include/sfx2/shell.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/PaneShells.cxx | 4 | ||||
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 7679eec6e527..b2f88a89dc2d 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 e22c1cb6fafe..ce6c512484cb 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 68d5a3ad50c9..d9c690262426 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 98e87f75e20c..b5e282bae891 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 } }; |