summaryrefslogtreecommitdiff
path: root/framework/source/loadenv/loadenv.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-02-09 14:14:22 +0200
committerTor Lillqvist <tml@collabora.com>2016-02-09 16:49:00 +0000
commit882d27fce20ee0537f785a619be1dd065ea6bbca (patch)
tree419ea0ed4e633b66698f15adc6f48a289ac5401b /framework/source/loadenv/loadenv.cxx
parent5b0f53f8f215062a131ec0498a72fb7619e5156d (diff)
tdf#97435: Avoid persistent window state crack when headless
Change-Id: Icab7dea3cf63f3932b7759acec339b498a8ac9c5 Reviewed-on: https://gerrit.libreoffice.org/22233 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'framework/source/loadenv/loadenv.cxx')
-rw-r--r--framework/source/loadenv/loadenv.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 323926a57973..5f2f95a2ba48 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 ->