3 files changed, 94 insertions, 6 deletions

diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index eb725ba4c1fb..8287cad62388 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -144,6 +144,32 @@ TemplateAbstractView::~TemplateAbstractView ()
 {
 }
 
+void TemplateAbstractView::insertItem(const TemplateItemProperties &rTemplate)
+{
+    const TemplateItemProperties *pCur = &rTemplate;
+
+    TemplateViewItem *pChild = new TemplateViewItem(*this);
+    pChild->mnId = pCur->nId;
+    pChild->mnDocId = pCur->nDocId;
+    pChild->mnRegionId = pCur->nRegionId;
+    pChild->maTitle = pCur->aName;
+    pChild->setPath(pCur->aPath);
+    pChild->maPreview1 = pCur->aThumbnail;
+
+    if ( pCur->aThumbnail.IsEmpty() )
+    {
+        // Use the default thumbnail if we have nothing else
+        pChild->maPreview1 = TemplateAbstractView::getDefaultThumbnail(pCur->aPath);
+    }
+
+    pChild->setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
+
+    mItemList.push_back(pChild);
+
+    CalculateItemPositions();
+    Invalidate();
+}
+
 void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> &rTemplates)
 {
     std::vector<ThumbnailViewItem*> aItems(rTemplates.size());
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index a73fa23ce3b9..b6fcc50b44d0 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -590,6 +590,42 @@ bool TemplateLocalView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx
     return false;
 }
 
+bool TemplateLocalView::copyFrom(const OUString &rPath)
+{
+    assert(mnCurRegionId);
+
+    TemplateContainerItem *pRegItem = maRegions[mnCurRegionId-1];
+
+    sal_uInt16 nId = getNextItemId();
+    sal_uInt16 nDocId = 0;
+    sal_uInt16 nRegionId = pRegItem->mnRegionId;
+
+    String aPath(rPath);
+
+    if (!pRegItem->maTemplates.empty())
+        nDocId = (pRegItem->maTemplates.back()).nDocId+1;
+
+    if (!mpDocTemplates->CopyFrom(nRegionId,nDocId,aPath))
+        return false;
+
+    TemplateItemProperties aTemplate;
+    aTemplate.aIsFolder = false;
+    aTemplate.nId = nId;
+    aTemplate.nDocId = nDocId;
+    aTemplate.nRegionId = nRegionId;
+    aTemplate.aName = aPath;
+    aTemplate.aThumbnail = TemplateAbstractView::fetchThumbnail(rPath,
+                                                                TEMPLATE_THUMBNAIL_MAX_WIDTH,
+                                                                TEMPLATE_THUMBNAIL_MAX_HEIGHT);
+    aTemplate.aPath = rPath;
+
+    pRegItem->maTemplates.push_back(aTemplate);
+
+    insertItem(aTemplate);
+
+    return true;
+}
+
 bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath)
 {
     sal_uInt16 nId = 1;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 48ed3fd014a2..b9502af86bc6 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -884,15 +884,41 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 
         if (aFiles.hasElements())
         {
-            std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
-            for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
+            if (!maSelFolders.empty())
             {
-                OUString aTemplateList;
-                TemplateContainerItem *pFolder = (TemplateContainerItem*)(*pIter);
+                //Import to the selected regions
+                std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
+                for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
+                {
+                    OUString aTemplateList;
+                    TemplateContainerItem *pFolder = (TemplateContainerItem*)(*pIter);
+
+                    for (size_t i = 0, n = aFiles.getLength(); i < n; ++i)
+                    {
+                        if(!maView->copyFrom(pFolder,aFiles[i]))
+                        {
+                            if (aTemplateList.isEmpty())
+                                aTemplateList = aFiles[i];
+                            else
+                                aTemplateList = aTemplateList + "\n" + aFiles[i];
+                        }
+                    }
 
+                    if (!aTemplateList.isEmpty())
+                    {
+                        OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString());
+                        aMsg = aMsg.replaceFirst("$1",pFolder->maTitle);
+                        ErrorBox(this,WB_OK,aMsg.replaceFirst("$2",aTemplateList));
+                    }
+                }
+            }
+            else
+            {
+                //Import to current region
+                OUString aTemplateList;
                 for (size_t i = 0, n = aFiles.getLength(); i < n; ++i)
                 {
-                    if(!maView->copyFrom(pFolder,aFiles[i]))
+                    if(!maView->copyFrom(aFiles[i]))
                     {
                         if (aTemplateList.isEmpty())
                             aTemplateList = aFiles[i];
@@ -904,7 +930,7 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
                 if (!aTemplateList.isEmpty())
                 {
                     OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString());
-                    aMsg = aMsg.replaceFirst("$1",pFolder->maTitle);
+                    aMsg = aMsg.replaceFirst("$1",maView->getCurRegionName());
                     ErrorBox(this,WB_OK,aMsg.replaceFirst("$2",aTemplateList));
                 }
             }