diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2013-02-27 17:21:51 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2013-03-01 12:40:44 +0000 |
| commit | 1cdb93954633a7a2a6346f7cd6637d57672b3c72 (patch) | |
| tree | 073bd8a8846522e914acbf9c065ec09cfb46899e | |
| parent | e06559e69ac9432a6ada4934c39721217c8c6f49 (diff) | |
String::CreateFromAscii drop in sc
Change-Id: Idb9fda589b309bd850ba2fdd68e7170c28d4c31a
Reviewed-on: https://gerrit.libreoffice.org/2448
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
| -rw-r--r-- | sc/inc/drawattr.hxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/drawattr.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index 2878c3fed397..e3c3a7510a92 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -33,10 +33,10 @@ public: SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){} - virtual String GetValueText() const; + virtual OUString GetValueText() const; - virtual String GetValueText(sal_uInt16 nVal) const; + virtual OUString GetValueText(sal_uInt16 nVal) const; virtual sal_uInt16 GetValueCount() const {return((sal_uInt16)SVX_SNAP_DRAW_TEXT);} diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 63fa606a9e6a..cb58d2af6c3f 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -22,14 +22,14 @@ //------------------------------------------------------------------------ -String SvxDrawToolItem::GetValueText() const +OUString SvxDrawToolItem::GetValueText() const { return GetValueText(GetValue()); } //------------------------------------------------------------------------ -String SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const { const sal_Char* p; @@ -47,7 +47,7 @@ String SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const case 8 : p = "SVX_SNAP_DRAW_TEXT" ; break; default : return EMPTY_STRING; } - return String::CreateFromAscii( p ); + return OUString::createFromAscii( p ); } //------------------------------------------------------------------------ |