summaryrefslogtreecommitdiff
path: root/sw/source/ui/cctrl
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-01-21 14:32:09 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-21 20:48:35 +0000
commite3f11c10d8cc759d01afa4b8fd8bd98c81a03119 (patch)
tree36191c6d90da559009161a1199d1176cf6a2bbba /sw/source/ui/cctrl
parent87f9d7da00857c649784a7d9eca046bf6e71ae3c (diff)
Changed SetText() / GetText() to take/return OUString
replaced lots of Len() with isEmpty() Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0 Reviewed-on: https://gerrit.libreoffice.org/1795 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/ui/cctrl')
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx4
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index d4a8d0eeb7bf..43bae1046cb1 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -82,12 +82,12 @@ void NoSpaceEdit::KeyInput(const KeyEvent& rEvt)
void NoSpaceEdit::Modify()
{
Selection aSel = GetSelection();
- String sTemp = GetText();
+ OUString sTemp = GetText();
for(sal_uInt16 i = 0; i < sForbiddenChars.Len(); i++)
{
sTemp = comphelper::string::remove(sTemp, sForbiddenChars.GetChar(i));
}
- sal_uInt16 nDiff = GetText().Len() - sTemp.Len();
+ sal_Int32 nDiff = GetText().getLength() - sTemp.getLength();
if(nDiff)
{
aSel.setMin(aSel.getMin() - nDiff);
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx
index 6e6a85b6fea3..c3694efcfaa3 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/ui/cctrl/swlbox.cxx
@@ -157,9 +157,9 @@ void SwComboBox::KeyInput( const KeyEvent& rKEvt )
}
// Convert text according to option
-String SwComboBox::GetText() const
+OUString SwComboBox::GetText() const
{
- String aTxt( ComboBox::GetText() );
+ OUString aTxt( ComboBox::GetText() );
if(nStyle & CBS_LOWER)
aTxt = GetAppCharClass().lowercase( aTxt );