Deselect item after setting it as default template.

Change-Id: I587484f72c5751b07636339c1eb4748cbfe1ed78

5 files changed, 36 insertions, 0 deletions

diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx
index 6a1adcec7897..58fec1341ca2 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -79,6 +79,8 @@ public:
     // Check if the overlay is visible or not.
     bool isOverlayVisible () const;
 
+    void deselectOverlayItem (const sal_uInt16 nItemId);
+
     void sortOverlayItems (const boost::function<bool (const ThumbnailViewItem*,
                                                        const ThumbnailViewItem*) > &func);
 
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9a9e516efaef..7eebe5dc0514 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -221,6 +221,8 @@ public:
     bool IsItemSelected( sal_uInt16 nItemId ) const
         { return nItemId == mnSelItemId; }
 
+    void deselectItem (const sal_uInt16 nItemId);
+
     /**
      *
      * @brief unselect all current selected items.
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index 99539e06acbe..d4c92f77d219 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -85,6 +85,11 @@ bool TemplateAbstractView::isOverlayVisible () const
     return mpItemView->IsVisible();
 }
 
+void TemplateAbstractView::deselectOverlayItem(const sal_uInt16 nItemId)
+{
+    mpItemView->deselectItem(nItemId);
+}
+
 void TemplateAbstractView::sortOverlayItems(const boost::function<bool (const ThumbnailViewItem*,
                                                                         const ThumbnailViewItem*) > &func)
 {
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index ad2f5b8b1d39..905713273d5e 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1039,6 +1039,24 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
     }
 }
 
+void ThumbnailView::deselectItem(const sal_uInt16 nItemId)
+{
+    for (size_t i = 0, n = mItemList.size(); i < n; ++i)
+    {
+        if (mItemList[i]->mnId == nItemId)
+        {
+            mItemList[i]->setSelection(false);
+
+            maItemStateHdl.Call(mItemList[i]);
+
+            if (IsReallyVisible() && IsUpdateMode())
+                mItemList[i]->Paint(mpProcessor,mpItemAttrs);
+
+            break;
+        }
+    }
+}
+
 void ThumbnailView::unselectItems()
 {
     for (size_t i = 0, n = mItemList.size(); i < n; ++i)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index bf3aee6f4e20..4880f13ce20f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -906,6 +906,15 @@ void SfxTemplateManagerDlg::OnTemplateAsDefault ()
         SfxObjectFactory::SetStandardTemplate(aServiceName,pItem->getPath());
 
         createDefaultTemplateMenu();
+
+        // clear selection and display view/action toolbars
+        maView->deselectOverlayItem(pItem->mnId);
+        maSelTemplates.clear();
+
+        mpTemplateBar->SetItemDown(TBI_TEMPLATE_DEFAULT,false);
+        mpTemplateBar->Show(false);
+        mpViewBar->Show();
+        mpActionBar->Show();
     }
 }