diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-08 13:07:11 -0430 |
|---|---|---|
| committer | Rafael Dominguez <venccsralph@gmail.com> | 2012-07-08 19:57:55 -0430 |
| commit | 7c98ed8f2673c02d3f424e56b7a6f5d887ad89f0 (patch) | |
| tree | 92da3b29a4b887f75ad23ed7f885180b3634e306 /sfx2/source | |
| parent | 77a7c92fb3c0b1a8a97bca107f6bfe85cb79f7c4 (diff) | |
Handle close overlay action in template dialog instead of folder view.
Change-Id: I1f79afff5ea8a9dec5b8534a73500224135e213b
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/templatefolderview.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatefolderview.cxx index 91f0fbb0a695..63ea12a615f1 100644 --- a/sfx2/source/control/templatefolderview.cxx +++ b/sfx2/source/control/templatefolderview.cxx @@ -287,7 +287,6 @@ TemplateFolderView::TemplateFolderView ( Window* pParent, const ResId& rResId, b mpItemView->setItemStateHdl(LINK(this,TemplateFolderView,TVTemplateStateHdl)); mpItemView->setChangeNameHdl(LINK(this,TemplateFolderView,ChangeNameHdl)); - mpItemView->setCloseHdl(LINK(this,TemplateFolderView,OverlayCloseHdl)); } TemplateFolderView::~TemplateFolderView() @@ -394,6 +393,11 @@ void TemplateFolderView::setOverlayDblClickHdl(const Link &rLink) mpItemView->setDblClickHdl(rLink); } +void TemplateFolderView::setOverlayCloseHdl(const Link &rLink) +{ + mpItemView->setCloseHdl(rLink); +} + void TemplateFolderView::filterTemplatesByApp (const FILTER_APPLICATION &eApp) { meFilterOption = eApp; @@ -690,12 +694,6 @@ IMPL_LINK(TemplateFolderView, ChangeNameHdl, TemplateView*, pView) return true; } -IMPL_LINK_NOARG(TemplateFolderView, OverlayCloseHdl) -{ - showOverlay(false); - return 0; -} - void lcl_updateThumbnails (TemplateFolderViewItem *pItem) { // Update folder thumbnails diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2b08cf2bb002..ed607da54069 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -186,6 +186,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) maView->setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVFolderStateHdl)); maView->setTemplateStateHdl(LINK(this,SfxTemplateManagerDlg,TVTemplateStateHdl)); maView->setOverlayDblClickHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl)); + maView->setOverlayCloseHdl(LINK(this,SfxTemplateManagerDlg,CloseOverlayHdl)); mpSearchView->SetSizePixel(aThumbSize); mpSearchView->setItemMaxTextLength(ITEM_MAX_TEXT_LENGTH); @@ -280,6 +281,13 @@ IMPL_LINK_NOARG (SfxTemplateManagerDlg, CloseHdl) return 0; } + +IMPL_LINK_NOARG(SfxTemplateManagerDlg, CloseOverlayHdl) +{ + maView->showOverlay(false); + return 0; +} + IMPL_LINK (SfxTemplateManagerDlg, OnClickSelectionMode, ImageButton*, pButton) { maView->setSelectionMode(pButton->GetState() == STATE_CHECK); |