From 7d620e26070fda48f91a8ebe0a088224d6d19f75 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Tue, 8 Jan 2013 15:21:51 +0100 Subject: Template Manager: fixed select template and scroll caused trouble with toolbar Selecting a template in the first row and scrolling down made some items in the toolbar disappear... Fixed this by checking if the item to update is already in the selection. Change-Id: I2ddffae3a1c6092241afcf2acd212fe07b3a65ce --- sfx2/source/doc/templatedlg.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sfx2/source/doc') diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index cfb979e2ec9c..80f180a4b923 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -502,6 +502,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVFolderStateHdl, const ThumbnailViewItem*, pIt IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const ThumbnailViewItem*, pItem) { + bool bInSelection = maSelTemplates.find(pItem) != maSelTemplates.end(); if (pItem->isSelected()) { if (!mbIsSaveMode) @@ -512,7 +513,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const ThumbnailViewItem*, p mpActionBar->Show(false); mpTemplateBar->Show(); } - else + else if (maSelTemplates.size() != 1 || !bInSelection) { mpTemplateBar->HideItem(TBI_TEMPLATE_EDIT); mpTemplateBar->HideItem(TBI_TEMPLATE_PROPERTIES); @@ -520,11 +521,12 @@ IMPL_LINK(SfxTemplateManagerDlg, TVTemplateStateHdl, const ThumbnailViewItem*, p } } - maSelTemplates.insert(pItem); + if (!bInSelection) + maSelTemplates.insert(pItem); } else { - if (maSelTemplates.find(pItem) != maSelTemplates.end()) + if (bInSelection) { maSelTemplates.erase(pItem); -- cgit