1 files changed, 27 insertions, 0 deletions
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index f91e676d39b0..b06fc44a5861 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1142,6 +1142,9 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
     if( !pPrefs )
         pPrefs = SW_MOD()->GetUsrPref(sal_False);
 
+    mbHScrollbarEnabled = pPrefs->IsViewHScrollBar();
+    mbVScrollbarEnabled = pPrefs->IsViewVScrollBar();
+
     // die Felder aktualisieren
     // ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen.
     //          In den Methoden wird auf die akt. Shell abgefragt!
@@ -1661,6 +1664,9 @@ void SwPagePreView::ScrollViewSzChg()
             bShowVScrollbar = true;
         }
 
+        if (!mbVScrollbarEnabled)
+            bShowVScrollbar = false;
+
         ShowVScrollbar(bShowVScrollbar);
         pPageUpBtn->Show(bShowVScrollbar);
         pPageDownBtn->Show(bShowVScrollbar);
@@ -1689,6 +1695,9 @@ void SwPagePreView::ScrollViewSzChg()
             pHScrollbar->SetPageSize( nVisWidth / 2 );
         }
 
+        if (!mbHScrollbarEnabled)
+            bShowHScrollbar = false;
+
         ShowHScrollbar(bShowHScrollbar);
     }
     pScrollFill->Show(bShowVScrollbar && bShowHScrollbar);
@@ -1903,6 +1912,24 @@ void SwPagePreView::ShowVScrollbar(sal_Bool bShow)
     InvalidateBorder();
 }
 
+void SwPagePreView::EnableHScrollbar(bool bEnable)
+{
+    if (mbHScrollbarEnabled != bEnable)
+    {
+        mbHScrollbarEnabled = bEnable;
+        ScrollViewSzChg();
+    }
+}
+
+void SwPagePreView::EnableVScrollbar(bool bEnable)
+{
+    if (mbVScrollbarEnabled != bEnable)
+    {
+        mbVScrollbarEnabled = bEnable;
+        ScrollViewSzChg();
+    }
+}
+
 void SwPagePreView::SetZoom(SvxZoomType eType, sal_uInt16 nFactor)
 {
     ViewShell& rSh = *GetViewShell();