sfx2/source/appl/workwin.cxx | 6 ++++++ sw/source/ui/uiview/view.cxx | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit cfeed2303f114afdf45b59c5a4994966e23fa76a Author: Tor Lillqvist <[email protected]> Date: Mon Apr 1 23:34:48 2013 +0300 Avoid rulers in non-DESKTOP environment Another simple first step. Change-Id: If683004cbb1ffac01e90b9b27e81c033d5b0e529 diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 84c2699..e4858ab 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <string> #include <stdlib.h> @@ -960,11 +961,12 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_bVScrollbarEnabled = aUsrPref.IsViewVScrollBar(); m_bHScrollbarEnabled = aUsrPref.IsViewHScrollBar(); m_pHScrollbar->SetAuto(bBrowse); +#if HAVE_FEATURE_DESKTOP if( aUsrPref.IsViewHRuler() ) CreateTab(); if( aUsrPref.IsViewVRuler() ) CreateVRuler(); - +#endif m_pWrtShell->SetUIOptions( aUsrPref ); m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() ); m_pWrtShell->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions()); commit 2a5073d91702061177b279e7a8555a1f30266015 Author: Tor Lillqvist <[email protected]> Date: Mon Apr 1 23:31:18 2013 +0300 Avoid desktop GUI elements in non-DESKTOP environment One simple early step: Start a SfxWorkWindow (what a meaningless name...) in "full-screen" mode, and without a status bar. Still lots of ifdefs etc to add if we want to avoid compiling in all the tons of related code. Change-Id: Id8b37bd215423a839643c5c1f426f6455956a886 diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 0a379df..99da99d 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 <stdio.h> #include <boost/unordered_map.hpp> @@ -582,8 +583,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar bDockingAllowed(sal_True), bInternalDockingAllowed(sal_True), bAllChildrenVisible(sal_True), +#if HAVE_FEATURE_DESKTOP bIsFullScreen( sal_False ), bShowStatusBar( sal_True ), +#else + bIsFullScreen( sal_True ), + bShowStatusBar( sal_False ), +#endif m_nLock( 0 ), m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" )), m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )), _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
