callcatcher: drop unused macro-generated GetChildWindowId methods

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

Change-Id: I3b8290869368487f04ecd93a5f3a717de7fd10b4

12 files changed, 14 insertions, 14 deletions

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 )
 
 //==================================================================