diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-02-09 19:41:44 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-02-09 19:42:29 +0200 |
| commit | cede4a1af316b9a9e1928c71082448ff087d288b (patch) | |
| tree | d97b01b5d03ac4817edac9f4e4806d487b13f47f /framework | |
| parent | 5a5dbb31d559fb8d3cf9831863bea1f215a34f3d (diff) | |
Revert "tdf#97435: Avoid persistent window state crack when headless"
The change caused failures in some Java unit tests.
This reverts commit 882d27fce20ee0537f785a619be1dd065ea6bbca.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 4 | ||||
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 5cfd0435394d..12bf95d89a78 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -77,10 +77,6 @@ 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 5f2f95a2ba48..323926a57973 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1724,11 +1724,7 @@ 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; - - // Don't look for persistent window attributes in headless mode - if( !Application::IsHeadlessModeEnabled() ) - comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState; - + ::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState; if (!sWindowState.isEmpty()) { // SOLAR SAFE -> |