callcatcher: drop unused macro-generated GetChildWindowId methods

add _WITHID variants for the cases where we (apparently?) still need
them.

Change-Id: I3b8290869368487f04ecd93a5f3a717de7fd10b4

8 files changed, 12 insertions, 12 deletions

diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index 36089768c83e..85efe5a3e1b6 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -38,7 +38,7 @@
 
 namespace sd {
 
-SFX_IMPL_DOCKINGWINDOW(AnimationChildWindow, SID_ANIMATION_OBJECTS)
+SFX_IMPL_DOCKINGWINDOW_WITHID(AnimationChildWindow, SID_ANIMATION_OBJECTS)
 
 /*************************************************************************
 |*
diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx
index 1c8a25b40cc4..305ac8decd18 100644
--- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/LayerDialogChildWindow.cxx
@@ -36,7 +36,7 @@
 // are included that define ::sd::Window.  The ... macros are not really
 // namespace proof.
 namespace sd {
-SFX_IMPL_DOCKINGWINDOW(LayerDialogChildWindow, SID_LAYER_DIALOG_WIN)
+SFX_IMPL_DOCKINGWINDOW_WITHID(LayerDialogChildWindow, SID_LAYER_DIALOG_WIN)
 }
 
 #include "LayerDialog.hrc"
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index e7127a8769bd..90065b04d16e 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -53,9 +53,9 @@ using ::com::sun::star::drawing::framework::XConfigurationController;
 using ::com::sun::star::drawing::framework::ResourceActivationMode_ADD;
 using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE;
 
-SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
-SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
-SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE)
+SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
+SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
+SFX_IMPL_DOCKINGWINDOW_WITHID( ToolPanelChildWindow, SID_TASKPANE)
 
 //===== PaneChildWindow =======================================================
 
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index 0d984d5d916f..3d307b57136c 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -35,7 +35,7 @@
 
 namespace sd{
 
-SFX_IMPL_CHILDWINDOW(SpellDialogChildWindow, SID_SPELL_DIALOG)
+SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG)
 }
 
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx
index fcffc6617b7b..471c2976df64 100644
--- a/sd/source/ui/inc/AnimationChildWindow.hxx
+++ b/sd/source/ui/inc/AnimationChildWindow.hxx
@@ -47,7 +47,7 @@ public:
         SfxBindings*,
         SfxChildWinInfo*);
 
-    SFX_DECL_CHILDWINDOW(AnimationChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(AnimationChildWindow);
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx
index eef560299890..96b5aac56999 100644
--- a/sd/source/ui/inc/LayerDialogChildWindow.hxx
+++ b/sd/source/ui/inc/LayerDialogChildWindow.hxx
@@ -47,7 +47,7 @@ public:
         SfxChildWinInfo*);
     virtual ~LayerDialogChildWindow (void);
 
-    SFX_DECL_CHILDWINDOW(LayerDialogChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(LayerDialogChildWindow);
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx
index 262fbbc2f7a6..0c1b68026da5 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -58,7 +58,7 @@ class LeftPaneImpressChildWindow
 public:
     LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
 
-    SFX_DECL_CHILDWINDOW(LeftPaneImpressChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow);
 };
 
 
@@ -70,7 +70,7 @@ class LeftPaneDrawChildWindow
 public:
     LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
 
-    SFX_DECL_CHILDWINDOW(LeftPaneDrawChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow);
 };
 
 
@@ -89,7 +89,7 @@ public:
         SfxBindings* i_pBindings,
         SfxChildWinInfo* i_pChildWindowInfo );
 
-    SFX_DECL_CHILDWINDOW( ToolPanelChildWindow );
+    SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow );
 
     // ::sfx2::ITaskPaneToolPanelAccess
     virtual void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL );
diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx
index 23472594df09..3077da1263e0 100644
--- a/sd/source/ui/inc/SpellDialogChildWindow.hxx
+++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx
@@ -56,7 +56,7 @@ public:
     */
     virtual void InvalidateSpellDialog (void);
 
-    SFX_DECL_CHILDWINDOW(SpellDialogChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow);
 
 protected:
     /** Iterate over the sentences in all text shapes and stop at the