callcatcher: drop unused macro-generated GetChildWindowId methods

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

Change-Id: I3b8290869368487f04ecd93a5f3a717de7fd10b4

18 files changed, 18 insertions, 18 deletions

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 -