summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-18 09:16:09 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-20 12:57:32 +0000
commit6d12d8cab29ff4d9eb19039a183f90e309fa5d82 (patch)
tree637ec963c7a06165561bb3c774fc14913dbc80c0 /svx
parent5c887ee0e48d85ddd7bb17aac6cb87203a188e7a (diff)
reduce UniStrings
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/source/svdraw/svdattr.cxx14
3 files changed, 10 insertions, 8 deletions
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 1bb3977df997..ce3a012f9a64 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -46,7 +46,7 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- virtual String GetValueTextByVal(sal_Bool bVal) const;
+ virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 9ca3f096705a..b876f3196b41 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -45,7 +45,7 @@ public:
SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- virtual String GetValueTextByVal(sal_Bool bVal) const;
+ virtual rtl::OUString GetValueTextByVal(sal_Bool bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index a71d98b45df7..d2728f557ad1 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -754,10 +754,11 @@ SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrOnOffItem(Which(),rIn);
}
-XubString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
+rtl::OUString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
{
- if (bVal) return ImpGetResStr(STR_ItemValON);
- else return ImpGetResStr(STR_ItemValOFF);
+ if (bVal)
+ return ImpGetResStr(STR_ItemValON);
+ return ImpGetResStr(STR_ItemValOFF);
}
SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres,
@@ -786,10 +787,11 @@ SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
return new SdrYesNoItem(Which(),rIn);
}
-XubString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
+rtl::OUString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
{
- if (bVal) return ImpGetResStr(STR_ItemValYES);
- else return ImpGetResStr(STR_ItemValNO);
+ if (bVal)
+ return ImpGetResStr(STR_ItemValYES);
+ return ImpGetResStr(STR_ItemValNO);
}
SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,