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 /filter/source/graphicfilter/ios2met/ios2met.cxx | |
| 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 'filter/source/graphicfilter/ios2met/ios2met.cxx')
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index abe2eeb762c3..87ea75d050ae 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2127,9 +2127,9 @@ void OS2METReader::ReadDsc(sal_uInt16 nDscID, sal_uInt16 /*nDscLen*/) ReadCoord(b32); if (nUnitType==0x00 && xr>0 && yr>0) - aGlobMapMode=MapMode(MAP_INCH,Point(0,0),boost::rational<sal_Int64>(10,xr),boost::rational<sal_Int64>(10,yr)); + aGlobMapMode=MapMode(MAP_INCH,Point(0,0),boost::rational<long>(10,xr),boost::rational<long>(10,yr)); else if (nUnitType==0x01 && xr>0 && yr>0) - aGlobMapMode=MapMode(MAP_CM,Point(0,0),boost::rational<sal_Int64>(10,xr),boost::rational<sal_Int64>(10,yr)); + aGlobMapMode=MapMode(MAP_CM,Point(0,0),boost::rational<long>(10,xr),boost::rational<long>(10,yr)); else aGlobMapMode=MapMode(); |