callcatcher: drop unused macro-generated GetChildWindowId methods

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

Change-Id: I3b8290869368487f04ecd93a5f3a717de7fd10b4

57 files changed, 137 insertions, 128 deletions

diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index f0d6820ec927..8433f0491833 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -56,7 +56,7 @@ public:
                         MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~MediaPlayer();
 
-                        SFX_DECL_CHILDWINDOW( MediaPlayer );
+                        SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer );
 };
 
 // ----------------
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 350e4e92bbe2..c6b35df0e4f1 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -62,7 +62,7 @@ MediaPlayer::~MediaPlayer()
 
 // -----------------------------------------------------------------------------
 
-SFX_IMPL_DOCKINGWINDOW( MediaPlayer, SID_AVMEDIA_PLAYER )
+SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
 
 // ----------------
 // - MediaFloater -
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a63fb3b46e73..f8c69a49da12 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -127,7 +127,7 @@ ScTextWndBase::ScTextWndBase( Window* pParent,  WinBits nStyle )
 //  class ScInputWindowWrapper
 //==================================================================
 
-SFX_IMPL_CHILDWINDOW(ScInputWindowWrapper,FID_INPUTLINE_STATUS)
+SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS)
 
 ScInputWindowWrapper::ScInputWindowWrapper( Window*          pParentP,
                                             sal_uInt16           nId,
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1356fe11a806..093b57992916 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -51,7 +51,7 @@
 
 // -----------------------------------------------------------------------
 
-SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
+SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX )
 
 /*************************************************************************
 #*  Member:     ScFunctionChildWindow
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 5e1849221100..9da65a944ed6 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -53,7 +53,7 @@ class ScFunctionChildWindow : public SfxChildWindow
     ScFunctionChildWindow( Window*, sal_uInt16, SfxBindings*,
                             SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW(ScFunctionChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(ScFunctionChildWindow);
 };
 
 /*************************************************************************
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 66e7eed31078..c5462e209bc5 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -325,7 +325,7 @@ public:
                                   SfxBindings*      pBindings,
                                   SfxChildWinInfo*  pInfo );
 
-    SFX_DECL_CHILDWINDOW(ScInputWindowWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(ScInputWindowWrapper);
 };
 
 
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 07a751c8b3e7..e1db89dfa956 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -37,33 +37,34 @@
     class Class : public SfxChildWindow                                         \
     {                                                                           \
     public:                                                                     \
-        Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );               \
+        Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );           \
         SFX_DECL_CHILDWINDOW(Class);                                            \
     };
 
+#define DECL_WRAPPER_WITHID(Class) \
+    class Class : public SfxChildWindow                                         \
+    {                                                                           \
+    public:                                                                     \
+        Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );           \
+        SFX_DECL_CHILDWINDOW_WITHID(Class);                                     \
+    };
 
 //==================================================================
 
-DECL_WRAPPER(ScNameDlgWrapper)
-DECL_WRAPPER(ScNameDefDlgWrapper)
-DECL_WRAPPER(ScSolverDlgWrapper)
-DECL_WRAPPER(ScOptSolverDlgWrapper)
-DECL_WRAPPER(ScPivotLayoutWrapper)
-DECL_WRAPPER(ScTabOpDlgWrapper)
-DECL_WRAPPER(ScFilterDlgWrapper)
-DECL_WRAPPER(ScSpecialFilterDlgWrapper)
-DECL_WRAPPER(ScDbNameDlgWrapper)
-DECL_WRAPPER(ScConsolidateDlgWrapper)
-DECL_WRAPPER(ScPrintAreasDlgWrapper)
-DECL_WRAPPER(ScColRowNameRangesDlgWrapper)
-DECL_WRAPPER(ScFormulaDlgWrapper)
-DECL_WRAPPER(ScHighlightChgDlgWrapper)
-
-/*!!! dafuer muss der Funktionsautopilot noch umgebaut werden
-DECL_WRAPPER(ScFunctionDlgWrapper)
-DECL_WRAPPER(ScEditFunctionDlgWrapper)
-DECL_WRAPPER(ScArgumentDlgWrapper)
-*/
+DECL_WRAPPER_WITHID(ScNameDlgWrapper)
+DECL_WRAPPER_WITHID(ScNameDefDlgWrapper)
+DECL_WRAPPER_WITHID(ScSolverDlgWrapper)
+DECL_WRAPPER_WITHID(ScOptSolverDlgWrapper)
+DECL_WRAPPER_WITHID(ScPivotLayoutWrapper)
+DECL_WRAPPER_WITHID(ScTabOpDlgWrapper)
+DECL_WRAPPER_WITHID(ScFilterDlgWrapper)
+DECL_WRAPPER_WITHID(ScSpecialFilterDlgWrapper)
+DECL_WRAPPER_WITHID(ScDbNameDlgWrapper)
+DECL_WRAPPER_WITHID(ScConsolidateDlgWrapper)
+DECL_WRAPPER_WITHID(ScPrintAreasDlgWrapper)
+DECL_WRAPPER_WITHID(ScColRowNameRangesDlgWrapper)
+DECL_WRAPPER_WITHID(ScFormulaDlgWrapper)
+DECL_WRAPPER_WITHID(ScHighlightChgDlgWrapper)
 
 class ScAcceptChgDlgWrapper: public SfxChildWindow
 {
@@ -73,7 +74,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow
                                 SfxBindings*,
                                 SfxChildWinInfo* );
 
-        SFX_DECL_CHILDWINDOW(Class);
+        SFX_DECL_CHILDWINDOW_WITHID(Class);
 
         virtual void ReInitDlg();
 };
@@ -86,7 +87,7 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
                                 SfxBindings*,
                                 SfxChildWinInfo* );
 
-        SFX_DECL_CHILDWINDOW(Class);
+        SFX_DECL_CHILDWINDOW_WITHID(Class);
 
         static void     SetDefaultPosSize(Point aPos, Size aSize, sal_Bool bSet=sal_True);
         virtual String  GetRefString();
@@ -107,7 +108,7 @@ class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
     Window * m_pSavedWndParent;
 public:
     ScValidityRefChildWin( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
-    SFX_DECL_CHILDWINDOW(ScValidityRefChildWin);
+    SFX_DECL_CHILDWINDOW_WITHID(ScValidityRefChildWin);
     ~ScValidityRefChildWin();
     bool    LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; }
     bool    LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; }
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index 8bf217243795..332037749a10 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -51,7 +51,7 @@ class ScDocument;
 class ScSpellDialogChildWindow : public ::svx::SpellDialogChildWindow
 {
 public:
-    SFX_DECL_CHILDWINDOW( ScSpellDialogChildWindow );
+    SFX_DECL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow );
 
     explicit            ScSpellDialogChildWindow( Window* pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index d7247deddaef..746d7b283d0e 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -42,28 +42,23 @@
 
 // -----------------------------------------------------------------------
 
-SFX_IMPL_MODELESSDIALOG(ScNameDlgWrapper, FID_DEFINE_NAME )
-SFX_IMPL_MODELESSDIALOG(ScNameDefDlgWrapper, FID_ADD_NAME )
-SFX_IMPL_MODELESSDIALOG(ScSolverDlgWrapper, SID_OPENDLG_SOLVE )
-SFX_IMPL_MODELESSDIALOG(ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER )
-SFX_IMPL_MODELESSDIALOG(ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE )
-SFX_IMPL_MODELESSDIALOG(ScTabOpDlgWrapper, SID_OPENDLG_TABOP )
-SFX_IMPL_MODELESSDIALOG(ScFilterDlgWrapper, SID_FILTER )
-SFX_IMPL_MODELESSDIALOG(ScSpecialFilterDlgWrapper, SID_SPECIAL_FILTER )
-SFX_IMPL_MODELESSDIALOG(ScDbNameDlgWrapper, SID_DEFINE_DBNAME )
-SFX_IMPL_MODELESSDIALOG(ScConsolidateDlgWrapper, SID_OPENDLG_CONSOLIDATE )
-SFX_IMPL_MODELESSDIALOG(ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA )
-SFX_IMPL_MODELESSDIALOG(ScColRowNameRangesDlgWrapper, SID_DEFINE_COLROWNAMERANGES )
-SFX_IMPL_MODELESSDIALOG(ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
-SFX_IMPL_MODELESSDIALOG(ScAcceptChgDlgWrapper, FID_CHG_ACCEPT )
-SFX_IMPL_MODELESSDIALOG(ScHighlightChgDlgWrapper, FID_CHG_SHOW )
-SFX_IMPL_MODELESSDIALOG(ScSimpleRefDlgWrapper, WID_SIMPLE_REF )
-/*!!! dafuer muss der Funktionsautopilot noch umgebaut werden
-SFX_IMPL_CHILDWINDOW(ScFunctionDlgWrapper, SID_OPENDLG_FUNCTION )
-SFX_IMPL_CHILDWINDOW(ScEditFunctionDlgWrapper, SID_OPENDLG_EDITFUNCTION )
-SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT )
-*/
-SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
+SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScSolverDlgWrapper, SID_OPENDLG_SOLVE )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScTabOpDlgWrapper, SID_OPENDLG_TABOP )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScFilterDlgWrapper, SID_FILTER )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScSpecialFilterDlgWrapper, SID_SPECIAL_FILTER )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScDbNameDlgWrapper, SID_DEFINE_DBNAME )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScConsolidateDlgWrapper, SID_OPENDLG_CONSOLIDATE )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScColRowNameRangesDlgWrapper, SID_DEFINE_COLROWNAMERANGES )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScAcceptChgDlgWrapper, FID_CHG_ACCEPT )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScHighlightChgDlgWrapper, FID_CHG_SHOW )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScSimpleRefDlgWrapper, WID_SIMPLE_REF )
+SFX_IMPL_CHILDWINDOW_WITHID(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
 SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
 {
     SfxChildWinInfo anInfo = SfxChildWindow::GetInfo();
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 882dd722a710..5aded7ee2eaf 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -46,7 +46,7 @@
 
 // ============================================================================
 
-SFX_IMPL_CHILDWINDOW( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
+SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
 
 ScSpellDialogChildWindow::ScSpellDialogChildWindow( Window* pParentP, sal_uInt16 nId,
         SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
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
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index c3f554f00d5b..4362a9ad4c06 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -290,12 +290,18 @@ public:
         static  SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \
                     SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
         static  void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \
-        static  sal_uInt16 GetChildWindowId ();\
         virtual SfxChildWinInfo GetInfo() const
 
+#define SFX_DECL_CHILDWINDOW_WITHID(Class) \
+        SFX_DECL_CHILDWINDOW(Class); \
+        static  sal_uInt16 GetChildWindowId ()\
+
 #define SFX_IMPL_CHILDWINDOW(Class, MyID) \
         SFX_IMPL_POS_CHILDWINDOW(Class, MyID, CHILDWIN_NOPOS)
 
+#define SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID) \
+        SFX_IMPL_POS_CHILDWINDOW_WITHID(Class, MyID, CHILDWIN_NOPOS)
+
 #define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \
         SfxChildWindow* Class::CreateImpl( ::Window *pParent, \
                 sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
@@ -303,8 +309,6 @@ public:
                     SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
                     return pWin; \
                 } \
-        sal_uInt16 Class::GetChildWindowId () \
-		{ return MyID; } \
         void    Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags)   \
                 {   \
                     SfxChildWinFactory *pFact = new SfxChildWinFactory( \
@@ -314,6 +318,11 @@ public:
                     SfxChildWindow::RegisterChildWindow(pMod, pFact); \
                 }
 
+#define SFX_IMPL_POS_CHILDWINDOW_WITHID(Class, MyID, Pos) \
+        SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \
+        sal_uInt16 Class::GetChildWindowId () \
+                { return MyID; } \
+
 #define SFX_IMPL_FLOATINGWINDOW(Class, MyID)    \
         SFX_IMPL_CHILDWINDOW(Class, MyID)       \
         SfxChildWinInfo Class::GetInfo() const \
@@ -322,6 +331,14 @@ public:
             ((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo );  \
             return aInfo; }
 
+#define SFX_IMPL_FLOATINGWINDOW_WITHID(Class, MyID)    \
+        SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID)       \
+        SfxChildWinInfo Class::GetInfo() const \
+        {                                       \
+            SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();     \
+            ((SfxFloatingWindow*)GetWindow())->FillInfo( aInfo );  \
+            return aInfo; }
+
 #define SFX_IMPL_MODELESSDIALOG(Class, MyID)    \
         SFX_IMPL_CHILDWINDOW(Class, MyID)       \
         SfxChildWinInfo Class::GetInfo() const \
@@ -330,6 +347,15 @@ public:
             ((SfxModelessDialog*)GetWindow())->FillInfo( aInfo );  \
             return aInfo; }
 
+#define SFX_IMPL_MODELESSDIALOG_WITHID(Class, MyID)    \
+        SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID)       \
+        SfxChildWinInfo Class::GetInfo() const \
+        {                                       \
+            SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();     \
+            ((SfxModelessDialog*)GetWindow())->FillInfo( aInfo );  \
+            return aInfo; }
+
+
 #define SFX_IMPL_DOCKINGWINDOW(Class, MyID) \
         SFX_IMPL_CHILDWINDOW(Class, MyID)       \
         SfxChildWinInfo Class::GetInfo() const \
@@ -338,6 +364,14 @@ public:
             ((SfxDockingWindow*)GetWindow())->FillInfo( aInfo );  \
             return aInfo; }
 
+#define SFX_IMPL_DOCKINGWINDOW_WITHID(Class, MyID) \
+        SFX_IMPL_CHILDWINDOW_WITHID(Class, MyID)       \
+        SfxChildWinInfo Class::GetInfo() const \
+        {                                       \
+            SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();     \
+            ((SfxDockingWindow*)GetWindow())->FillInfo( aInfo );  \
+            return aInfo; }
+
 #define SFX_IMPL_TOOLBOX(Class, MyID)   \
         SFX_IMPL_CHILDWINDOW(Class, MyID)       \
         SfxChildWinInfo Class::GetInfo() const \
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index 02132266e6d3..11699dc152fd 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -97,7 +97,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
 public:
                 SfxTemplateDialogWrapper
                     (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
-                SFX_DECL_CHILDWINDOW(SfxTemplateDialogWrapper);
+                SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper);
 
     void            SetParagraphFamily();
 };
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 00da60db9a61..0d43e62b9202 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -252,12 +252,6 @@ Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo
     return pWin;
 }
 
-sal_uInt16 SfxDockingWrapper::GetChildWindowId ()
-{
-    DBG_ASSERT( false, "This method shouldn't be called!" );
-    return 0;
-}
-
 void SfxDockingWrapper::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags)
 {
     // pre-register a couple of docking windows
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4ba51cef0fbc..75bace87997b 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -109,7 +109,7 @@ TYPEINIT0(SfxCommonTemplateDialog_Impl);
 TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
 TYPEINIT1(SfxTemplateCatalog_Impl,SfxCommonTemplateDialog_Impl);
 
-SFX_IMPL_DOCKINGWINDOW(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
+SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
 
 //-------------------------------------------------------------------------
 
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 4242867f3130..464b6802ffe7 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -77,7 +77,7 @@ public:
 
 class SmToolBoxWrapper : public SfxChildWindow
 {
-    SFX_DECL_CHILDWINDOW(SmToolBoxWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper);
 
 protected:
     SmToolBoxWrapper(Window *pParentWindow,
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 5e9da554c097..e667a36768a1 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -203,7 +203,7 @@ public:
 
 class SmCmdBoxWrapper : public SfxChildWindow
 {
-    SFX_DECL_CHILDWINDOW(SmCmdBoxWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper);
 
 protected:
     SmCmdBoxWrapper(Window          *pParentWindow,
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 5b27e5e198ce..1e43604e64c9 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -362,7 +362,7 @@ IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
 
 /**************************************************************************/
 
-SFX_IMPL_FLOATINGWINDOW(SmToolBoxWrapper, SID_TOOLBOXWINDOW);
+SFX_IMPL_FLOATINGWINDOW_WITHID(SmToolBoxWrapper, SID_TOOLBOXWINDOW);
 
 SmToolBoxWrapper::SmToolBoxWrapper(Window *pParentWindow,
                                    sal_uInt16 nId, SfxBindings* pBindings,
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 52a7a542b847..89e20db05f66 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -929,7 +929,7 @@ void SmCmdBoxWindow::GetFocus()
 /**************************************************************************/
 
 
-SFX_IMPL_DOCKINGWINDOW(SmCmdBoxWrapper, SID_CMDBOXWINDOW);
+SFX_IMPL_DOCKINGWINDOW_WITHID(SmCmdBoxWrapper, SID_CMDBOXWINDOW);
 
 SmCmdBoxWrapper::SmCmdBoxWrapper(Window *pParentWindow, sal_uInt16 nId,
                                  SfxBindings *pBindings,
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 5cdc6d21f1bf..c21bef0631e8 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -72,7 +72,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow
                                                    sal_uInt16, SfxBindings*,
                                                    SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(SvxBmpMaskChildWindow);
 };
 
 /*************************************************************************
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 7aac1961f89c..5d29cd67137e 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -85,7 +85,7 @@ class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
     SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*,
                          SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW(SvxColorChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(SvxColorChildWindow);
 };
 
 /*************************************************************************
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 1c48248004b2..f8fdbeec2540 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
 
     SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow );
+    SFX_DECL_CHILDWINDOW_WITHID( SvxContourDlgChildWindow );
 };
 
 #ifndef _REDUCED_ContourDlg_HXX_
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index b523c86752fe..e6ebb0efe847 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
  public:
     Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW(Svx3DChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(Svx3DChildWindow);
 };
 
 #endif      // _SVX_F3DCHILD_HXX
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 347864342c8c..3ca520a94b7e 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -87,7 +87,7 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
 {
  public:
     SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
-    SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(SvxFontWorkChildWindow);
 };
 
 /*************************************************************************
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index 2d9c20a472e4..f93451e48956 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -51,7 +51,7 @@ public:
                         GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~GalleryChildWindow();
 
-                        SFX_DECL_CHILDWINDOW( GalleryChildWindow );
+                        SFX_DECL_CHILDWINDOW_WITHID( GalleryChildWindow );
 };
 
 // ------------------
diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index 88b828c662cc..8a516d56be5f 100644
--- a/svx/inc/svx/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
@@ -51,7 +51,7 @@ public:
     SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper);
     virtual sal_Bool    QueryClose();
 };
 
diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index a1cf6126215b..631ba864e4d4 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow
 
     SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
-    SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow );
+    SFX_DECL_CHILDWINDOW_WITHID( SvxIMapDlgChildWindow );
 
     static void UpdateIMapDlg( const Graphic& rGraphic, const ImageMap* pImageMap = NULL,
                                const TargetList* pTargetList = NULL, void* pEditingObj = NULL );
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 263494332dc9..c960c2188729 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -103,7 +103,7 @@ public:
 
     ~SvxSearchDialogWrapper ();
     SvxSearchDialog *getDialog ();
-    SFX_DECL_CHILDWINDOW(SvxSearchDialogWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper);
 };
 
 // class SvxSearchDialog -------------------------------------------------
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index ec9739f83534..3213c01d230e 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -66,7 +66,7 @@
 
 // -------------------------------------------------------------------------
 
-SFX_IMPL_DOCKINGWINDOW( SvxBmpMaskChildWindow, SID_BMPMASK )
+SFX_IMPL_DOCKINGWINDOW_WITHID( SvxBmpMaskChildWindow, SID_BMPMASK )
 
 // -------------------------------------------------------------------------
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index db68e5892b5c..32b962b11c07 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -63,7 +63,7 @@
 #include <vcl/virdev.hxx>
 #include "dlgunit.hxx"
 
-SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
+SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 
 
 /******************************************************************************/
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index d455470ba2b7..db343c2470bf 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -47,7 +47,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
-SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK );
+SFX_IMPL_DOCKINGWINDOW_WITHID( SvxFontWorkChildWindow, SID_FONTWORK );
 
 // ControllerItem for Fontwork
 
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 2669036622a1..845aa3a9a256 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -39,7 +39,7 @@
 //#                                                                      #
 //########################################################################
 
-SFX_IMPL_CHILDWINDOW(SvxHlinkDlgWrapper, SID_HYPERLINK_DIALOG)
+SFX_IMPL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper, SID_HYPERLINK_DIALOG)
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 40b3c17a1b4a..b6a211e017e4 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -90,7 +90,7 @@
 
 /******************************************************************************/
 
-SFX_IMPL_MODELESSDIALOG( SvxIMapDlgChildWindow, SID_IMAP );
+SFX_IMPL_MODELESSDIALOG_WITHID( SvxIMapDlgChildWindow, SID_IMAP );
 
 // ControllerItem
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index e577e09d3525..eb7eb10be939 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2420,7 +2420,7 @@ void SvxSearchDialog::SaveToModule_Impl()
 
 // class SvxSearchDialogWrapper ------------------------------------------
 
-SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG);
+SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG);
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index b6cfd4b5188f..e8d6f2356bca 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -65,7 +65,7 @@
 #include <svx/float3d.hxx>
 #include "float3d.hrc"
 
-SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
+SFX_IMPL_DOCKINGWINDOW_WITHID( Svx3DChildWindow, SID_3D_WIN )
 
 struct Svx3DWinImpl
 {
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index ef88a608b75c..96df9025cf66 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -96,7 +96,7 @@ GalleryChildWindow::~GalleryChildWindow()
 
 // -----------------------------------------------------------------------------
 
-SFX_IMPL_DOCKINGWINDOW( GalleryChildWindow, SID_GALLERY )
+SFX_IMPL_DOCKINGWINDOW_WITHID( GalleryChildWindow, SID_GALLERY )
 
 // ------------------
 // - GalleryBrowser -
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 192db50d3441..38e1993f02c9 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -45,7 +45,7 @@
 #include "svx/xexch.hxx"
 #include <vcl/svapp.hxx>
 
-SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL )
+SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL )
 
 // ------------------------
 // - SvxColorValueSetData -
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
index 817c78ffe569..93d590c44c2d 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::beans;
 
-SFX_IMPL_CHILDWINDOW(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
+SFX_IMPL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow, FN_SPELL_GRAMMAR_DIALOG)
 
 
 #define SPELL_START_BODY        0   // body text area
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/ui/dialog/wordcountwrapper.cxx
index 93bd1df09425..aaca02d8a1c9 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -31,7 +31,7 @@
 #include <wordcountdialog.hrc>
 #include <cmdid.h>
 
-SFX_IMPL_CHILDWINDOW(SwWordCountWrapper, FN_WORDCOUNT_DIALOG)
+SFX_IMPL_CHILDWINDOW_WITHID(SwWordCountWrapper, FN_WORDCOUNT_DIALOG)
 
 SwWordCountWrapper::SwWordCountWrapper(   Window *pParentWindow,
                             sal_uInt16 nId,
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx
index fdff854085d6..89bf5de80de7 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/ui/fldui/fldwrap.cxx
@@ -45,7 +45,7 @@
 #include <fldtdlg.hrc>
 #include "swabstdlg.hxx"
 
-SFX_IMPL_CHILDWINDOW(SwFldDlgWrapper, FN_INSERT_FIELD)
+SFX_IMPL_CHILDWINDOW_WITHID(SwFldDlgWrapper, FN_INSERT_FIELD)
 
 SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) :
         SfxChildWindow(pParentWindow, nId),
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
index 0d3cf88faac2..2215e919b8cc 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
@@ -65,7 +65,7 @@ public:
         SfxChildWinInfo* pInfo);
     ~SwSpellDialogChildWindow();
 
-    SFX_DECL_CHILDWINDOW(SwSpellDialogChildWindow);
+    SFX_DECL_CHILDWINDOW_WITHID(SwSpellDialogChildWindow);
 
     void    InvalidateSpellDialog();
 
diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx
index f2ed07bc3fba..476af7d441ff 100644
--- a/sw/source/ui/inc/fldwrap.hxx
+++ b/sw/source/ui/inc/fldwrap.hxx
@@ -38,7 +38,7 @@ public:
     SwFldDlgWrapper( Window* pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SwFldDlgWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper);
 
     virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh);
     void            ShowPage(sal_uInt16 nPage = 0);
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx
index 22e71dbc6168..7ffc99326ce3 100644
--- a/sw/source/ui/inc/idxmrk.hxx
+++ b/sw/source/ui/inc/idxmrk.hxx
@@ -43,7 +43,7 @@ protected:
                             SfxBindings* pBindings,
                             SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SwInsertIdxMarkWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SwInsertIdxMarkWrapper);
 
 public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
@@ -58,7 +58,7 @@ protected:
                             SfxBindings* pBindings,
                             SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SwInsertAuthMarkWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SwInsertAuthMarkWrapper);
 
 public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx
index 1351f1c9df33..7814825d3b4d 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/ui/inc/inputwin.hxx
@@ -119,7 +119,7 @@ public:
                         SfxBindings*,
                         SfxChildWinInfo*  );
     ~SwInputChild();
-    SFX_DECL_CHILDWINDOW( SwInputChild );
+    SFX_DECL_CHILDWINDOW_WITHID( SwInputChild );
     void            SetFormula( const String& rFormula, sal_Bool bDelSel = sal_True )
                         { ((SwInputWindow*)pWindow)->SetFormula(
                                     rFormula, bDelSel ); }
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 0d32d280f3c7..992b0e74d48e 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -168,7 +168,7 @@ public:
                             SfxBindings*,
                             SfxChildWinInfo*  );
 
-    SFX_DECL_CHILDWINDOW( SwRedlineAcceptChild );
+    SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild );
 
     virtual sal_Bool    ReInitDlg(SwDocShell *pDocSh);
 };
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index 50859cc7b268..19600720620e 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -89,7 +89,7 @@ protected:
                             SfxBindings* pBindings,
                             SfxChildWinInfo* pInfo );
 
-    SFX_DECL_CHILDWINDOW(SwWordCountWrapper);
+    SFX_DECL_CHILDWINDOW_WITHID(SwWordCountWrapper);
 
 public:
     void    UpdateCounts();
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 4f1dcde4253e..b09b73e42958 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -63,7 +63,7 @@
 #include <ndtxt.hxx>
 #include <breakit.hxx>
 
-SFX_IMPL_CHILDWINDOW(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG)
+SFX_IMPL_CHILDWINDOW_WITHID(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG)
 
 SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow,
                             sal_uInt16 nId,
@@ -93,7 +93,7 @@ void    SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
     pAbstDlg->ReInitDlg(rWrtShell);
 }
 
-SFX_IMPL_CHILDWINDOW(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG)
+SFX_IMPL_CHILDWINDOW_WITHID(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG)
 
 SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper(   Window *pParentWindow,
                             sal_uInt16 nId,
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index ae65e1f4522b..34bc2a1cdaaf 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -68,7 +68,7 @@
 
 #include <IDocumentRedlineAccess.hxx>
 
-SFX_IMPL_MODELESSDIALOG( SwRedlineAcceptChild, FN_REDLINE_ACCEPT )
+SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, FN_REDLINE_ACCEPT )
 
 SV_IMPL_OP_PTRARR_SORT(SwRedlineDataParentSortArr, SwRedlineDataParentPtr)
 
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 0693340291be..64249d08709c 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -61,7 +61,7 @@
 
 #include <IDocumentContentOperations.hxx>
 
-SFX_IMPL_POS_CHILDWINDOW( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
+SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
 
 //==================================================================
 
diff --git a/unusedcode.easy b/unusedcode.easy
index b36814b1620d..4d6601a7b1c8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,3 @@
-FmFieldWinMgr::GetChildWindowId()
-FmPropBrwMgr::GetChildWindowId()
 FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
 HTMLControls::Insert(HTMLControl const*&, unsigned short&)
 HTMLControls::Insert(HTMLControl const**, unsigned short)
@@ -17,7 +15,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
 MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
 MSDffImportRecords::Remove(unsigned short, unsigned short)
 PopupMenu::SetSelectedEntry(unsigned short)
-PropBrwMgr::GetChildWindowId()
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
 ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
@@ -66,11 +63,7 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
 SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SfxDockingWrapper::GetChildWindowId()
 SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-SfxNavigatorWrapper::GetChildWindowId()
-SfxPartChildWnd_Impl::GetChildWindowId()
-SfxRecordingFloatWrapper_Impl::GetChildWindowId()
 SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
 SpinButton::SpinButton(Window*, ResId const&)
 SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
@@ -101,7 +94,6 @@ SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder const**, unsigned short)
 SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
 SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder const*&, unsigned short)
 SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
-SvxRubyChildWindow::GetChildWindowId()
 SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
 SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
 SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
@@ -133,7 +125,6 @@ SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
 SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
 SwDestroyList::Insert(SwSectionFrm* const*, unsigned short)
 SwDestroyList::Remove(SwSectionFrm* const&, unsigned short)
-SwFldDataOnlyDlgWrapper::GetChildWindowId()
 SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&)
 SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
 SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned short)
@@ -147,7 +138,6 @@ SwInsDBColumns::Insert(SwInsDBColumn* const*, unsigned short)
 SwInsDBColumns::Insert(SwInsDBColumns const*, unsigned short, unsigned short)
 SwInsDBColumns::Remove(SwInsDBColumn* const&, unsigned short)
 SwInsDBColumns::Remove(unsigned short, unsigned short)
-SwMailMergeChildWindow::GetChildWindowId()
 SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
 SwOutlineNodes::Insert(SwNode* const*, unsigned short)
 SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
@@ -171,7 +161,6 @@ SwSortTableLines::Insert(SwTableLine* const&, unsigned short&)
 SwSortTableLines::Insert(SwTableLine* const*, unsigned short)
 SwSortTableLines::Remove(SwTableLine* const&, unsigned short)
 SwSortTableLines::Remove(unsigned short, unsigned short)
-SwSyncChildWin::GetChildWindowId()
 SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
@@ -649,7 +638,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
 sd::ViewShellBase::RegisterFactory(unsigned short)
-sfx2::TaskPaneWrapper::GetChildWindowId()
 slideshow::internal::DrawShapeSubsetting::reset(slideshow::internal::DocTreeNode const&, boost::shared_ptr<GDIMetaFile> const&)
 std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener>, std::less<_xmlNode*>, std::allocator<std::pair<_xmlNode* const, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener> > > >::~multimap()
 std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
@@ -657,6 +645,3 @@ std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
 std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
 std::__cxx1998::vector<SfxItemDesruptor_Impl*, std::allocator<SfxItemDesruptor_Impl*> >::~vector()
 std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector()
-svxform::DataNavigatorManager::GetChildWindowId()
-svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
-svxform::NavigatorFrameManager::GetChildWindowId()