diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-05 09:40:01 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-05 17:28:38 +0100 |
| commit | 34c4800f6a8b9383418a2a7279accfbbac1762ac (patch) | |
| tree | b378879dc273516e622cea4299d9e201acd8ecbb /sfx2 | |
| parent | 9985bfc034f6f8fd3f4f745b576a56dbcacae927 (diff) | |
Android Viewer: Set SfxWorkWindow::bIsFullScreen to true again
Commit fd603be25f4c86b5a17658a35f3be548252d912f
("tdf#129394: Create formula bar also in non-DESKTOP case", 2019-12-19)
made 'bIsFullScreen' be initialized with 'false' unconditionally,
but this breaks the Fennec-based Android Viewer which crashed
or showed error message "Error: Cannot open <path_to_file>:
loadComponentFromURL returned an empty reference." whenever trying
to load a document.
Since that app has its own UI elements, there's no need to create
formula input bar etc. for it, so this basically "reverts" the above
commit for the Android Viewer case only.
Change-Id: I96c0bdc1c298872db8143f6ec178d143a27fd56b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90020
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 3c505a364c07..9a8abd3b29bb 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <config_feature_desktop.h> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> @@ -459,7 +460,11 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMast bDockingAllowed(true), bInternalDockingAllowed(true), bAllChildrenVisible(true), +#if !defined(ANDROID) || HAVE_FEATURE_ANDROID_LOK bIsFullScreen( false ), +#else // Fennec-based Android Viewer + bIsFullScreen( true ), +#endif #if HAVE_FEATURE_DESKTOP bShowStatusBar( true ), #else |