Handle close overlay action in template dialog instead of folder view.

Change-Id: I1f79afff5ea8a9dec5b8534a73500224135e213b

4 files changed, 16 insertions, 9 deletions

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx b/sfx2/inc/sfx2/templatefolderview.hxx
index af1296268378..e3187c41b95c 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -48,6 +48,8 @@ public:
 
     void setOverlayDblClickHdl (const Link &rLink);
 
+    void setOverlayCloseHdl (const Link &rLink);
+
     void filterTemplatesByApp (const FILTER_APPLICATION &eApp);
 
     std::vector<TemplateItemProperties>
@@ -78,8 +80,6 @@ private:
 
     DECL_LINK(ChangeNameHdl, TemplateView*);
 
-    DECL_LINK(OverlayCloseHdl, void*);
-
 private:
 
     bool mbFilteredResults;     // Flag keep track if overlay has been filtered so folders can get filtered too afterwards
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 7b528ae372d5..9c5abfb5a8ee 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -48,6 +48,7 @@ private:
     virtual void MouseButtonDown( const MouseEvent& rMEvt );
 
     DECL_LINK(CloseHdl, void*);
+    DECL_LINK(CloseOverlayHdl, void*);
 
     DECL_LINK(OnClickSelectionMode, ImageButton*);
 
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);