Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 6 insertions, 5 deletions

diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 9cf51d4a5b95..0f2cd228bdff 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -140,7 +140,7 @@ public:
         larger than the view or the value of aWinPos in this direction is -1
         then the window is centered in this direction.
         */
-    void UpdateMapOrigin (BOOL bInvalidate = TRUE);
+    void UpdateMapOrigin (sal_Bool bInvalidate = sal_True);
 
     void UpdateMapMode (void);
 
@@ -171,11 +171,12 @@ protected:
     Point maWinPos;
     Point maViewOrigin;
     Size maViewSize;
-    Size maPrevSize; // contains previous window size in logical coords
-    USHORT mnMinZoom;
-    USHORT mnMaxZoom;
+    sal_uInt16 mnMinZoom;
+    sal_uInt16 mnMaxZoom;
+
+    sal_uInt16 mnMaxZoom;
     /** This flag tells whether to re-calculate the minimal zoom factor
-        depening on the current zoom factor.  Its default value is now FALSE.
+        depening on the current zoom factor.  Its default value is now sal_False.
     */
     bool mbMinZoomAutoCalc;
     bool mbCalcMinZoomByMinSide;