Bin --enable-desktop-gui-elements

Nobody wants LO's own widgets in a touch / mobile app after all.

Change-Id: I84f1e85cebce80b6ff4ec5e4e3254654b5f5e6ec

6 files changed, 11 insertions, 27 deletions

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 38d41fd27d16..0f63f26a7c32 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -29,19 +29,12 @@
  * Non-DESKTOP implies no traditional help mechanism, and to some
  * extent (as noticed, and as possible without making the code too
  * ugly) the related code is ifdeffed out.
- */
-
-#define HAVE_FEATURE_DESKTOP 0
-
-/* DESKTOP_GUI_ELEMENTS
  *
- * In the non-DESKTOP case, whether to still display (and enable
- * interactive use of) traditional desktop-style GUI elements like
- * toolbars and scrollbars, drawn and handled using mostly the normal
- * LO code.
+ * Non-DESKTOP implies no traditional desktop-style GUI elements like
+ * toolbars and scrollbars presented by the LO code.
  */
 
-#define HAVE_FEATURE_DESKTOP_GUI_ELEMENTS 0
+#define HAVE_FEATURE_DESKTOP 0
 
 /* X11
  *
diff --git a/configure.ac b/configure.ac
index 42dfd441ee98..d8a26e922906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1197,12 +1197,6 @@ AC_ARG_ENABLE(silent-msi,
         [Enable MSI with LIMITUI=1 (silent install).]),
 ,)
 
-AC_ARG_ENABLE(desktop-gui-elements,
-    AS_HELP_STRING([--enable-desktop-gui-elements],
-        [Enable display and use of desktop style GUI elements
-         even on a non-desktop platform.]),
-,)
-
 AC_ARG_ENABLE(macosx-code-signing,
     AS_HELP_STRING([--enable-macosx-code-signing<=identity>],
         [Sign executables, dylibs, frameworks and the app bundle. If you
@@ -2252,10 +2246,7 @@ dnl cross-compiling would imply a non-desktop OS.
 if test $_os != iOS -a $_os != Android; then
     BUILD_TYPE="$BUILD_TYPE DESKTOP"
     AC_DEFINE(HAVE_FEATURE_DESKTOP)
-    AC_DEFINE(HAVE_FEATURE_DESKTOP_GUI_ELEMENTS)
     AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
-elif test "$enable_desktop_gui_elements" = yes; then
-    AC_DEFINE(HAVE_FEATURE_DESKTOP_GUI_ELEMENTS)
 fi
 
 DISABLE_EXPORT=''
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4873dafd582b..123cb8b2c236 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -594,7 +594,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     bDockingAllowed(sal_True),
     bInternalDockingAllowed(sal_True),
     bAllChildrenVisible(sal_True),
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
     bIsFullScreen( sal_False ),
     bShowStatusBar( sal_True ),
 #else
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7ebb9402a22f..08e958e293ef 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1240,7 +1240,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
 //--------------------------------------------------------------------
 void SfxDispatcher::SetMenu_Impl()
 {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
     if ( pImp->pFrame )
     {
         SfxViewFrame* pTop = pImp->pFrame->GetTopViewFrame();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 141406e2b9b3..8fa2e2335ee5 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -153,7 +153,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 {
     SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER );
     SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW );
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
 #endif
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index b205f1e481b3..3a91d57f0e19 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -446,7 +446,7 @@ public:
 
     sal_Bool    IsViewVScrollBar() const
         {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
             return nUIOptions & VIEWOPT_2_VSCROLLBAR ? sal_True : sal_False;
 #else
             return sal_False;
@@ -454,7 +454,7 @@ public:
         }
     sal_Bool    IsViewHScrollBar() const
         {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
             return nUIOptions & VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False;
 #else
             return sal_False;
@@ -501,7 +501,7 @@ public:
 
     sal_Bool        IsViewAnyRuler() const
         {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
             return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);
 #else
             return sal_False;
@@ -512,7 +512,7 @@ public:
 
     sal_Bool        IsViewHRuler(sal_Bool bDirect = sal_False)     const
                         {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
                             sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect  ?
                                     0 != (nUIOptions & VIEWOPT_2_H_RULER) :
                                     !bReadonly ?
@@ -529,7 +529,7 @@ public:
 
     sal_Bool            IsViewVRuler(sal_Bool bDirect = sal_False) const
                         {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
                             sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect  ?
                                     0 !=(nUIOptions & VIEWOPT_2_V_RULER) :
                                     !bReadonly ?