summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-04 12:41:57 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-04 12:46:23 +0200
commitb162bf7e521e561c3c8eb3cd6a83b944dcd27da3 (patch)
treebcc92c804598eba893cfe014007df74d8f340999 /sw
parent5f63a1ab95d64d25f241779a6a361fef01f2502a (diff)
First attempt to get rid of scrollbars on tablets
Change-Id: Id861eab66c04cb5547e75959cab8102d5c18f647
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/uiview/viewport.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 905f45059316..bd3444ad347e 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1056,6 +1056,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
return;
bInOuterResizePixel = sal_True;
+#if !defined(ANDROID) && !defined(IOS)
// feststellen, ob Scrollbars angezeigt werden duerfen
sal_Bool bShowH = sal_True,
bShowV = sal_True,
@@ -1090,7 +1091,10 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
if(pVScrollbar->IsVisible(sal_False) != bShowV && !bAuto)
ShowVScrollbar(bShowV);
pVScrollbar->SetAuto(bAuto);
-
+#else
+ const sal_Bool bAuto = sal_False;
+ const sal_Bool bHAuto = sal_False;
+#endif
SET_CURR_SHELL( pWrtShell );
sal_Bool bRepeat = sal_False;
long nCnt = 0;
@@ -1199,6 +1203,9 @@ void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
sal_Bool SwView::UpdateScrollbars()
{
+#if defined(ANDROID) || defined(IOS)
+ return sal_True;
+#else
sal_Bool bRet = sal_False;
if ( !aVisArea.IsEmpty() )
{
@@ -1243,6 +1250,7 @@ sal_Bool SwView::UpdateScrollbars()
}
}
return bRet;
+#endif
}
void SwView::Move()