mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove nasty _IMAPDLG_PRIVATE foo

Browse Source 
and untangle orthogonal Update method names

Change-Id: I3f9edb406c3e330a62f58eccf6fc23c210f3994e
This commit is contained in:
Caolán McNamara
2013-12-27 21:48:58 +00:00
parent ecf04f8865
commit 0c577b7e2a
2 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/svx/imapdlg.hxx
View File

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

9
svx/source/dialog/imapdlg.cxx
View File

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