diff options
author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-24 16:08:05 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-26 15:51:23 +0000 |
commit | 465dbaecf9890b7117a45d02ea982ef7aca32720 (patch) | |
tree | 69b31b155bc17799d260aa9addd4fb855757a42d /sc/source/ui | |
parent | 73b50b73366f069b2ba680cec35b09d566209109 (diff) |
fdo#38838 Replaced some use of (Xub)String with OUString.
Change-Id: I5a8f2d1a5762c20d21d31b04778a9e2cac8df9cb
Reviewed-on: https://gerrit.libreoffice.org/2364
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 61 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvruler.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/dbgui/imoptdlg.cxx | 23 | ||||
-rw-r--r-- | sc/source/ui/dbgui/sortkeydlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 42 | ||||
-rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/sharedocdlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/navipi/content.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworksheet.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworksheets.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh.cxx | 9 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh3.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/tabview4.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 45 |
21 files changed, 124 insertions, 192 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 4700ecb573bb..a7f9db8d2d90 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -309,40 +309,35 @@ void ScAsciiOptions::ReadFromString( const String& rString ) String ScAsciiOptions::WriteToString() const { - String aOutStr; + OUString aOutStr; // // Feld-Trenner // if ( bFixedLen ) - aOutStr.AppendAscii(pStrFix); + aOutStr += pStrFix; else if ( !aFieldSeps.Len() ) - aOutStr += '0'; + aOutStr += "0"; else { xub_StrLen nLen = aFieldSeps.Len(); for (xub_StrLen i=0; i<nLen; i++) { if (i) - aOutStr += '/'; + aOutStr += "/"; aOutStr += OUString::number(aFieldSeps.GetChar(i)); } if ( bMergeFieldSeps ) { - aOutStr += '/'; - aOutStr.AppendAscii(pStrMrg); + aOutStr += "/"; + aOutStr += pStrMrg; } } - aOutStr += ','; // Token-Ende - - // - // Text-Trenner - // - - aOutStr += OUString::number(cTextSep); - aOutStr += ','; // Token-Ende + aOutStr += "," + + // Text-Trenner + OUString::number(cTextSep) + ","; // // Zeichensatz @@ -352,14 +347,9 @@ String ScAsciiOptions::WriteToString() const aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW ); else aOutStr += ScGlobal::GetCharsetString( eCharSet ); - aOutStr += ','; // Token-Ende - - // - // Startzeile - // - - aOutStr += OUString::number(nStartRow); - aOutStr += ','; // Token-Ende + aOutStr += "," + + // Startzeile + OUString::number(nStartRow) + ","; // // Spalten-Infos @@ -369,27 +359,22 @@ String ScAsciiOptions::WriteToString() const for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++) { if (nInfo) - aOutStr += '/'; - aOutStr += OUString::number(pColStart[nInfo]); - aOutStr += '/'; - aOutStr += OUString::number(pColFormat[nInfo]); + aOutStr += "/"; + aOutStr += OUString::number(pColStart[nInfo]) + + "/" + + OUString::number(pColFormat[nInfo]); } // #i112025# the options string is used in macros and linked sheets, // so new options must be added at the end, to remain compatible - aOutStr += ','; - - // Language - aOutStr += OUString::number(eLang); - aOutStr += ','; - - // Import quoted field as text. - aOutStr += bQuotedFieldAsText ? rtl::OUString("true") : rtl::OUString("false"); - aOutStr += ','; - - // Detect special nubmers. - aOutStr += bDetectSpecialNumber ? rtl::OUString("true") : rtl::OUString("false"); + aOutStr += "," + + // Language + OUString::number(eLang) + "," + + // Import quoted field as text. + OUString::boolean( bQuotedFieldAsText ) + ","; + // Detect special numbers. + OUString::boolean( bDetectSpecialNumber ); // 9th token is used for "Save as shown" in export options // 10th token is used for "Save cell formulas" in export options diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index ffd05389b491..a077eb7efde5 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -70,16 +70,16 @@ static void load_FixedWidthList(ScCsvSplits &aSplits) } static void save_FixedWidthList(ScCsvSplits aSplits) { - String sSplits; + OUStringBuffer sSplits; // Create a semi-colon separated string to save the splits sal_uInt32 n = aSplits.Count(); for (sal_uInt32 i = 0; i < n; ++i) { - sSplits.Append( OUString::number( aSplits[i] ) ); - sSplits.Append((char)';'); + sSplits.append( OUString::number( aSplits[i] ) ); + sSplits.append(";"); } - OUString sFixedWidthLists = OUString( sSplits ); + OUString sFixedWidthLists = sSplits.makeStringAndClear(); Sequence<Any> aValues; Any *pProperties; Sequence<OUString> aNames(1); diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 8860d6ddc2c7..f1dc8de134c2 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -79,23 +79,20 @@ ScImportOptions::ScImportOptions( const String& rStr ) String ScImportOptions::BuildString() const { - String aResult; + OUString aResult; if( bFixedWidth ) - aResult.AppendAscii( pStrFix ); + aResult += pStrFix; else aResult += OUString::number(nFieldSepCode); - aResult += ','; - aResult += OUString::number(nTextSepCode); - aResult += ','; - aResult += aStrFont; - // use the same string format as ScAsciiOptions: - aResult.AppendAscii( ",1,,0," ); // first row, no column info, default language - aResult.AppendAscii(bQuoteAllText ? "true" : "false"); // same as "quoted field as text" in ScAsciiOptions - aResult.AppendAscii( ",true," ); // "detect special numbers" - aResult.AppendAscii(bSaveAsShown ? "true" : "false"); // "save as shown": not in ScAsciiOptions - aResult.AppendAscii( "," ); - aResult.AppendAscii(bSaveFormulas ? "true" : "false"); // "save formulas": not in ScAsciiOptions + aResult += "," + OUString::number(nTextSepCode) + "," + aStrFont + + // use the same string format as ScAsciiOptions: + ",1,,0," + // first row, no column info, default language + OUString::boolean( bQuoteAllText ) + // same as "quoted field as text" in ScAsciiOptions + ",true," + // "detect special numbers" + OUString::boolean( bSaveAsShown ) + // "save as shown": not in ScAsciiOptions + "," + + OUString::boolean( bSaveFormulas ); // "save formulas": not in ScAsciiOptions return aResult; } diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 944ff4220f09..18026e316389 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -90,8 +90,8 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) ScSortKeyItem* pSortKeyItem = new ScSortKeyItem(m_pBox); // Set Sort key number - String aLine = pSortKeyItem->m_pFlSort->GetText(); - aLine += OUString::number( nItemNumber ); + OUString aLine = pSortKeyItem->m_pFlSort->GetText() + + OUString::number( nItemNumber ); pSortKeyItem->m_pFlSort->SetText( aLine ); mrSortKeyItems.push_back(pSortKeyItem); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index cc474931cbeb..82687c8458c1 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -383,33 +383,32 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet vector<long> aScales(nColCount, -1); for (i=0; i<nColCount; i++) { - String aHeader = xMeta->getColumnLabel( i+1 ); + OUString aHeader = xMeta->getColumnLabel( i+1 ); switch ( pTypeArr[i] ) { case sdbc::DataType::BIT: - aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",L" )); + aHeader += ",L"; break; case sdbc::DataType::DATE: - aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",D" )); + aHeader += ",D"; break; case sdbc::DataType::LONGVARCHAR: - aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",M" )); + aHeader += ",M"; break; case sdbc::DataType::VARCHAR: - aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," )); - aHeader += OUString::number( xMeta->getColumnDisplaySize( i+1 ) ); + aHeader += ",C," + OUString::number( xMeta->getColumnDisplaySize( i+1 ) ); break; case sdbc::DataType::DECIMAL: { long nPrec = xMeta->getPrecision( i+1 ); long nScale = xMeta->getScale( i+1 ); - aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," )); - aHeader += OUString::number( - SvDbaseConverter::ConvertPrecisionToDbase( - nPrec, nScale ) ); - aHeader += ','; - aHeader += OUString::number( nScale ); + aHeader += ",N," + + OUString::number( + SvDbaseConverter::ConvertPrecisionToDbase( + nPrec, nScale ) ) + + "," + + OUString::number( nScale ); aScales[i] = nScale; } break; @@ -732,30 +731,27 @@ void lcl_GetColumnTypes( } if ( bUpdateTitles ) { // Angabe anpassen und ausgeben - String aOutString = aFieldName; + OUString aOutString = aFieldName; switch ( nDbType ) { case sdbc::DataType::BIT : - aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",L" )); + aOutString += ",L"; break; case sdbc::DataType::DATE : - aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",D" )); + aOutString += ",D"; break; case sdbc::DataType::LONGVARCHAR : - aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",M" )); + aOutString += ",M"; break; case sdbc::DataType::VARCHAR : - aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," )); - aOutString += OUString::number( nFieldLen ); + aOutString += ",C," + OUString::number( nFieldLen ); break; case sdbc::DataType::DECIMAL : - aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," )); - aOutString += OUString::number( nFieldLen ); - aOutString += ','; - aOutString += OUString::number( nPrecision ); + aOutString += ",N," + OUString::number( nFieldLen ) + + "," + OUString::number( nPrecision ); break; } - if ( !aOutString.EqualsIgnoreCaseAscii( aString ) ) + if ( !aOutString.equalsIgnoreAsciiCase( aString ) ) { pDoc->SetString( nCol, nFirstRow, nTab, aOutString ); rDocShell.PostPaint( nCol, nFirstRow, nTab, nCol, nFirstRow, nTab, PAINT_GRID ); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 1dd0fe09acd1..13776b6ec488 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -1103,11 +1103,9 @@ void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const { SfxDockingWindow::FillInfo(rInfo); Point aPoint=aPrivatSplit.GetPosPixel(); - rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "ScFuncList:(" )); - rInfo.aExtraString += OUString::number(aPoint.Y()); - rInfo.aExtraString += ';'; - rInfo.aExtraString += OUString::number(aCatBox.GetSelectEntryPos()); - rInfo.aExtraString += ')'; + rInfo.aExtraString += "ScFuncList:(" + + OUString::number(aPoint.Y()) + ";" + + OUString::number(aCatBox.GetSelectEntryPos()) + ")"; } void ScFunctionDockWin::UseSplitterInitPos() diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index b6bbbe2803ab..dbe35264d898 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -69,10 +69,8 @@ void ScSolverProgressDialog::HideTimeLimit() void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) { - String aOld = maFtTime.GetText(); - String aNew = aOld.GetToken(0,'#'); - aNew += OUString::number( nSeconds ); - aNew += aOld.GetToken(1,'#'); + OUString aOld = maFtTime.GetText(); + OUString aNew = aOld.getToken(0,'#') + OUString::number( nSeconds ) + aOld.getToken(1,'#'); maFtTime.SetText( aNew ); } diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index e87d467bd19c..efb2abbcaa11 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -124,7 +124,7 @@ void ScShareDocumentDlg::UpdateView() { if ( pUsersData[i].getLength() > SHARED_EDITTIME_ID ) { - String aUser; + OUString aUser; if ( !pUsersData[i][SHARED_OOOUSERNAME_ID].isEmpty() ) { aUser = pUsersData[i][SHARED_OOOUSERNAME_ID]; @@ -135,9 +135,7 @@ void ScShareDocumentDlg::UpdateView() } else { - aUser = maStrUnkownUser; - aUser += ' '; - aUser += OUString::number( nUnknownUser++ ); + aUser = OUString(maStrUnkownUser) + " " + OUString::number( nUnknownUser++ ); } // parse the edit time string of the format "DD.MM.YYYY hh:mm" diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 4653c359e823..d74d32decda1 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -504,27 +504,26 @@ void ScContentTree::Command( const CommandEvent& rCEvt ) void ScContentTree::RequestHelp( const HelpEvent& rHEvt ) { - sal_Bool bDone = false; + bool bDone = false; if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); SvTreeListEntry* pEntry = GetEntry( aPos ); if ( pEntry ) { - sal_Bool bRet = false; - String aHelpText; + bool bRet = false; + OUString aHelpText; SvTreeListEntry* pParent = GetParent(pEntry); if ( !pParent ) // Top-Level ? { - aHelpText = OUString::number( GetChildCount(pEntry) ); - aHelpText += ' '; - aHelpText += GetEntryText(pEntry); - bRet = sal_True; + aHelpText = OUString::number( GetChildCount(pEntry) ) + + " " + GetEntryText(pEntry); + bRet = true; } else if ( pParent == pRootNodes[SC_CONTENT_NOTE] ) { aHelpText = GetEntryText(pEntry); // Notizen als Help-Text - bRet = sal_True; + bRet = true; } else if ( pParent == pRootNodes[SC_CONTENT_AREALINK] ) { @@ -535,7 +534,7 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt ) if (pLink) { aHelpText = pLink->GetFile(); // Source-Datei als Help-Text - bRet = sal_True; + bRet = true; } } } @@ -553,7 +552,7 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt ) Rectangle aItemRect( aPos, aSize ); Help::ShowQuickHelp( this, aItemRect, aHelpText ); - bDone = sal_True; + bDone = true; } } } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index edd3e41f894b..7c41141da0e6 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3187,9 +3187,8 @@ public: { if (meOrigin != chart2::data::LabelOrigin_LONG_SIDE) { - String aString = ScGlobal::GetRscString(STR_ROW); - aString += ' '; - aString += OUString::number( nRow+1 ); + OUString aString = ScGlobal::GetRscString(STR_ROW) + + " " + OUString::number( nRow+1 ); pArr[mnCount] = aString; } else //only indices for categories diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 09af947ab0fb..e7f36f843808 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -112,14 +112,13 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); - static rtl::OUString aUnderScre( RTL_CONSTASCII_USTRINGPARAM( "_" ) ); + static OUString aUnderScore( "_" ); int currentNum =2; - aNewName = aOldName + aUnderScre+ OUString::number(currentNum) ; + aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; SCTAB nTab = 0; while ( ScVbaWorksheets::nameExists(xSpreadDoc,aNewName, nTab ) ) { - aNewName = aOldName + aUnderScre + - OUString::number(++currentNum) ; + aNewName = aOldName + aUnderScore + OUString::number(++currentNum); } } diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 707c1bc54860..a2d3524159fa 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -273,13 +273,11 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, uno::Any result; for (SCTAB i=0; i < nNewSheets; i++, nSheetName++) { - String aStringName = aStringBase; - aStringName += OUString::number(nSheetName); + OUString aStringName = aStringBase + OUString::number(nSheetName); while (m_xNameAccess->hasByName(aStringName)) { nSheetName++; - aStringName = aStringBase; - aStringName += OUString::number(nSheetName); + aStringName = aStringBase + OUString::number(nSheetName); } m_xSheets->insertNewByName(aStringName, nSheetIndex + i); result = getItemByStringIndex( aStringName ); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index ee9028e6f31c..32222b46d5b5 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -656,12 +656,9 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_DOCPOS: { - String aStr( ScGlobal::GetRscString( STR_TABLE ) ); - - aStr += ' '; - aStr += OUString::number( nTab + 1 ); - aStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " )); - aStr += OUString::number( nTabCount ); + OUString aStr = ScGlobal::GetRscString( STR_TABLE ) + + " " + OUString::number( nTab + 1 ) + + " / " + OUString::number( nTabCount ); rSet.Put( SfxStringItem( nWhich, aStr ) ); } break; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index d6a0e81ec923..4d16931094ad 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -447,8 +447,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SCTAB nDummy; do { - aName = aBaseName; - aName += OUString::number( i ); + aName = aBaseName + OUString::number( i ); if (bPrefix) bValid = pDoc->ValidNewTabName( aName ); else diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 88fb66e636d8..5e2735554f56 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -557,10 +557,9 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord ) // Pivot // -static String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) +static OUString lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) { - String aName = rPrefix; - aName += OUString::number( nNumber ); + OUString aName = rPrefix + OUString::number( nNumber ); return aName; } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 084f37db514f..f2b3ba1131ee 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1051,8 +1051,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, else nPageNo += ((long)nRowPos)*nColBreaks+nColPos; - String aThisPageStr = aPageStr; // Don't modify the original string. - aThisPageStr.SearchAndReplaceAscii("%1", OUString::number(nPageNo)); + OUString aThisPageStr = OUString(aPageStr).replaceFirst("%1", OUString::number(nPageNo)); if ( pEditEng ) { diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 033baccb84b4..b16bb417518b 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -660,15 +660,11 @@ String ScPreview::GetPosString() UpdateDrawView(); // The table eventually changes } - String aString( ScGlobal::GetRscString( STR_PAGE ) ); - aString += ' '; - aString += OUString::number(nPageNo+1); + OUString aString = ScGlobal::GetRscString( STR_PAGE ) + + " " + OUString::number(nPageNo+1); if (nTabsTested >= nTabCount) - { - aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " )); - aString += OUString::number(nTotalPages); - } + aString += " / " + OUString::number(nTotalPages); return aString; } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index cc3fcc863a2a..a8537b66268d 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -445,7 +445,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) { Point aMousePos = pScroll->OutputToNormalizedScreenPixel( pScroll->GetPointerPosPixel() ); Point aPos = pScroll->GetParent()->OutputToNormalizedScreenPixel( pScroll->GetPosPixel() ); - String aHelpStr; + OUString aHelpStr; Rectangle aRect; sal_uInt16 nAlign; @@ -456,12 +456,9 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) if( bIsDivide ) pPreview->SetPageNo( nPageNo ); - aHelpStr = ScGlobal::GetRscString( STR_PAGE ); - aHelpStr += ' '; - aHelpStr += OUString::number( nPageNo ); - - aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " )); - aHelpStr += OUString::number( nTotalPages ); + aHelpStr = ScGlobal::GetRscString( STR_PAGE ) + + " " + OUString::number( nPageNo ) + + " / " + OUString::number( nTotalPages ); } else if( nDelta > 0 ) { @@ -469,12 +466,9 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) ) pPreview->SetPageNo( nPageNo ); - aHelpStr = ScGlobal::GetRscString( STR_PAGE ); - aHelpStr += ' '; - aHelpStr += OUString::number( nPageNo+1 ); - - aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " )); - aHelpStr += OUString::number( nTotalPages ); + aHelpStr = ScGlobal::GetRscString( STR_PAGE ) + + " " + OUString::number( nPageNo+1 ) + + " / " + OUString::number( nTotalPages ); } aRect.Left() = aPos.X() - 8; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 596f990981fd..0d3c92ce8613 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1102,9 +1102,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) sal_uInt16 nAlign; if (bHoriz) { - aHelpStr = ScGlobal::GetRscString(STR_COLUMN); - aHelpStr += ' '; - aHelpStr += ScColToAlpha((SCCOL) nScrollPos); + aHelpStr = ScGlobal::GetRscString(STR_COLUMN) + + " " + ScColToAlpha((SCCOL) nScrollPos); aRect.Left() = aMousePos.X(); aRect.Top() = aPos.Y() - 4; @@ -1112,9 +1111,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) } else { - aHelpStr = ScGlobal::GetRscString(STR_ROW); - aHelpStr += ' '; - aHelpStr += OUString::number(nScrollPos + 1); + aHelpStr = ScGlobal::GetRscString(STR_ROW) + + " " + OUString::number(nScrollPos + 1); // show quicktext always inside sheet area aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8); diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 2586b9f4b209..8d8de0fa4982 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -66,11 +66,9 @@ void ScTabView::ShowRefTip() SCCOL nCols = nEndX+1-nStartX; SCROW nRows = nEndY+1-nStartY; - String aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF ); - aHelp.SearchAndReplace( rtl::OUString("%1"), - OUString::number(nRows) ); - aHelp.SearchAndReplace( rtl::OUString("%2"), - OUString::number(nCols) ); + OUString aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF ); + aHelp = aHelp.replaceFirst("%1", OUString::number(nRows) ); + aHelp = aHelp.replaceFirst("%2", OUString::number(nCols) ); ScSplitPos eWhich = aViewData.GetActivePart(); Window* pWin = pGridWin[eWhich]; @@ -252,7 +250,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { - String aHelpStr; + OUString aHelpStr; ScRange aMarkRange; aViewData.GetSimpleArea( aMarkRange ); SCCOL nEndX = aViewData.GetRefEndX(); @@ -263,10 +261,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX ); SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig SCROW nRows = nEndY + 1 - aViewData.GetRefStartY(); - aHelpStr.SearchAndReplace( rtl::OUString("%1"), - OUString::number(nRows) ); - aHelpStr.SearchAndReplace( rtl::OUString("%2"), - OUString::number(nCols) ); + aHelpStr = aHelpStr.replaceFirst("%1", OUString::number(nRows) ); + aHelpStr = aHelpStr.replaceFirst("%2", OUString::number(nCols) ); } else if ( aViewData.GetDelMark( aDelRange ) ) aHelpStr = ScGlobal::GetRscString( STR_QUICKHELP_DELETE ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 8ae56db9e2d6..746b23350fe2 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2183,21 +2183,16 @@ void ScViewData::WriteUserData(String& rData) // wenn Zeilen groesser 8192, "+" statt "/" sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); - rData = OUString::number( nZoom ); - rData += '/'; + rData = OUString::number( nZoom ) + "/"; nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator()); - rData += OUString::number( nZoom ); - rData += '/'; + rData += OUString::number( nZoom ) + "/"; if (bPagebreak) rData += '1'; else rData += '0'; - rData += ';'; - rData += OUString::number( nTabNo ); - rData += ';'; - rData.AppendAscii(RTL_CONSTASCII_STRINGPARAM( TAG_TABBARWIDTH )); - rData += OUString::number( pView->GetTabBarWidth() ); + rData += ";" + OUString::number( nTabNo ) + ";" + TAG_TABBARWIDTH + + OUString::number( pView->GetTabBarWidth() ); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) @@ -2205,24 +2200,20 @@ void ScViewData::WriteUserData(String& rData) rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen if (i < static_cast<SCTAB>(maTabData.size()) && maTabData[i]) { - sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1 + OUString cTabSep = OUString(SC_OLD_TABSEP); // wie 3.1 if ( maTabData[i]->nCurY > MAXROW_30 || maTabData[i]->nPosY[0] > MAXROW_30 || maTabData[i]->nPosY[1] > MAXROW_30 || ( maTabData[i]->eVSplitMode == SC_SPLIT_FIX && maTabData[i]->nFixPosY > MAXROW_30 ) ) { - cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen + cTabSep = OUString(SC_NEW_TABSEP); // um eine 3.1-Version nicht umzubringen } - rData += OUString::number( maTabData[i]->nCurX ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->nCurY ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->eHSplitMode ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->eVSplitMode ); - rData += cTabSep; + rData += OUString::number( maTabData[i]->nCurX ) + cTabSep + + OUString::number( maTabData[i]->nCurY ) + cTabSep + + OUString::number( maTabData[i]->eHSplitMode ) + cTabSep + + OUString::number( maTabData[i]->eVSplitMode ) + cTabSep; if ( maTabData[i]->eHSplitMode == SC_SPLIT_FIX ) rData += OUString::number( maTabData[i]->nFixPosX ); else @@ -2232,16 +2223,12 @@ void ScViewData::WriteUserData(String& rData) rData += OUString::number( maTabData[i]->nFixPosY ); else rData += OUString::number( maTabData[i]->nVSplitPos ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->eWhichActive ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->nPosX[0] ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->nPosX[1] ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->nPosY[0] ); - rData += cTabSep; - rData += OUString::number( maTabData[i]->nPosY[1] ); + rData += cTabSep + + OUString::number( maTabData[i]->eWhichActive ) + cTabSep + + OUString::number( maTabData[i]->nPosX[0] ) + cTabSep + + OUString::number( maTabData[i]->nPosX[1] ) + cTabSep + + OUString::number( maTabData[i]->nPosY[0] ) + cTabSep + + OUString::number( maTabData[i]->nPosY[1] ); } } } |