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

[Rafael Dominguez]

 sfx2/source/doc/templatedlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ed5525620852afabbe1a36f84ea65a025c11c146
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Wed Mar 27 12:54:37 2013 -0430

    Get the correct region id view when saving a template.
    
    Change-Id: If3a75fa2d64dd1c912bfa9a7f3ea96e5fd80e594
    Reviewed-on: https://gerrit.libreoffice.org/3243
    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 6077c8a..825147a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1162,7 +1162,7 @@ void SfxTemplateManagerDlg::OnTemplateSaveAs()
 
             if (maView->isNonRootRegionVisible())
             {
-                sal_uInt16 nRegionItemId = maView->getCurRegionId()+1;
+                sal_uInt16 nRegionItemId = maView->getRegionId(maView->getCurRegionId()-1);
 
                 if (!maView->isTemplateNameUnique(nRegionItemId,aName))
                 {
commit 20852314029ab9f910b8464dbd9d4936f5a71691
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Wed Mar 27 00:09:18 2013 -0430

    Fix moving selected search results in Template Manager.
    
    Change-Id: I577f7cc9f56f5309cd6ebccdc73b4072a4ee91a3
    Reviewed-on: https://gerrit.libreoffice.org/3242
    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 f757623..6077c8a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1418,7 +1418,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId)
             const TemplateSearchViewItem *pItem =
                     static_cast<const TemplateSearchViewItem*>(*aIter);
 
-            if(!maView->moveTemplate(pItem,pItem->mnRegionId+1,nItemId))
+            if(!maView->moveTemplate(pItem,pItem->mnRegionId,nItemId))
             {
                 if (aTemplateList.isEmpty())
                     aTemplateList = (*aIter)->maTitle;
commit b18fe7068491d0d30544b369df966e98da527d8d
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Tue Mar 26 23:42:11 2013 -0430

    Fix exporting selected search results in Template Manager.
    
    Change-Id: I60e517807fec797a99d2f182e41731d515d30dcc
    Reviewed-on: https://gerrit.libreoffice.org/3241
    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 f5d5bd6..f757623 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -896,7 +896,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
 
                 OUString aPath = aPathObj.GetMainURL( INetURLObject::NO_DECODE );
 
-                if (!maView->exportTo(pItem->mnDocId,pItem->mnRegionId+1,aPath))
+                if (!maView->exportTo(pItem->mnAssocId,pItem->mnRegionId,aPath))
                 {
                     if (aTemplateList.isEmpty())
                         aTemplateList = pItem->maTitle;