Kaydet (Commit) 3728952b authored tarafından Noel Grandin's avatar Noel Grandin

convert svtools/source/contnr/* from String to OUString

Change-Id: I51ad001473a83eb336f6b00fd989b9e6b2f73ec5
üst 23cafe3f
...@@ -189,7 +189,7 @@ void SvtFontSubstConfig::Apply() ...@@ -189,7 +189,7 @@ void SvtFontSubstConfig::Apply()
nFlags |= FONT_SUBSTITUTE_ALWAYS; nFlags |= FONT_SUBSTITUTE_ALWAYS;
if(pSubs->bReplaceOnScreenOnly) if(pSubs->bReplaceOnScreenOnly)
nFlags |= FONT_SUBSTITUTE_SCREENONLY; nFlags |= FONT_SUBSTITUTE_SCREENONLY;
OutputDevice::AddFontSubstitute( String(pSubs->sFont), String(pSubs->sReplaceBy), nFlags ); OutputDevice::AddFontSubstitute( pSubs->sFont, pSubs->sReplaceBy, nFlags );
} }
OutputDevice::EndFontSubstitution(); OutputDevice::EndFontSubstitution();
......
...@@ -107,7 +107,7 @@ namespace svt ...@@ -107,7 +107,7 @@ namespace svt
m_pResultHandler = NULL; m_pResultHandler = NULL;
m_pTranslator = NULL; m_pTranslator = NULL;
m_aFolder.aContent = ::ucbhelper::Content(); m_aFolder.aContent = ::ucbhelper::Content();
m_aFolder.sURL = String(); m_aFolder.sURL = "";
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
......
...@@ -420,8 +420,8 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const ...@@ -420,8 +420,8 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
{ {
if ( nCol == 0 ) if ( nCol == 0 )
{ {
String sRet = static_cast<const SvLBoxString*>(pStr)->GetText(); OUString sRet = static_cast<const SvLBoxString*>(pStr)->GetText();
if ( sRet.Len() == 0 ) if ( sRet.isEmpty() )
sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD ); sRet = SVT_RESSTR( STR_SVT_ACC_EMPTY_FIELD );
return sRet; return sRet;
} }
......
...@@ -1064,12 +1064,12 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl) ...@@ -1064,12 +1064,12 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl)
if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // avoid nesting if ( nImpFlags & SVLBOX_EDTEND_CALLED ) // avoid nesting
return 0; return 0;
nImpFlags |= SVLBOX_EDTEND_CALLED; nImpFlags |= SVLBOX_EDTEND_CALLED;
String aStr; OUString aStr;
if ( !pEdCtrl->EditingCanceled() ) if ( !pEdCtrl->EditingCanceled() )
aStr = pEdCtrl->GetText(); aStr = pEdCtrl->GetText();
else else
aStr = pEdCtrl->GetSavedValue(); aStr = pEdCtrl->GetSavedValue();
if ( IsEmptyTextAllowed() || aStr.Len() > 0 ) if ( IsEmptyTextAllowed() || !aStr.isEmpty() )
EditedText( aStr ); EditedText( aStr );
// Hide may only be called after the new text was put into the entry, so // 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 // that we don't call the selection handler in the GetFocus of the listbox
...@@ -1781,7 +1781,7 @@ OUString SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const ...@@ -1781,7 +1781,7 @@ OUString SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const
{ {
DBG_CHKTHIS(SvTreeListBox,0); DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ); DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" );
String sRet; OUString sRet;
sal_uInt16 nCount = pEntry->ItemCount(); sal_uInt16 nCount = pEntry->ItemCount();
sal_uInt16 nCur = 0; sal_uInt16 nCur = 0;
SvLBoxItem* pItem; SvLBoxItem* pItem;
...@@ -3683,8 +3683,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) ...@@ -3683,8 +3683,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData )
{ {
const SvTreeListEntry* pLeft = pData->pLeft; const SvTreeListEntry* pLeft = pData->pLeft;
const SvTreeListEntry* pRight = pData->pRight; const SvTreeListEntry* pRight = pData->pRight;
String aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); OUString aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
String aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText()); OUString aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
pImp->UpdateStringSorter(); pImp->UpdateStringSorter();
return pImp->m_pStringSorter->compare(aLeft, aRight); return pImp->m_pStringSorter->compare(aLeft, aRight);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment