summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdmodel.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-10-23 17:22:06 +0200
committerJan Holesovsky <kendy@collabora.com>2014-10-23 18:34:34 +0200
commit858c2a2977d5e4671959724ecd2a453837dadddf (patch)
treea61e303e6e27cef015c50b38b23fc574ce64fcef /svx/source/svdraw/svdmodel.cxx
parentff502f409fd73249a6a94c579d19905144aa5ba8 (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 'svx/source/svdraw/svdmodel.cxx')
-rw-r--r--svx/source/svdraw/svdmodel.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 7760611f76d9..d57d0ab324bf 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -113,7 +113,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
aObjUnit=SdrEngineDefaults::GetMapFraction();
eObjUnit=SdrEngineDefaults::GetMapUnit();
eUIUnit=FUNIT_MM;
- aUIScale=boost::rational<sal_Int64>(1,1);
+ aUIScale=boost::rational<long>(1,1);
nUIUnitKomma=0;
bUIOnlyKomma=false;
pLayerAdmin=NULL;
@@ -929,7 +929,7 @@ void SdrModel::ImpSetUIUnit()
{
if(0 == aUIScale.numerator())
{
- aUIScale = boost::rational<sal_Int64>(1,1);
+ aUIScale = boost::rational<long>(1,1);
}
// set start values
@@ -1015,7 +1015,7 @@ void SdrModel::ImpSetUIUnit()
// may need to be changed in the future, too
if(1 != nMul || 1 != nDiv)
{
- const boost::rational<sal_Int64> aTemp(static_cast< long >(nMul), static_cast< long >(nDiv));
+ const boost::rational<long> aTemp(static_cast< long >(nMul), static_cast< long >(nDiv));
nMul = aTemp.numerator();
nDiv = aTemp.denominator();
}
@@ -1043,12 +1043,12 @@ void SdrModel::ImpSetUIUnit()
}
// end preparations, set member values
- aUIUnitFact = boost::rational<sal_Int64>(sal_Int32(nMul), sal_Int32(nDiv));
+ aUIUnitFact = boost::rational<long>(sal_Int32(nMul), sal_Int32(nDiv));
bUIOnlyKomma = (nMul == nDiv);
TakeUnitStr(eUIUnit, aUIUnitStr);
}
-void SdrModel::SetScaleUnit(MapUnit eMap, const boost::rational<sal_Int64>& rFrac)
+void SdrModel::SetScaleUnit(MapUnit eMap, const boost::rational<long>& rFrac)
{
if (eObjUnit!=eMap || aObjUnit!=rFrac) {
eObjUnit=eMap;
@@ -1073,7 +1073,7 @@ void SdrModel::SetScaleUnit(MapUnit eMap)
}
}
-void SdrModel::SetScaleFraction(const boost::rational<sal_Int64>& rFrac)
+void SdrModel::SetScaleFraction(const boost::rational<long>& rFrac)
{
if (aObjUnit!=rFrac) {
aObjUnit=rFrac;
@@ -1093,7 +1093,7 @@ void SdrModel::SetUIUnit(FieldUnit eUnit)
}
}
-void SdrModel::SetUIScale(const boost::rational<sal_Int64>& rScale)
+void SdrModel::SetUIScale(const boost::rational<long>& rScale)
{
if (aUIScale!=rScale) {
aUIScale=rScale;
@@ -1102,7 +1102,7 @@ void SdrModel::SetUIScale(const boost::rational<sal_Int64>& rScale)
}
}
-void SdrModel::SetUIUnit(FieldUnit eUnit, const boost::rational<sal_Int64>& rScale)
+void SdrModel::SetUIUnit(FieldUnit eUnit, const boost::rational<long>& rScale)
{
if (eUIUnit!=eUnit || aUIScale!=rScale) {
eUIUnit=eUnit;
@@ -1333,7 +1333,7 @@ void SdrModel::TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar) const
rStr = aBuf.makeStringAndClear();
}
-void SdrModel::TakePercentStr(const boost::rational<sal_Int64>& rVal, OUString& rStr, bool bNoPercentChar) const
+void SdrModel::TakePercentStr(const boost::rational<long>& rVal, OUString& rStr, bool bNoPercentChar) const
{
sal_Int32 nMul(rVal.numerator());
sal_Int32 nDiv(rVal.denominator());