diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-02 21:38:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-03 11:19:56 +0100 |
| commit | 696e83b663d4f3e00f23947613f9f3916a4dd14d (patch) | |
| tree | 6df0721b09e0d72920bbb4c3b7688e42e6c03075 /cui | |
| parent | f7513f0f53f2d074c08610a68fb787bb379c31d4 (diff) | |
Resolves: tdf#101795 restore hiding on end of Gtk fpicker execute
but don't hide it at the end of every RunDialog::run so that the
dialog still exists and is visible if the "sure you want to overwrite"
dialog needs to be displayed
and restore the cui options stuff to its original state as well,
undoing the earlier efforts of...
commit c1bd3156cf66318023f36d81ce809a38072588e4
Author: Caolán McNamara <caolanm@redhat.com>
Date: Thu Jul 21 21:44:06 2016 +0100
Resolves: tdf#101054 crash on options->path with non-native file picker
and
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
Change-Id: I5d6bcee9fb0a73a95cc29e8f3f2ee2aea91a135a
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optpath.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 8d332e0dd707..4f45c9787ca0 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -633,12 +633,11 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) else { short nRet = xFolderPicker->execute(); - if (nRet == ExecutableDialogResults::OK) - { - OUString sFolder(xFolderPicker->getDirectory()); - ChangeCurrentEntry(sFolder); - } - xFolderPicker.clear(); + if (ExecutableDialogResults::OK != nRet) + return; + + OUString sFolder(xFolderPicker->getDirectory()); + ChangeCurrentEntry(sFolder); } } catch( Exception& ) @@ -724,9 +723,9 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { - assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker"); if (RET_OK == pEvt->DialogResult) { + assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker"); OUString sURL = xFolderPicker->getDirectory(); ChangeCurrentEntry( sURL ); } |