diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-22 09:34:47 +0300 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-01-30 09:33:36 +0100 |
| commit | 5943ef41a382d2c9ce42ff25ab67530193023334 (patch) | |
| tree | 609df3c72243ac917e91ca2f5dc57d79062eab99 | |
| parent | c8af37defb835827c127c4dab732fca351cd74d2 (diff) | |
... based on ForceFocusAndToFront setting
Change-Id: Ic76faa082f433d5a0150e49c30d7eda3c6c24c5f
Reviewed-on: https://gerrit.libreoffice.org/48287
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/48884
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | vcl/source/window/dialog.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index bf975b465cbb..7bede952a16e 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> +#include <officecfg/Office/Common.hxx> #include <osl/file.hxx> #include <tools/debug.hxx> @@ -847,7 +848,11 @@ bool Dialog::ImplStartExecuteModal() // FIXME: no layouting, workaround some clipping issues ImplAdjustNWFSizes(); - Show(); + css::uno::Reference< css::uno::XComponentContext > xContext( + comphelper::getProcessComponentContext()); + bool bForceFocusAndToFront(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext)); + ShowFlags showFlags = bForceFocusAndToFront ? ShowFlags::ForegroundTask : ShowFlags::NONE; + Show(true, showFlags); pSVData->maAppData.mnModalMode++; return true; |