[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - 2 commits - framework/source officecfg/registry

[Samuel Mehrbrodt]

 framework/source/loadenv/loadenv.cxx                     |    2 +-
 officecfg/registry/data/org/openoffice/Office/Common.xcu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 70d7aff88124dce45e8dc7ae7a3f6c5c74161a57
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Jan 13 15:27:41 2017 +0100

    tdf#96011 Document is not focused when opening a second window
    
    This reverts commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54.

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index ffca153..1889d3f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -27,7 +27,7 @@
     </node>
     <node oor:name="NewDocumentHandling">
       <prop oor:name="ForceFocusAndToFront">
-        <value install:module="wnt">false</value>
+        <value install:module="wnt">true</value>
       </prop>
     </node>
     <node oor:name="Localisation">
commit a5aa8b32e808f458be262d6532b7451861dcac13
Author: Mark Hung <marklh9 at gmail.com>
Date:   Sat Apr 9 23:45:28 2016 +0800

    tdf#48300 bring window to top and restore window when minimized.
    
    While XWindow->ToTop() in Linux do the both for default ( None ),
    ToTopFlags::RestoreWhenMin has to be specified in Windows in order
    to restore the window, and ToTopFlags::ForegroundTask is necessary
    when ToTopFlags::RestoreWhenMin is specified in order to bring
    non-minimized window to the front.
    
    Change-Id: Ief4a825a18d874a0c35211c9022a4261da6bcf8f
    Reviewed-on: https://gerrit.libreoffice.org/23938
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 4261971..ab4010f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1665,7 +1665,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
         }
 
         if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
-            pWindow->ToTop();
+            pWindow->ToTop( ToTopFlags::RestoreWhenMin | ToTopFlags::ForegroundTask );
         else
             pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
     }