diff options
Diffstat (limited to 'svtools/source/contnr')
| -rw-r--r-- | svtools/source/contnr/contentenumeration.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/svtabbx.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 081a7a603598..49b935ff3dce 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -107,7 +107,7 @@ namespace svt m_pResultHandler = NULL; m_pTranslator = NULL; m_aFolder.aContent = ::ucbhelper::Content(); - m_aFolder.sURL = String(); + m_aFolder.sURL = ""; } //-------------------------------------------------------------------- diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index c04a8c05816f..3b2874c5a183 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -420,8 +420,8 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { if ( nCol == 0 ) { - String sRet = static_cast<const SvLBoxString*>(pStr)->GetText(); - if ( sRet.Len() == 0 ) + OUString sRet = static_cast<const SvLBoxString*>(pStr)->GetText(); + if ( sRet.isEmpty() ) sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD ); return sRet; } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index cd6112b6c71e..b942469aef6f 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1064,12 +1064,12 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl) if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // avoid nesting return 0; nImpFlags |= SVLBOX_EDTEND_CALLED; - String aStr; + OUString aStr; if ( !pEdCtrl->EditingCanceled() ) aStr = pEdCtrl->GetText(); else aStr = pEdCtrl->GetSavedValue(); - if ( IsEmptyTextAllowed() || aStr.Len() > 0 ) + if ( IsEmptyTextAllowed() || !aStr.isEmpty() ) EditedText( aStr ); // Hide may only be called after the new text was put into the entry, so // that we don't call the selection handler in the GetFocus of the listbox @@ -1781,7 +1781,7 @@ OUString SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const { DBG_CHKTHIS(SvTreeListBox,0); DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ); - String sRet; + OUString sRet; sal_uInt16 nCount = pEntry->ItemCount(); sal_uInt16 nCur = 0; SvLBoxItem* pItem; @@ -3683,8 +3683,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) { const SvTreeListEntry* pLeft = pData->pLeft; const SvTreeListEntry* pRight = pData->pRight; - String aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); - String aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); + OUString aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); + OUString aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); pImp->UpdateStringSorter(); return pImp->m_pStringSorter->compare(aLeft, aRight); } |