diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-10-31 14:53:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-01 17:11:17 +0100 |
| commit | fabaabbd01c84cbdea465382e42387a452b54046 (patch) | |
| tree | 29f597f61a9afc6d5fbb2f7e14c1a50cc491ea0d /sfx2 | |
| parent | 6e81dad4c2b23017cb0c996a4ab9a81e24fab16f (diff) | |
use officecfg for UseSystemFileDialog
Change-Id: I1419af229a67d6ebb1cf2c63757656beb3f512db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105142
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index a23b2888b747..84d169cf708a 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -28,7 +28,6 @@ #include <sfx2/app.hxx> #include <osl/mutex.hxx> #include <svtools/imagemgr.hxx> -#include <svtools/miscopt.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> @@ -53,6 +52,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/extract.hxx> +#include <officecfg/Office/Common.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <osl/file.hxx> @@ -175,7 +175,7 @@ ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > & rxC m_xContext( rxContext ), m_bInitialized( false ) { - m_bSystemDialogs = SvtMiscOptions().UseSystemFileDialog(); + m_bSystemDialogs = officecfg::Office::Common::Misc::UseSystemFileDialog::get(); } ShutdownIcon::~ShutdownIcon() @@ -276,7 +276,7 @@ void ShutdownIcon::StartFileDialog() { ::SolarMutexGuard aGuard; - bool bDirty = ( m_bSystemDialogs != SvtMiscOptions().UseSystemFileDialog() ); + bool bDirty = ( m_bSystemDialogs != officecfg::Office::Common::Misc::UseSystemFileDialog::get() ); if ( m_pFileDlg && bDirty ) { @@ -419,7 +419,7 @@ IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, vo // This fix is dependent on the dialog settings. Destroying the dialog here will // crash the non-native dialog implementation! Therefore make this dependent on // the settings. - if ( SvtMiscOptions().UseSystemFileDialog() ) + if ( officecfg::Office::Common::Misc::UseSystemFileDialog::get() ) { m_pFileDlg.reset(); } |