vcl/source/window/dialog.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 3f4b0788ba688dbdf7d4487b7ef83edc7e81c1e8
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Mon Jan 22 09:34:47 2018 +0300
tdf#32935 tdf#49134 tdf#114466 Activate newly opened modal dialogs
... based on ForceFocusAndToFront setting
Change-Id: Ic76faa082f433d5a0150e49c30d7eda3c6c24c5f
Reviewed-on: https://gerrit.libreoffice.org/48287
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/49214
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4db7c9674a83..13c8cf491b8e 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>
@@ -838,7 +839,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
