diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:22:06 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:34 +0200 |
commit | 858c2a2977d5e4671959724ecd2a453837dadddf (patch) | |
tree | a61e303e6e27cef015c50b38b23fc574ce64fcef /vcl/inc | |
parent | ff502f409fd73249a6a94c579d19905144aa5ba8 (diff) |
Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"
This reverts commit 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e.
Conflicts:
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
Change-Id: I80abc7abdeddc267eaabc9f8ab49611bb3f8ae83
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 4448c55c1f6f..b6ffa3d41640 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -231,7 +231,7 @@ public: void* mpUserData; vcl::Cursor* mpCursor; Pointer maPointer; - boost::rational<sal_Int64> maZoom; + boost::rational<long> maZoom; OUString maText; vcl::Font* mpControlFont; Color maControlForeground; |