[Libreoffice-commits] core.git: framework/source

[Tor Lillqvist]

 framework/source/helper/persistentwindowstate.cxx |    4 ++++
 framework/source/loadenv/loadenv.cxx              |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 882d27fce20ee0537f785a619be1dd065ea6bbca
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 9 14:14:22 2016 +0200

    tdf#97435: Avoid persistent window state crack when headless
    
    Change-Id: Icab7dea3cf63f3932b7759acec339b498a8ac9c5
    Reviewed-on: https://gerrit.libreoffice.org/22233
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 12bf95d..5cfd0435 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -77,6 +77,10 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u
 void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
+    // We don't want to do this stuff when in headless mode
+    if( Application::IsHeadlessModeEnabled() )
+        return;
+
     css::uno::Reference< css::uno::XComponentContext >     xContext;
     css::uno::Reference< css::frame::XFrame >              xFrame;
     bool                                               bRestoreWindowState;
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 323926a..5f2f95a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1724,7 +1724,11 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
         // and apply it on the window.
         // Do nothing, if no configuration entry exists!
         OUString sWindowState;
-        ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState;
+
+        // Don't look for persistent window attributes in headless mode
+        if( !Application::IsHeadlessModeEnabled() )
+            comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState;
+
         if (!sWindowState.isEmpty())
         {
             // SOLAR SAFE ->