summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-17 20:45:17 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-17 20:45:21 +0300
commitad55d4e904634871c75a7007801c1b700bcb7ca3 (patch)
tree524b418a1f70258ccca834fb77a4b0b9ba113e98 /sfx2
parentcce7939a166bbf9713ea06bcd3901dfaf162126d (diff)
Bin --enable-desktop-gui-elements
Nobody wants LO's own widgets in a touch / mobile app after all. Change-Id: I84f1e85cebce80b6ff4ec5e4e3254654b5f5e6ec
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/workwin.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx2
3 files changed, 3 insertions, 3 deletions
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