Fix moving templates between folders.

Change-Id: I1befe0add1bdff518c4553a8116d4fed235fd1b8

1 files changed, 4 insertions, 3 deletions

diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatefolderview.cxx
index 4f394288f315..022fb47cf6ea 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -519,17 +519,18 @@ bool TemplateFolderView::moveTemplates(std::set<const ThumbnailViewItem *> &rIte
         std::set<const ThumbnailViewItem*>::iterator aSelIter;
         for ( aSelIter = rItems.begin(); aSelIter != rItems.end(); ++aSelIter )
         {
+            const TemplateViewItem *pViewItem = static_cast<const TemplateViewItem*>(*aSelIter);
+
             sal_uInt16 nTargetRegion = pTarget->mnId-1;
-            sal_uInt16 nTargetIdx = pTarget->maTemplates.back()->mnId; // Last Assigned in filesystem is mnId-1
+            sal_uInt16 nTargetIdx = mpDocTemplates->GetCount(nTargetRegion);    // Next Idx
 
-            if (!mpDocTemplates->Move(nTargetRegion,nTargetIdx,mpItemView->getRegionId(),(*aSelIter)->mnId-1))
+            if (!mpDocTemplates->Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnId-1))
             {
                 ret = false;
                 continue;
             }
 
             // move template to destination
-            const TemplateViewItem *pViewItem = static_cast<const TemplateViewItem*>(*aSelIter);
 
             TemplateViewItem *pTemplateItem = new TemplateViewItem(*mpItemView,mpItemView);
             pTemplateItem->mnId = nTargetIdx + 1;