diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-23 12:41:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-28 17:36:20 +0100 |
| commit | 0dc532bffcda35d15a4719c05bb258e470355b98 (patch) | |
| tree | ec7adac5e52ca5aebb52d06a2498654af82e1200 /sfx2 | |
| parent | 7e8e9031c6ef46d67d5579ca42d0c0f5975d4f98 (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Changed SfxItemPool::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText ) const; to use OUString.
Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/evntconf.hxx | 4 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/frmdescr.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 06143e000c61..6e6331a86213 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -88,12 +88,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - XubString &rText, + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxEventNamesList& GetEvents() const { return aEventsList;} void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; } diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index e9027d88f5b8..2c0c178a3795 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -244,7 +244,7 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - UniString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 22ef4d0acf01..c2b09fa2470e 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -101,10 +101,10 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const SfxItemPresentation SfxEventNamesItem::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, - XubString &rText, + OUString &rText, const IntlWrapper* ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index ea19eeba9835..6fb6a10caef6 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -207,11 +207,11 @@ SfxItemPresentation SfxFrameDescriptorItem::GetPresentation SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, - XubString& rText, + OUString& rText, const IntlWrapper * ) const { - rText.Erase(); + rText = OUString(); return SFX_ITEM_PRESENTATION_NONE; } |