diff options
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 16 | ||||
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 28 |
2 files changed, 22 insertions, 22 deletions
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 ); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 0120e01d1f02..47f4ff9ea8a5 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -67,13 +67,13 @@ private: long nDataColWidth1; long nDataColWidth2; long nRowHeight; - const String aStrJan; - const String aStrFeb; - const String aStrMar; - const String aStrNorth; - const String aStrMid; - const String aStrSouth; - const String aStrSum; + const OUString aStrJan; + const OUString aStrFeb; + const OUString aStrMar; + const OUString aStrNorth; + const OUString aStrMid; + const OUString aStrSouth; + const OUString aStrSum; SvNumberFormatter* pNumFmt; uno::Reference< i18n::XBreakIterator > m_xBreak; @@ -92,15 +92,15 @@ private: void DrawBackground(); void MakeFonts ( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont ); - String MakeNumberString( String cellString, sal_Bool bAddDec ); + OUString MakeNumberString( OUString cellString, sal_Bool bAddDec ); }; class SwStringInputDlg : public ModalDialog { public: SwStringInputDlg( Window* pParent, - const String& rTitle, - const String& rEditTitle, + const OUString& rTitle, + const OUString& rEditTitle, const OUString& rDefault ); ~SwStringInputDlg(); @@ -111,8 +111,8 @@ private: }; -SwStringInputDlg::SwStringInputDlg(Window* pParent, const String& rTitle, - const String& rEditTitle, const OUString& rDefault) +SwStringInputDlg::SwStringInputDlg(Window* pParent, const OUString& rTitle, + const OUString& rEditTitle, const OUString& rDefault) : ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui") { get<FixedText>("name")->SetText(rEditTitle); @@ -346,9 +346,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) { - OUString aMessage = aStrDelMsg ; + OUString aMessage = aStrDelMsg; aMessage += "\n\n"; - aMessage += m_pLbFormat->GetSelectEntry() ; + aMessage += m_pLbFormat->GetSelectEntry(); aMessage += "\n"; MessBox* pBox = new MessBox( this, WinBits( WB_OK_CANCEL ), |