diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-05 10:16:51 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-07-13 21:15:33 +0200 |
| commit | fbedd668d877d0c8194e5a80ac0336643e36064f (patch) | |
| tree | 0d0a3a8d46bf7fee827783f4473a6e9f3f1e6edf /cui | |
| parent | 6adddbfb6b0fd9e0348546114f9dd2d035c1be3f (diff) | |
Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker
(cherry picked from commit 3bbc0574d78d129359638b74612de2f93419eeb0)
Reviewed-on: https://gerrit.libreoffice.org/26942
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit bab5387447d2ea386b49367fe373b124a57c5ce6)
Change-Id: I5133f63fd92f384221fa2812c6e2a0e7f3b37ac1
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optpath.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index b07ce78940dd..a4122a903641 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -635,11 +635,12 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) else { short nRet = xFolderPicker->execute(); - if ( ExecutableDialogResults::OK != nRet ) - return; - - OUString sFolder( xFolderPicker->getDirectory() ); - ChangeCurrentEntry( sFolder ); + if (nRet == ExecutableDialogResults::OK) + { + OUString sFolder(xFolderPicker->getDirectory()); + ChangeCurrentEntry(sFolder); + } + xFolderPicker.clear(); } } catch( Exception& ) @@ -723,19 +724,17 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } } - IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { - if ( RET_OK == pEvt->DialogResult ) + assert(xFolderPicker.is() && "SvxPathTabPage::DialogClosedHdl(): no folder picker"); + if (RET_OK == pEvt->DialogResult) { - DBG_ASSERT( xFolderPicker.is(), "SvxPathTabPage::DialogClosedHdl(): no folder picker" ); - OUString sURL = xFolderPicker->getDirectory(); ChangeCurrentEntry( sURL ); } + xFolderPicker.clear(); } - void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) |