Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2448 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2448/1 String::CreateFromAscii drop in sc Change-Id: Idb9fda589b309bd850ba2fdd68e7170c28d4c31a --- M sc/inc/drawattr.hxx M sc/source/ui/view/drawattr.cxx 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index 2878c3f..e3c3a75 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -33,10 +33,10 @@ 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 63fa606..cb58d2a 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 @@ case 8 : p = "SVX_SNAP_DRAW_TEXT" ; break; default : return EMPTY_STRING; } - return String::CreateFromAscii( p ); + return OUString::createFromAscii( p ); } //------------------------------------------------------------------------ -- To view, visit https://gerrit.libreoffice.org/2448 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb9fda589b309bd850ba2fdd68e7170c28d4c31a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania <rica...@linuxafundo.com.br> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice