Add template region source as an argument to removeTemplate method.

- Update OnTemplateDelete to reflect changes.

Change-Id: Idd8f39d490168c5c826b0c917c8e0c3e3b78c694

3 files changed, 5 insertions, 6 deletions

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx b/sfx2/inc/sfx2/templatefolderview.hxx
index e11d524e8615..5d23b9feea71 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -53,7 +53,7 @@ public:
 
     bool removeRegion (const sal_uInt16 nItemId);
 
-    bool removeTemplate (const sal_uInt16 nItemId);
+    bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId);
 
     bool moveTemplate (const ThumbnailViewItem* pItem, const sal_uInt16 nSrcItem,
                        const sal_uInt16 nTargetItem, bool bCopy);
diff --git a/sfx2/source/control/templatefolderview.cxx b/sfx2/source/control/templatefolderview.cxx
index 117899f39824..5521962dbe42 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -457,10 +457,9 @@ bool TemplateFolderView::removeRegion(const sal_uInt16 nItemId)
     return true;
 }
 
-bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId)
+bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 nSrcItemId)
 {
-    sal_uInt16 nRegionId = mpItemView->getId();
-    sal_uInt16 nItemRegionId = nRegionId + 1;
+    sal_uInt16 nRegionId = nSrcItemId - 1;
     sal_uInt16 nTemplateId = nItemId - 1;
 
     if (!mpDocTemplates->Delete(nRegionId,nTemplateId))
@@ -468,7 +467,7 @@ bool TemplateFolderView::removeTemplate (const sal_uInt16 nItemId)
 
     for (size_t i = 0, n = mItemList.size(); i < n; ++i)
     {
-        if (mItemList[i]->mnId == nItemRegionId)
+        if (mItemList[i]->mnId == nSrcItemId)
         {
 
             TemplateFolderViewItem *pItem = static_cast<TemplateFolderViewItem*>(mItemList[i]);
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 5011e8ae418c..bdf48b3cd26d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -768,7 +768,7 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
     std::set<const ThumbnailViewItem*>::const_iterator pIter;
     for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
     {
-        if (maView->removeTemplate((*pIter)->mnId))
+        if (maView->removeTemplate((*pIter)->mnId,maView->getOverlayRegionId()+1))
             maSelTemplates.erase(pIter++);
         else
             ++pIter;