diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-09 13:02:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:05 +0200 |
| commit | c922898500efc1a67d39ac37815ebed2248a782c (patch) | |
| tree | a616f49bd4ee47f932da8c320e871555c68700b7 | |
| parent | convert sw/source/ui/inc/b*.hxx from String to OUString (diff) | |
| download | core-c922898500efc1a67d39ac37815ebed2248a782c.tar.gz core-c922898500efc1a67d39ac37815ebed2248a782c.zip | |
convert sw/source/ui/inc/a*.hxx from String to OUString
Change-Id: I6875504bd979addd5df2ece596a4f718ad491581
| -rw-r--r-- | sw/source/ui/cctrl/actctrl.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/actctrl.hxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/utlui/swrenamexnameddlg.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index 01b57a093297..c060f9a8d7eb 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -66,7 +66,7 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt) if(rEvt.GetCharCode()) { OUString sKey(rEvt.GetCharCode()); - if( STRING_NOTFOUND != sForbiddenChars.Search(sKey)) + if( -1 != sForbiddenChars.indexOf(sKey)) bCallParent = false; } if(bCallParent) @@ -77,9 +77,9 @@ void NoSpaceEdit::Modify() { Selection aSel = GetSelection(); OUString sTemp = GetText(); - for(sal_uInt16 i = 0; i < sForbiddenChars.Len(); i++) + for(sal_uInt16 i = 0; i < sForbiddenChars.getLength(); i++) { - sTemp = comphelper::string::remove(sTemp, sForbiddenChars.GetChar(i)); + sTemp = comphelper::string::remove(sTemp, sForbiddenChars[i]); } sal_Int32 nDiff = GetText().getLength() - sTemp.getLength(); if(nDiff) diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index a357a7baefcb..24ca330d9c4c 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -46,7 +46,7 @@ public: * --------------------------------------------------*/ class SW_DLLPUBLIC NoSpaceEdit : public Edit { - String sForbiddenChars; + OUString sForbiddenChars; protected: virtual void KeyInput( const KeyEvent& ); virtual void Modify(); @@ -54,8 +54,8 @@ protected: public: NoSpaceEdit( Window* pParent ); virtual ~NoSpaceEdit(); - void SetForbiddenChars(const String& rSet){sForbiddenChars = rSet;} - const String& GetForbiddenChars(){return sForbiddenChars;} + void SetForbiddenChars(const OUString& rSet){sForbiddenChars = rSet;} + const OUString& GetForbiddenChars(){return sForbiddenChars;} }; /* -------------------------------------------------- diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index 1da76d3e4094..8a99e375b7c8 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -96,12 +96,12 @@ IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, NoSpaceEdit*, pEdit) // prevent from pasting illegal characters sal_uInt16 nLen = sTmp.Len(); String sMsg; - for(sal_uInt16 i = 0; i < pEdit->GetForbiddenChars().Len(); i++) + for(sal_uInt16 i = 0; i < pEdit->GetForbiddenChars().getLength(); i++) { sal_uInt16 nTmpLen = sTmp.Len(); - sTmp = comphelper::string::remove(sTmp, pEdit->GetForbiddenChars().GetChar(i)); + sTmp = comphelper::string::remove(sTmp, pEdit->GetForbiddenChars()[i]); if(sTmp.Len() != nTmpLen) - sMsg += pEdit->GetForbiddenChars().GetChar(i); + sMsg += pEdit->GetForbiddenChars()[i]; } if(sTmp.Len() != nLen) { |