summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-21 21:44:06 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2016-07-26 09:19:07 +0000
commitdb8dfd15c09d57cfadc4181371818878a34fc881 (patch)
tree9a0315dd4fb8c7032be4b6821726299c151e7e90
parent533fdf7a3eeab1c335690687f85333708051558f (diff)
Resolves: tdf#101054 crash on options->path with non-native file picker
regression from... commit 3bbc0574d78d129359638b74612de2f93419eeb0 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jul 5 10:16:51 2016 +0100 Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker only clear the xFolderPicker immediately in the non-async case Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf (cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4) Reviewed-on: https://gerrit.libreoffice.org/27419 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--cui/source/options/optpath.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7c2de67e7bb6..6aa346659ccf 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -730,7 +730,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void
OUString sURL = xFolderPicker->getDirectory();
ChangeCurrentEntry( sURL );
}
- xFolderPicker.clear();
}
void SvxPathTabPage::GetPathList(