summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdmodel.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
-rw-r--r--svx/source/svdraw/svdmodel.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index d57d0ab324bf..f06d66700b63 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<long>(1,1);
+ aUIScale=Fraction(1,1);
nUIUnitKomma=0;
bUIOnlyKomma=false;
pLayerAdmin=NULL;
@@ -927,9 +927,9 @@ void SdrModel::SetDefaultTabulator(sal_uInt16 nVal)
void SdrModel::ImpSetUIUnit()
{
- if(0 == aUIScale.numerator())
+ if(0 == aUIScale.GetNumerator() || 0 == aUIScale.GetDenominator())
{
- aUIScale = boost::rational<long>(1,1);
+ aUIScale = Fraction(1,1);
}
// set start values
@@ -1015,17 +1015,17 @@ void SdrModel::ImpSetUIUnit()
// may need to be changed in the future, too
if(1 != nMul || 1 != nDiv)
{
- const boost::rational<long> aTemp(static_cast< long >(nMul), static_cast< long >(nDiv));
- nMul = aTemp.numerator();
- nDiv = aTemp.denominator();
+ const Fraction aTemp(static_cast< long >(nMul), static_cast< long >(nDiv));
+ nMul = aTemp.GetNumerator();
+ nDiv = aTemp.GetDenominator();
}
// #i89872# take Unit of Measurement into account
- if(1 != aUIScale.denominator() || 1 != aUIScale.numerator())
+ if(1 != aUIScale.GetDenominator() || 1 != aUIScale.GetNumerator())
{
// divide by UIScale
- nMul *= aUIScale.denominator();
- nDiv *= aUIScale.numerator();
+ nMul *= aUIScale.GetDenominator();
+ nDiv *= aUIScale.GetNumerator();
}
// shorten trailing zeros for dividend
@@ -1043,12 +1043,12 @@ void SdrModel::ImpSetUIUnit()
}
// end preparations, set member values
- aUIUnitFact = boost::rational<long>(sal_Int32(nMul), sal_Int32(nDiv));
+ aUIUnitFact = Fraction(sal_Int32(nMul), sal_Int32(nDiv));
bUIOnlyKomma = (nMul == nDiv);
TakeUnitStr(eUIUnit, aUIUnitStr);
}
-void SdrModel::SetScaleUnit(MapUnit eMap, const boost::rational<long>& rFrac)
+void SdrModel::SetScaleUnit(MapUnit eMap, const Fraction& rFrac)
{
if (eObjUnit!=eMap || aObjUnit!=rFrac) {
eObjUnit=eMap;
@@ -1073,7 +1073,7 @@ void SdrModel::SetScaleUnit(MapUnit eMap)
}
}
-void SdrModel::SetScaleFraction(const boost::rational<long>& rFrac)
+void SdrModel::SetScaleFraction(const Fraction& rFrac)
{
if (aObjUnit!=rFrac) {
aObjUnit=rFrac;
@@ -1093,7 +1093,7 @@ void SdrModel::SetUIUnit(FieldUnit eUnit)
}
}
-void SdrModel::SetUIScale(const boost::rational<long>& rScale)
+void SdrModel::SetUIScale(const Fraction& rScale)
{
if (aUIScale!=rScale) {
aUIScale=rScale;
@@ -1102,7 +1102,7 @@ void SdrModel::SetUIScale(const boost::rational<long>& rScale)
}
}
-void SdrModel::SetUIUnit(FieldUnit eUnit, const boost::rational<long>& rScale)
+void SdrModel::SetUIUnit(FieldUnit eUnit, const Fraction& rScale)
{
if (eUIUnit!=eUnit || aUIScale!=rScale) {
eUIUnit=eUnit;
@@ -1193,7 +1193,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
const bool bNegative(nVal < 0L);
SvtSysLocale aSysLoc;
const LocaleDataWrapper& rLoc(aSysLoc.GetLocaleData());
- double fLocalValue(double(nVal) * boost::rational_cast<double>(aUIUnitFact));
+ double fLocalValue(double(nVal) * double(aUIUnitFact));
if(bNegative)
{
@@ -1333,10 +1333,10 @@ void SdrModel::TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar) const
rStr = aBuf.makeStringAndClear();
}
-void SdrModel::TakePercentStr(const boost::rational<long>& rVal, OUString& rStr, bool bNoPercentChar) const
+void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar) const
{
- sal_Int32 nMul(rVal.numerator());
- sal_Int32 nDiv(rVal.denominator());
+ sal_Int32 nMul(rVal.GetNumerator());
+ sal_Int32 nDiv(rVal.GetDenominator());
bool bNeg(nMul < 0);
if(nDiv < 0)