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

[Michael Weghorn (via logerrit)]

 sfx2/source/appl/workwin.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 34c4800f6a8b9383418a2a7279accfbbac1762ac
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Mar 5 09:40:01 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Mar 5 17:28:38 2020 +0100

    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 at posteo.de>

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