sfx2/source/control/thumbnailview.cxx | 1 - sfx2/source/doc/templatedlg.cxx | 18 ++++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit 0c6d58df4c3994d485c174909d4317cb8616c067 Author: Cédric Bosdonnat <[email protected]> Date: Wed Jan 9 11:58:39 2013 +0100 Template Manager: don't deselect item after setting default template Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 80f180a..6b9a2c4 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1070,19 +1070,17 @@ void SfxTemplateManagerDlg::OnTemplateDelete () void SfxTemplateManagerDlg::OnTemplateAsDefault () { - assert(!maSelTemplates.empty()); - - const TemplateViewItem *pItem = static_cast<const TemplateViewItem*>(*(maSelTemplates.begin())); - - OUString aServiceName; - if (lcl_getServiceName(pItem->getPath(),aServiceName)) + if (!maSelTemplates.empty()) { - SfxObjectFactory::SetStandardTemplate(aServiceName,pItem->getPath()); + const TemplateViewItem *pItem = static_cast<const TemplateViewItem*>(*(maSelTemplates.begin())); - createDefaultTemplateMenu(); + OUString aServiceName; + if (lcl_getServiceName(pItem->getPath(),aServiceName)) + { + SfxObjectFactory::SetStandardTemplate(aServiceName,pItem->getPath()); - // clear selection and display view/action toolbars - maView->deselectOverlayItem(pItem->mnId); + createDefaultTemplateMenu(); + } } } commit 4419f2438d2d63387d6aab5dfe60b4aa3f251eb5 Author: Cédric Bosdonnat <[email protected]> Date: Wed Jan 9 10:57:44 2013 +0100 Template Manager: double click on the whole item instead of only thumbnail Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1 diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 0e47fb7..d2196eb 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -517,7 +517,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt ) maItemStateHdl.Call(pItem); Rectangle aRect(pItem->getDrawArea()); - aRect.SetSize(Size(mnItemWidth,mnThumbnailHeight)); if (aRect.IsInside(rMEvt.GetPosPixel())) OnItemDblClicked(pItem);
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
