diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 21:44:06 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-22 08:47:50 +0000 |
| commit | 354c148edce5cafa1efb136630618f3063ce3c99 (patch) | |
| tree | c55505f8222b411ac70b22f7cd233e5e6c281e5a | |
| parent | 836a7634b2042de4f08fcc2296fc33ca2d040a60 (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/27418
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | cui/source/options/optpath.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5a0a87e69ae7..3001d12b17e2 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -711,7 +711,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void OUString sURL = xFolderPicker->getDirectory(); ChangeCurrentEntry( sURL ); } - xFolderPicker.clear(); } void SvxPathTabPage::GetPathList( |