remove nasty _IMAPDLG_PRIVATE foo

and untangle orthogonal Update method names

Change-Id: I3f9edb406c3e330a62f58eccf6fc23c210f3994e

include/svx/imapdlg.hxx

@@ -81,7 +81,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
 {
     friend class IMapOwnData;
     friend class IMapWindow;
-    using Window::Update;
 
     ToolBox             aTbxIMapDlg1;
     FixedText           aFtURL;
@@ -100,26 +99,21 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
     SvxIMapDlgItem      aIMapItem;
 
     virtual void        Resize();
-    virtual sal_Bool        Close();
-
-#ifdef _IMAPDLG_PRIVATE
-
-                        DECL_LINK( TbxClickHdl, ToolBox* );
-                        DECL_LINK( InfoHdl, IMapWindow* );
-                        DECL_LINK( MousePosHdl, IMapWindow* );
-                        DECL_LINK( GraphSizeHdl, IMapWindow* );
-                        DECL_LINK( URLModifyHdl, void* );
-                        DECL_LINK( URLLoseFocusHdl, void* );
-                        DECL_LINK(UpdateHdl, void *);
-                        DECL_LINK( TbxUpdateHdl, Timer* );
-                        DECL_LINK( StateHdl, IMapWindow* );
-                        DECL_LINK( MiscHdl, void* );
+    virtual sal_Bool    Close();
+
+    DECL_LINK( TbxClickHdl, ToolBox* );
+    DECL_LINK( InfoHdl, IMapWindow* );
+    DECL_LINK( MousePosHdl, IMapWindow* );
+    DECL_LINK( GraphSizeHdl, IMapWindow* );
+    DECL_LINK( URLModifyHdl, void* );
+    DECL_LINK( URLLoseFocusHdl, void* );
+    DECL_LINK(UpdateHdl, void *);
+    DECL_LINK( TbxUpdateHdl, Timer* );
+    DECL_LINK( StateHdl, IMapWindow* );
+    DECL_LINK( MiscHdl, void* );
 
     void                DoOpen();
-    sal_Bool                DoSave();
-
-#endif
-
+    sal_Bool            DoSave();
 
 public:
 
@@ -139,7 +133,7 @@ public:
 
     void                SetTargetList( const TargetList& rTargetList );
 
-    void                Update( const Graphic& rGraphic, const ImageMap* pImageMap = NULL,
+    void                UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap = NULL,
                                 const TargetList* pTargetList = NULL, void* pEditingObj = NULL );
 
     virtual void        KeyInput( const KeyEvent& rKEvt );

svx/source/dialog/imapdlg.cxx

@@ -41,10 +41,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/layout.hxx>
-
-#define _IMAPDLG_PRIVATE
-#include "svx/imapdlg.hxx"
-
+#include <svx/imapdlg.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
@@ -117,7 +114,7 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM
 {
     if ( SfxViewFrame::Current() &&
          SfxViewFrame::Current()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) )
-        SVXIMAPDLG()->Update( rGraphic, pImageMap, pTargetList, pEditingObj );
+        SVXIMAPDLG()->UpdateLink( rGraphic, pImageMap, pTargetList, pEditingObj );
 }
 
 SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
@@ -286,7 +283,7 @@ void SvxIMapDlg::SetTargetList( const TargetList& rTargetList )
         maCbbTarget.InsertEntry( aNewList[ i ] );
 }
 
-void SvxIMapDlg::Update( const Graphic& rGraphic, const ImageMap* pImageMap,
+void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap,
                          const TargetList* pTargetList, void* pEditingObj )
 {
     pOwnData->aUpdateGraphic = rGraphic;