summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-06-26 18:24:06 +0100
committerNoel Power <noel.power@novell.com>2012-06-26 18:24:06 +0100
commitff62d9c4be26096c7f5ea06e4dee2b16d40aa16b (patch)
tree1d56b04f28f403a61508eaf728ddcc67f387120f
parentb0cb1955daf41617a3abc72f153d858570d6e515 (diff)
Revert "set the zoom only once, prevents infinite loop, fdo#51040"
This reverts commit 793f1e70ce4c364b366d2e8065ea7fb2815bbf40.
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 4bf563122e85..77f633ddfc91 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -354,6 +354,10 @@ void ScPreviewShell::UpdateNeededScrollBars()
pCorner->SetPosSizePixel( Point( aPos.X() + aNewSize.Width(), aPos.Y() + aNewSize.Height() ),
Size( nBarW, nBarH ) );
+ if ( SVX_ZOOM_WHOLEPAGE == eZoom )
+ pPreview->SetZoom( pPreview->GetOptimalZoom( sal_False ) );
+ else if ( SVX_ZOOM_PAGEWIDTH == eZoom )
+ pPreview->SetZoom( pPreview->GetOptimalZoom( sal_True ) );
UpdateScrollBars();
}