[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 3 commits - sfx2/source

[Rafael Dominguez]

 sfx2/source/control/templateviewitem.cxx |    3 ---
 sfx2/source/doc/templatedlg.cxx          |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f65e00653bca4b7320981c8bc69da0b991d1df2b
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Thu Mar 28 14:50:24 2013 -0430

    Calculate template thumbnail subtitle position to fit drawing area.
    
    Change-Id: Ieaf067f5182c9dc690d028cdc6ba5bc28ac8436f
    Reviewed-on: https://gerrit.libreoffice.org/3252
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 94ce4d3..d68268b 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -55,9 +55,6 @@ void TemplateViewItem::calculateItemsPosition(const long nThumbnailHeight, const
 
         long nSpace = (nDisplayHeight + nPadding - 2*aTextDev.getTextHeight()) / 3;
 
-        // Set title position
-        maTextPos.setY(maDrawArea.getY() + nThumbnailHeight + nPadding + nSpace + aTextDev.getTextHeight());
-
         // Set subtitle position
         maSubTitlePos.setY(maTextPos.getY() + nSpace + aTextDev.getTextHeight());
         maSubTitlePos.setX(maDrawArea.Left() +
commit e4c4693f8aa2a455c5c24be7d5acb9f9c70dd515
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Thu Mar 28 14:49:49 2013 -0430

    Deselect items when searching for templates to reset toolbars.
    
    Change-Id: I762762f5684287d06a046aca6d7160bce10e3653
    Reviewed-on: https://gerrit.libreoffice.org/3251
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0fdb87f..05dd022 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -687,6 +687,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
         // if the search view is hidden, hide the folder view and display search one
         if (!mpSearchView->IsVisible())
         {
+            mpCurView->deselectItems();
             mpSearchView->Show();
             mpCurView->Hide();
         }
commit f8a2a17b8914c8753a2f2efe115b9eecfdf9d933
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Thu Mar 28 00:19:59 2013 -0430

    Deselect templates when closing the search view.
    
    Change-Id: If187b154a023a9364b6775270ce4c24377a98524
    Reviewed-on: https://gerrit.libreoffice.org/3250
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 46270ff..0fdb87f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1046,6 +1046,7 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
     // Hide search view
     if (bVisible)
     {
+        mpSearchView->deselectItems();
         mpSearchView->Hide();
         mpCurView->Show();
     }