diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 21:44:06 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-02 16:46:44 +0300 |
| commit | bbdf2c1be0a87309c2eaa6c711027e7c2f8bd8d6 (patch) | |
| tree | 068a343949b54924de17de17283c0ed14565991c | |
| parent | 0fe585a223aa709b947fbcae04282f7cd9e9277b (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/27420
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>
(cherry picked from commit ce43440dd910c2ff27e95db3009752cfb2b608e3)
| -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( |