diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-07 00:24:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-07 00:27:02 +0100 |
| commit | 6b6ec280f3d7f35fb9c8c8ba92a31d51ab4dca16 (patch) | |
| tree | c1d336683ebb817e321b2dd3c53a617dc4b24ee9 | |
| parent | 958616a323b7fe6b42cd642394cd90a9cd82e7f9 (diff) | |
fdo#74787, rhbz#1072553: fix Template Mananger import crash
File dialog causes call to ThumbnailView::LoseFocus() and clears
selected folders.
(regression from 0314034d8b23d5b69399cfcdf6b2f2add73f9f47)
Change-Id: Ic5f2602e9dd1d12aad8c68c48f6bbb119ee6492c
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a853a33bd12a..2741d71c85d0 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -901,6 +901,9 @@ 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 ) @@ -909,11 +912,11 @@ void SfxTemplateManagerDlg::OnTemplateImport () if (aFiles.hasElements()) { - if (!maSelFolders.empty()) + if (!selFolders.empty()) { //Import to the selected regions std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter; - for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter) + for (pIter = selFolders.begin(); pIter != selFolders.end(); ++pIter) { OUString aTemplateList; TemplateContainerItem *pFolder = (TemplateContainerItem*)(*pIter); |