From fa800f4e7390902e6b3008586308b06313ac8b4a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 11 Oct 2013 16:00:36 +0200 Subject: convert sw/source/ui/table/*.cxx from String to OUString Change-Id: Ie81c21b6254ff6f766e8b61444bf1b672435de89 --- sw/source/ui/table/tabledlg.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sw/source/ui/table/tabledlg.cxx') diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index bc96b1de4806..b6b3df327957 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -607,8 +607,8 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) // dialog bei OK den focus verliert m_pNameED->GrabFocus(); // Test the table name for spaces - String sTblName = m_pNameED->GetText(); - if(sTblName.Search(' ') != STRING_NOTFOUND) + OUString sTblName = m_pNameED->GetText(); + if(sTblName.indexOf(' ') != -1) { InfoBox(this, SW_RES(MSG_WRONG_TABLENAME)).Execute(); m_pNameED->GrabFocus(); @@ -863,8 +863,8 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox ) } for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ ) { - String sEntry = OUString('~'); - String sIndex = OUString::number( aValueTbl[i] + 1 ); + OUString sEntry('~'); + OUString sIndex = OUString::number( aValueTbl[i] + 1 ); sEntry += sIndex; m_pTextArr[i]->SetText( sEntry ); @@ -1381,7 +1381,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) m_pPageCollLB->GetSelectEntryPos() != m_pPageCollLB->GetSavedValue() ) || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) ) { - String sPage; + OUString sPage; if ( bState ) { @@ -1480,7 +1480,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pPageCollLB->InsertEntry(rPageDesc.GetName()); } - String aFmtName; + OUString aFmtName; for(i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i) if( LISTBOX_ENTRY_NOTFOUND == m_pPageCollLB->GetEntryPos( aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) )) @@ -1513,12 +1513,12 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) { if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, sal_False, &pItem )) { - String sPageDesc; + OUString sPageDesc; const SwPageDesc* pDesc = ((const SwFmtPageDesc*)pItem)->GetPageDesc(); m_pPageNoNF->SetValue(((const SwFmtPageDesc*)pItem)->GetNumOffset()); if(pDesc) sPageDesc = pDesc->GetName(); - if ( sPageDesc.Len() && + if ( !sPageDesc.isEmpty() && m_pPageCollLB->GetEntryPos( sPageDesc ) != LISTBOX_ENTRY_NOTFOUND ) { m_pPageCollLB->SelectEntry( sPageDesc ); -- cgit