mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --enable-desktop-gui-elements to show such even on non-DESKTOP platforms

Browse Source 
Not my idea.

Change-Id: If4874d97a2035588cd65ded9f281de0c3598b7d7
This commit is contained in:
Tor Lillqvist
2013-05-02 20:17:20 +03:00
parent e8177f9900
commit 7de37ac7d6
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config_host/config_features.h.in
View File

@@ -25,6 +25,16 @@
#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.
*/
#define HAVE_FEATURE_DESKTOP_GUI_ELEMENTS 0
/* EXTENSIONS - Whether we have any extension mechanism at all
*
* Primarily intended for non-desktop platforms where supporting

9
configure.ac
View File

@@ -1123,6 +1123,12 @@ 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. The
@@ -2141,7 +2147,10 @@ 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=''

2
sfx2/source/appl/workwin.cxx
View File

@@ -595,7 +595,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
bDockingAllowed(sal_True),
bInternalDockingAllowed(sal_True),
bAllChildrenVisible(sal_True),
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
bIsFullScreen( sal_False ),
bShowStatusBar( sal_True ),
#else

2
sfx2/source/view/viewfrm.cxx
View File

@@ -155,7 +155,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
{
SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER );
SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW );
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
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

10
sw/inc/viewopt.hxx
View File

@@ -446,7 +446,7 @@ public:
sal_Bool IsViewVScrollBar() const
{
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
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
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
return nUIOptions & VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False;
#else
return sal_False;
@@ -497,7 +497,7 @@ public:
sal_Bool IsViewAnyRuler() const
{
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);
#else
return sal_False;
@@ -508,7 +508,7 @@ public:
sal_Bool IsViewHRuler(sal_Bool bDirect = sal_False) const
{
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ?
0 != (nUIOptions & VIEWOPT_2_H_RULER) :
!bReadonly ?
@@ -525,7 +525,7 @@ public:
sal_Bool IsViewVRuler(sal_Bool bDirect = sal_False) const
{
#if HAVE_FEATURE_DESKTOP
#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ?
0 !=(nUIOptions & VIEWOPT_2_V_RULER) :
!bReadonly ?