diff options
| -rw-r--r-- | include/svx/imapdlg.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/view/imapwrap.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/view/imapwrap.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh9.cxx | 7 | ||||
| -rw-r--r-- | svx/source/dialog/imapdlg.cxx | 10 |
5 files changed, 14 insertions, 23 deletions
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index d4bbb7a1b9e5..7c288fed577a 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -155,13 +155,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; -inline SvxIMapDlg* SVXIMAPDLG() -{ - SfxChildWindow* pWnd = NULL; - if (SfxViewFrame::Current() && SfxViewFrame::Current()->HasChildWindow(SvxIMapDlgChildWindow::GetChildWindowId())) - pWnd = SfxViewFrame::Current()->GetChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); - return pWnd ? static_cast<SvxIMapDlg*>(pWnd->GetWindow()) : NULL; -} +SVX_DLLPUBLIC SvxIMapDlg* GetIMapDlg(); #endif // INCLUDED_SVX_IMAPDLG_HXX diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index ee2c8f8e0549..423fb2314a60 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -27,16 +27,6 @@ sal_uInt16 ScIMapChildWindowId() return SvxIMapDlgChildWindow::GetChildWindowId(); } -SvxIMapDlg* ScGetIMapDlg() -{ - //! pass view frame here and in SVXIMAPDLG() - SfxViewFrame* pViewFrm = SfxViewFrame::Current(); - if (pViewFrm && pViewFrm->HasChildWindow(SvxIMapDlgChildWindow::GetChildWindowId())) - return SVXIMAPDLG(); - else - return NULL; -} - void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ) { diff --git a/sc/source/ui/view/imapwrap.hxx b/sc/source/ui/view/imapwrap.hxx index 592f1c74a5ac..c3733f5c8158 100644 --- a/sc/source/ui/view/imapwrap.hxx +++ b/sc/source/ui/view/imapwrap.hxx @@ -28,8 +28,6 @@ class Graphic; class ImageMap; class SvxIMapDlg; -SvxIMapDlg * ScGetIMapDlg(); - sal_uInt16 ScIMapChildWindowId(); ImageMap const & ScIMapDlgGetMap(SvxIMapDlg * pDlg); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 6cfbc9656b86..07dd2e13c3d5 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <svx/imapdlg.hxx> #include <svx/svdmark.hxx> #include <svx/svdview.hxx> #include <svx/gallery.hxx> @@ -106,7 +107,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pThisFrame->HasChildWindow( nId ) ) { - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SvxIMapDlg* pDlg = GetIMapDlg(); if ( pDlg ) { SdrView* pDrView = GetSdrView(); @@ -131,7 +132,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pMark ) { SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SvxIMapDlg* pDlg = GetIMapDlg(); if ( ScIMapDlgGetObj(pDlg) == (void*) pSdrObj ) { @@ -192,7 +193,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); if ( rMarkList.GetMarkCount() == 1 ) - if ( ScIMapDlgGetObj(ScGetIMapDlg()) == + if ( ScIMapDlgGetObj(GetIMapDlg()) == (void*) rMarkList.GetMark(0)->GetMarkedSdrObj() ) bDisable = false; } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 0ac7de5d3951..657e4691628e 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -109,7 +109,7 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16 void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ) { - SvxIMapDlg* pDlg = SVXIMAPDLG(); + SvxIMapDlg* pDlg = GetIMapDlg(); if (pDlg) pDlg->UpdateLink(rGraphic, pImageMap, pTargetList, pEditingObj); } @@ -773,4 +773,12 @@ IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl) return 0L; } +SvxIMapDlg* GetIMapDlg() +{ + SfxChildWindow* pWnd = NULL; + if (SfxViewFrame::Current() && SfxViewFrame::Current()->HasChildWindow(SvxIMapDlgChildWindow::GetChildWindowId())) + pWnd = SfxViewFrame::Current()->GetChildWindow(SvxIMapDlgChildWindow::GetChildWindowId()); + return pWnd ? static_cast<SvxIMapDlg*>(pWnd->GetWindow()) : NULL; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |