diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 23:00:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-09 13:28:37 +0000 |
| commit | 45b19123a63f23fe37b11b063d7567bf79ef09aa (patch) | |
| tree | befd8c637ac6fbdf94c05bb80c500fb781dd2bb4 /sw/source/ui | |
| parent | bcd9122715c7b708a65bee05a90dba3a38624ecb (diff) | |
simplify CharClass
multiple variants of toUpper (etc)
some that take a non-const OUString or String and modify it
some that take a const OUString or String and return a new one
some that take part of a const OUString or String and return a new one
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/cctrl/swlbox.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/glossary.cxx | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index 5d2bf53098c2..38f6aabbbc9e 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.cxx @@ -159,9 +159,9 @@ String SwComboBox::GetText() const String aTxt( ComboBox::GetText() ); if(nStyle & CBS_LOWER) - GetAppCharClass().toLower( aTxt ); + aTxt = GetAppCharClass().lowercase( aTxt ); else if( nStyle & CBS_UPPER ) - GetAppCharClass().toUpper( aTxt ); + aTxt = GetAppCharClass().uppercase( aTxt ); return aTxt; } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 4246c2cba24e..77ec22116bdb 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5604,9 +5604,9 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord ) upper++; } if (lower == letters) - aMatch = rCC.lower( rS ); + aMatch = rCC.lowercase( rS ); else if (upper == letters) - aMatch = rCC.upper( rS ); + aMatch = rCC.uppercase( rS ); else // mixed case - use what we have aMatch = rS; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9119645b29dd..345ffe664b0c 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -866,8 +866,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) IMPL_LINK( SwNewGlosNameDlg, Rename, Button *, EMPTYARG ) { SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent(); - String sNew = aNewShort.GetText(); - GetAppCharClass().toUpper(sNew); + String sNew = GetAppCharClass().uppercase(aNewShort.GetText()); if( pDlg->pGlossaryHdl->HasShortName(aNewShort.GetText()) && sNew != aOldShort.GetText() ) { |