diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index b5e48d861be6..284b38fd30f7 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -109,6 +109,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow sal_uInt16 mnActiveId; sal_uInt16 mnMacroId; sal_uInt16 mnPropertyId; + sal_uInt16 mnCloseId; Size aLastSize; VclPtr pIMapWnd; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 37eb9297413a..569210dc51d4 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -121,14 +121,15 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window , aIMapItem(*this, *_pBindings) { get(m_pTbxIMapDlg1, "toolbar"); - m_pTbxIMapDlg1->InsertSeparator(3, 5); - m_pTbxIMapDlg1->InsertSeparator(9, 5); - m_pTbxIMapDlg1->InsertSeparator(14, 5); - m_pTbxIMapDlg1->InsertSeparator(17, 5); + m_pTbxIMapDlg1->InsertSeparator(4, 5); + m_pTbxIMapDlg1->InsertSeparator(10, 5); + m_pTbxIMapDlg1->InsertSeparator(15, 5); + m_pTbxIMapDlg1->InsertSeparator(18, 5); mnApplyId = m_pTbxIMapDlg1->GetItemId("TBI_APPLY"); mnOpenId = m_pTbxIMapDlg1->GetItemId("TBI_OPEN"); mnSaveAsId = m_pTbxIMapDlg1->GetItemId("TBI_SAVEAS"); + mnCloseId = m_pTbxIMapDlg1->GetItemId("TBI_CLOSE"); mnSelectId = m_pTbxIMapDlg1->GetItemId("TBI_SELECT"); mnRectId = m_pTbxIMapDlg1->GetItemId("TBI_RECT"); mnCircleId = m_pTbxIMapDlg1->GetItemId("TBI_CIRCLE"); @@ -344,6 +345,11 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) DoOpen(); else if(nNewItemId == mnSaveAsId) DoSave(); + else if(nNewItemId == mnCloseId) + { + SvxIMapDlg* pDlg = GetIMapDlg(); + pDlg->Close(); + } else if(nNewItemId == mnSelectId) { SetActiveTool( nNewItemId ); diff --git a/svx/uiconfig/ui/imapdialog.ui b/svx/uiconfig/ui/imapdialog.ui index 45be1786aee8..a26e3afdad51 100644 --- a/svx/uiconfig/ui/imapdialog.ui +++ b/svx/uiconfig/ui/imapdialog.ui @@ -67,6 +67,20 @@ True + + + False + True + False + start + TBI_CLOSE + Close + + + False + True + + False