summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-03-07 10:17:54 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-03-07 10:24:26 +0100
commit6235a7261b7a763cbce4e3b2ffd93921008acb02 (patch)
tree0f43f41f3880b74c1acc80ac305d858f55f0f732 /sfx2
parentfa173ce679235e3a8378ccffcff5d767f97375b2 (diff)
Revert "fdo#74787, rhbz#1072553: fix Template Mananger import crash"
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/templatedlg.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index fc198b0ca61a..7551c958dfad 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -901,9 +901,6 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
aFileDlg.AddFilter( sFilterName, sFilterExt );
aFileDlg.SetCurrentFilter( sFilterName );
- // fdo#74787 file dialog causes ThumbnailView::LoseFocus() - save selection
- std::set<const ThumbnailViewItem*,selection_cmp_fn> selFolders(maSelFolders);
-
ErrCode nCode = aFileDlg.Execute();
if ( nCode == ERRCODE_NONE )
@@ -912,11 +909,11 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
if (aFiles.hasElements())
{
- if (!selFolders.empty())
+ if (!maSelFolders.empty())
{
//Import to the selected regions
std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter;
- for (pIter = selFolders.begin(); pIter != selFolders.end(); ++pIter)
+ for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter)
{
OUString aTemplateList;
TemplateContainerItem *pFolder = (TemplateContainerItem*)(*pIter);