diff options
| -rw-r--r-- | include/svx/svdtrans.hxx | 5 | ||||
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 19 | ||||
| -rw-r--r-- | svx/source/svdraw/svdtrans.cxx | 142 |
3 files changed, 38 insertions, 128 deletions
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 804c57a7a7de..a85edab7ef4a 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -292,9 +292,8 @@ public: { } OUString GetStr(long nVal) const; - static void TakeUnitStr(MapUnit eUnit, OUString& rStr); - static void TakeUnitStr(FieldUnit eUnit, OUString& rStr); - static OUString GetUnitStr(FieldUnit eUnit) { OUString aStr; TakeUnitStr(eUnit,aStr); return aStr; } + static OUString GetUnitStr(MapUnit eUnit); + static OUString GetUnitStr(FieldUnit eUnit); }; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 5ea950355a04..528af23ac7e1 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -862,9 +862,7 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, long nValue=GetValue(); SdrFormatter aFmt(eCoreMetric,ePresMetric); rText = aFmt.GetStr(nValue); - OUString aStr; - SdrFormatter::TakeUnitStr(ePresMetric,aStr); - rText += " " + aStr; + rText += " " + SdrFormatter::GetUnitStr(ePresMetric); if (ePres==SfxItemPresentation::Complete) { rText = SdrItemPool::GetItemName(Which()) + " " + rText; } @@ -1263,11 +1261,8 @@ bool SdrTextAniAmountItem::GetPresentation( else { SdrFormatter aFmt(eCoreMetric, ePresMetric); - OUString aStr; - - rText = aFmt.GetStr(nValue); - SdrFormatter::TakeUnitStr(ePresMetric, aStr); - rText += aStr; + rText = aFmt.GetStr(nValue) + + SdrFormatter::GetUnitStr(ePresMetric); } if(ePres == SfxItemPresentation::Complete) @@ -1638,14 +1633,10 @@ sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) { - OUString aRetval; - if(static_cast<FieldUnit>(nPos) == FieldUnit::NONE) - aRetval = "default"; + return "default"; else - SdrFormatter::TakeUnitStr(static_cast<FieldUnit>(nPos), aRetval); - - return aRetval; + return SdrFormatter::GetUnitStr(static_cast<FieldUnit>(nPos)); } bool SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 1605e592da5f..49e6f0cf2929 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -838,166 +838,86 @@ OUString SdrFormatter::GetStr(long nVal) const return aStr.makeStringAndClear(); } -void SdrFormatter::TakeUnitStr(MapUnit eUnit, OUString& rStr) +OUString SdrFormatter::GetUnitStr(MapUnit eUnit) { switch(eUnit) { // metrically case MapUnit::Map100thMM : - { - rStr = "/100mm"; - break; - } + return "/100mm"; case MapUnit::Map10thMM : - { - rStr = "/10mm"; - break; - } + return "/10mm"; case MapUnit::MapMM : - { - rStr = "mm"; - break; - } + return "mm"; case MapUnit::MapCM : - { - rStr = "cm"; - break; - } + return "cm"; // Inch case MapUnit::Map1000thInch: - { - rStr = "/1000\""; - break; - } + return "/1000\""; case MapUnit::Map100thInch : - { - rStr = "/100\""; - break; - } + return "/100\""; case MapUnit::Map10thInch : - { - rStr = "/10\""; - break; - } + return "/10\""; case MapUnit::MapInch : - { - rStr = "\""; - break; - } + return "\""; case MapUnit::MapPoint : - { - rStr = "pt"; - break; - } + return "pt"; case MapUnit::MapTwip : - { - rStr = "twip"; - break; - } + return "twip"; // others case MapUnit::MapPixel : - { - rStr = "pixel"; - break; - } + return "pixel"; case MapUnit::MapSysFont : - { - rStr = "sysfont"; - break; - } + return "sysfont"; case MapUnit::MapAppFont : - { - rStr = "appfont"; - break; - } + return "appfont"; case MapUnit::MapRelative : - { - rStr = "%"; - break; - } - default: break; + return "%"; + default: + return OUString(); } } -void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) +OUString SdrFormatter::GetUnitStr(FieldUnit eUnit) { switch(eUnit) { default : case FieldUnit::NONE : case FieldUnit::CUSTOM : - { - rStr.clear(); - break; - } + return OUString(); // metrically case FieldUnit::MM_100TH: - { - rStr = "/100mm"; - break; - } + return "/100mm"; case FieldUnit::MM : - { - rStr = "mm"; - break; - } + return "mm"; case FieldUnit::CM : - { - rStr = "cm"; - break; - } + return "cm"; case FieldUnit::M : - { - rStr = "m"; - break; - } + return "m"; case FieldUnit::KM : - { - rStr = "km"; - break; - } + return "km"; // Inch case FieldUnit::TWIP : - { - rStr = "twip"; - break; - } + return "twip"; case FieldUnit::POINT : - { - rStr = "pt"; - break; - } + return "pt"; case FieldUnit::PICA : - { - rStr = "pica"; - break; - } + return "pica"; case FieldUnit::INCH : - { - rStr = "\""; - break; - } + return "\""; case FieldUnit::FOOT : - { - rStr = "ft"; - break; - } + return "ft"; case FieldUnit::MILE : - { - rStr = "mile(s)"; - break; - } + return "mile(s)"; // others case FieldUnit::PERCENT: - { - rStr = "%"; - break; - } + return "%"; } } |