summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-01-08 15:21:51 +0100
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-01-08 15:29:05 +0100
commit7d792f39b2ca40511544c8a61d7d7f6acdd48bcf (patch)
treec310a20cf0a84825afdc8ac0799f4d46b236f189
parent908bcce46c54e999916b32dffef34d34f21878d4 (diff)
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
-rw-r--r--sfx2/source/doc/templatedlg.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 26cf58bf8f12..282372d2ca89 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -501,6 +501,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)
@@ -511,7 +512,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);
@@ -519,11 +520,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);