summaryrefslogtreecommitdiff
path: root/svx/source/dialog/imapdlg.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-27 21:48:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-27 22:02:22 +0000
commit0c577b7e2adc7410a39c526caf0e5adc02543dc0 (patch)
tree9c43e122400d0565e11238a7921714ebb4ff553d /svx/source/dialog/imapdlg.cxx
parentecf04f88654c4eac0fd19f4869d72b43e553bbca (diff)
remove nasty _IMAPDLG_PRIVATE foo
and untangle orthogonal Update method names Change-Id: I3f9edb406c3e330a62f58eccf6fc23c210f3994e
Diffstat (limited to 'svx/source/dialog/imapdlg.cxx')
-rw-r--r--svx/source/dialog/imapdlg.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3cc0bb635d03..8d7425554ae4 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/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;