Filter overlay templates by a search keyword.

Change-Id: I8bcb193d1400c32b6292fd109422d22dbf8b1eb9

2 files changed, 46 insertions, 19 deletions

diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index fbe2378f4298..0554c9d58ba8 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -49,6 +49,13 @@ bool ViewFilter_Application::operator () (const ThumbnailViewItem *pItem)
     return true;
 }
 
+bool ViewFilter_Keyword::operator ()(const ThumbnailViewItem *pItem)
+{
+    assert(pItem);
+
+    return pItem->maTitle.matchIgnoreAsciiCase(maKeyword);
+}
+
 TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren)
     : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren),
       mpItemView(new TemplateView(this))
@@ -84,6 +91,12 @@ void TemplateAbstractView::sortOverlayItems(const boost::function<bool (const Th
     mpItemView->sortItems(func);
 }
 
+void TemplateAbstractView::filterTemplatesByKeyword(const OUString &rKeyword)
+{
+    if (mpItemView->IsVisible())
+        mpItemView->filterItems(ViewFilter_Keyword(rKeyword));
+}
+
 void TemplateAbstractView::setOverlayDblClickHdl(const Link &rLink)
 {
     mpItemView->setDblClickHdl(rLink);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d3eff745ded9..9982f5d51556 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -624,7 +624,7 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
 IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 {
     // if the search view is hidden, hide the folder view and display search one
-    if (!mpSearchView->IsVisible())
+    if (!mpCurView->isOverlayVisible() && !mpSearchView->IsVisible())
     {
         mpSearchView->Clear();
         mpSearchView->Show();
@@ -635,30 +635,44 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 
     if (!aKeyword.isEmpty())
     {
-        mpSearchView->Clear();
-
-        std::vector<TemplateItemProperties> aItems =
-                maView->getFilteredItems(SearchView_Keyword(aKeyword));
-
-        size_t nCounter = 0;
-        for (size_t i = 0; i < aItems.size(); ++i)
+        if (mpCurView->isOverlayVisible())
         {
-            TemplateItemProperties *pItem = &aItems[i];
-
-            mpSearchView->AppendItem(++nCounter,pItem->nRegionId,
-                                     pItem->nId-1,
-                                     pItem->aName,
-                                     maView->GetItemText(pItem->nRegionId+1),
-                                     pItem->aPath,
-                                     pItem->aThumbnail);
+            mpCurView->filterTemplatesByKeyword(aKeyword);
         }
+        else
+        {
+            mpSearchView->Clear();
+
+            std::vector<TemplateItemProperties> aItems =
+                    maView->getFilteredItems(SearchView_Keyword(aKeyword));
+
+            size_t nCounter = 0;
+            for (size_t i = 0; i < aItems.size(); ++i)
+            {
+                TemplateItemProperties *pItem = &aItems[i];
+
+                mpSearchView->AppendItem(++nCounter,pItem->nRegionId,
+                                         pItem->nId-1,
+                                         pItem->aName,
+                                         maView->GetItemText(pItem->nRegionId+1),
+                                         pItem->aPath,
+                                         pItem->aThumbnail);
+            }
 
-        mpSearchView->Invalidate();
+            mpSearchView->Invalidate();
+        }
     }
     else
     {
-        mpSearchView->Hide();
-        mpCurView->Show();
+        if (mpCurView->isOverlayVisible())
+        {
+            mpCurView->filterTemplatesByApp(FILTER_APP_NONE);
+        }
+        else
+        {
+            mpSearchView->Hide();
+            mpCurView->Show();
+        }
     }
 
     return 0;