diff options
Diffstat (limited to 'sc')
29 files changed, 53 insertions, 53 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index fea08dd0fa71..328cbb150baf 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -278,7 +278,7 @@ void ScMacrosTest::testVba() OUString sTempDirURL; osl::FileBase:: getTempDirURL( sTempDirURL ); osl::FileBase::getSystemPathFromFileURL( sTempDirURL, sTempDir ); - sTempDir += OUStringLiteral1(SAL_PATHDELIMITER); + sTempDir += OUStringChar(SAL_PATHDELIMITER); OUString sTestFileName("My Test WorkBook.xls"); Sequence< uno::Any > aParams; for ( size_t i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 6711b3aecabb..32dd92481c36 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -4049,12 +4049,12 @@ void ScExportTest::testEscapeCharInNumberFormatXLSX() assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[2]", "formatCode", "00\\ 00\\ 00\\ 00\\ 00"); assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[3]", "formatCode", "00\\.00\\.00\\.000\\.0"); // tdf#81939 // "_-* #,##0\ _€_-;\-* #,##0\ _€_-;_-* "- "_€_-;_-@_-" // tdf#81222 - OUString rFormatStrExpected ( "_-* #,##0\\ _" + OUStringLiteral1(cEuro) + "_-;\\-* #,##0\\ _" + - OUStringLiteral1(cEuro) + "_-;_-* \"- \"_" + OUStringLiteral1(cEuro) + "_-;_-@_-" ); + OUString rFormatStrExpected ( "_-* #,##0\\ _" + OUStringChar(cEuro) + "_-;\\-* #,##0\\ _" + + OUStringChar(cEuro) + "_-;_-* \"- \"_" + OUStringChar(cEuro) + "_-;_-@_-" ); assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[4]", "formatCode", rFormatStrExpected ); // "_-* #,##0" €"_-;\-* #,##0" €"_-;_-* "- €"_-;_-@_-"); - rFormatStrExpected = "_-* #,##0\" " + OUStringLiteral1(cEuro) + "\"_-;\\-* #,##0\" " + - OUStringLiteral1(cEuro) + "\"_-;_-* \"- " + OUStringLiteral1(cEuro) + "\"_-;_-@_-"; + rFormatStrExpected = "_-* #,##0\" " + OUStringChar(cEuro) + "\"_-;\\-* #,##0\" " + + OUStringChar(cEuro) + "\"_-;_-* \"- " + OUStringChar(cEuro) + "\"_-;_-@_-"; assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[5]", "formatCode", rFormatStrExpected ); // remove escape char in fraction assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[6]", "formatCode", "# ?/?;[RED]\\-# #/#####"); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 9f2f8854286a..b5ef29905a07 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -709,7 +709,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() for(SCROW nRow = 0; nRow < 2; ++nRow) { OUString aFormula = "=ISERROR(" + - OUStringLiteral1(static_cast<char>('A'+nCol)) + OUString::number(nRow) + + OUStringChar(static_cast<char>('A'+nCol)) + OUString::number(nRow) + ")"; rDoc.SetString(nCol, nRow + 2, 2, aFormula); CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8).getStr(), OUString("TRUE"), rDoc.GetString(nCol, nRow +2, 2)); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 14c16fde8e33..050fd823b4ee 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -694,9 +694,9 @@ void ScGlobal::AddQuotes( OUString& rString, sal_Unicode cQuote, bool bEscapeEmb pQ[0] = pQ[1] = cQuote; pQ[2] = 0; OUString aQuotes( pQ ); - rString = rString.replaceAll( OUStringLiteral1(cQuote), aQuotes); + rString = rString.replaceAll( OUStringChar(cQuote), aQuotes); } - rString = OUStringLiteral1( cQuote ) + rString + OUStringLiteral1( cQuote ); + rString = OUStringChar( cQuote ) + rString + OUStringChar( cQuote ); } void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool bUnescapeEmbedded ) @@ -710,7 +710,7 @@ void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool bUnescap pQ[0] = pQ[1] = cQuote; pQ[2] = 0; OUString aQuotes( pQ ); - rString = rString.replaceAll( aQuotes, OUStringLiteral1(cQuote)); + rString = rString.replaceAll( aQuotes, OUStringChar(cQuote)); } } } diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 228c6f422104..95c6f81dffbc 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -328,7 +328,7 @@ OUString ScGlobal::GetDocTabName( const OUString& rFileName, aDocTab = aDocTab.replaceAt( nPos, 0, "\\" ); nPos += 2; } - aDocTab += "'" + OUStringLiteral1(SC_COMPILER_FILE_TAB_SEP) + rTabName; + aDocTab += "'" + OUStringChar(SC_COMPILER_FILE_TAB_SEP) + rTabName; // "'Doc'#Tab" return aDocTab; } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 64b418ec73ee..bede44e52556 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -530,7 +530,7 @@ static bool lcl_parseExternalName( { // two consecutive quotes equal a single quote in // the file name. - aTmpFile += OUStringLiteral1(c); + aTmpFile += OUStringChar(c); cPrev = 'a'; } else @@ -551,7 +551,7 @@ static bool lcl_parseExternalName( aTmpName.append(c); // Keep the separator as part of the name. break; } - aTmpFile += OUStringLiteral1(c); + aTmpFile += OUStringChar(c); cPrev = c; } @@ -615,7 +615,7 @@ static bool lcl_parseExternalName( return false; } while (false); - aTmpFile += OUStringLiteral1(c); + aTmpFile += OUStringChar(c); } } } @@ -662,7 +662,7 @@ static OUString lcl_makeExternalNameStr(const OUString& rFile, const OUString& r OUStringBuffer aBuf(aFile.getLength() + aName.getLength() + 9); if (bODF) aBuf.append( '['); - aBuf.append( "'" ).append( aFile ).append( "'" ).append( OUStringLiteral1(cSep) ); + aBuf.append( "'" ).append( aFile ).append( "'" ).append( OUStringChar(cSep) ); if (bODF) aBuf.append( "$$'" ); aBuf.append( aName); @@ -3964,7 +3964,7 @@ void ScCompiler::AutoCorrectParsedSymbol() } else if ( c1 != cQuote && c2 == cQuote ) { // ..." - aCorrectedSymbol = OUStringLiteral1(cQuote) + aCorrectedSymbol; + aCorrectedSymbol = OUStringChar(cQuote) + aCorrectedSymbol; bCorrected = true; } else if ( nPos == 0 && (c1 == cx || c1 == cX) ) @@ -3978,13 +3978,13 @@ void ScCompiler::AutoCorrectParsedSymbol() if ( aCorrectedSymbol.indexOf(cx) >= 0 ) // At least two tokens separated by cx { // x => * sal_Unicode c = mxSymbols->getSymbolChar(ocMul); - aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUStringLiteral1(cx), OUStringLiteral1(c)); + aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUStringChar(cx), OUStringChar(c)); bCorrected = true; } if ( aCorrectedSymbol.indexOf(cX) >= 0 ) // At least two tokens separated by cX { // X => * sal_Unicode c = mxSymbols->getSymbolChar(ocMul); - aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUStringLiteral1(cX), OUStringLiteral1(c)); + aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUStringChar(cX), OUStringChar(c)); bCorrected = true; } } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index a90f29f749d0..dbbda0548754 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -735,7 +735,7 @@ static OUString lcl_GetCharStr( sal_Int32 nNo ) nCalc = nNo % coDiff; if( !nCalc ) nCalc = coDiff; - aStr = OUStringLiteral1( 'a' - 1 + nCalc ) + aStr; + aStr = OUStringChar( 'a' - 1 + nCalc ) + aStr; nNo = sal::static_int_cast<sal_Int32>( nNo - nCalc ); if( nNo ) nNo /= coDiff; diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 03ac8ebeec53..fb5434bd1cb0 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -158,7 +158,7 @@ void ScRangeList::Format( OUString& rStr, ScRefFlags nFlags, const ScDocument* p if (bFirst) bFirst = false; else - aBuf.append(OUStringLiteral1(cDelimiter)); + aBuf.append(OUStringChar(cDelimiter)); aBuf.append(r.Format(nFlags, pDoc, eConv, bFullAddressNotation)); } rStr = aBuf.makeStringAndClear(); diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index ea87576d7df5..aa2c519cd4aa 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -339,7 +339,7 @@ void ScRangeStringConverter::AssignString( if( !rNewStr.isEmpty() ) { if( !rString.isEmpty() ) - rString += OUStringLiteral1(cSeparator); + rString += OUStringChar(cSeparator); rString += rNewStr; } } diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 9451db9c1809..3d6681a5caa3 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -37,7 +37,7 @@ ScUnitConverterData::ScUnitConverterData( OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) { - return rFromUnit + OUStringLiteral1(cDelim) + rToUnit; + return rFromUnit + OUStringChar(cDelim) + rToUnit; } // ScUnitConverter diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index a6e41f742ed8..e75958935d69 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -871,7 +871,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico if( !aText.isEmpty() ) { - maHFString += "&" + OUStringLiteral1(cPortionCode) + aText; + maHFString += "&" + OUStringChar(cPortionCode) + aText; mnTotalHeight = ::std::max( mnTotalHeight, nHeight ); } } @@ -975,7 +975,7 @@ OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rA OUString XclExpUrlHelper::EncodeDde( const OUString& rApplic, const OUString& rTopic ) { - return rApplic + OUStringLiteral1(EXC_DDE_DELIM) + rTopic; + return rApplic + OUStringChar(EXC_DDE_DELIM) + rTopic; } // Cached Value Lists ========================================================= diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 6f82b438b3b0..20fe2c914553 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1457,7 +1457,7 @@ XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const OUString& r XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET ) { // reference to own sheet: \03<sheetname> - Init(OUStringLiteral1(EXC_EXTSH_TABNAME) + rTabName); + Init(OUStringChar(EXC_EXTSH_TABNAME) + rTabName); } void XclExpExternSheet::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index bd88c7e2224c..cf214285f751 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2918,7 +2918,7 @@ OUString XclImpPictureObj::GetOleStorageName() const aStrgName = mbEmbedded ? OUString(EXC_STORAGE_OLE_EMBEDDED) : OUString(EXC_STORAGE_OLE_LINKED); static const sal_Char spcHexChars[] = "0123456789ABCDEF"; for( sal_uInt8 nIndex = 32; nIndex > 0; nIndex -= 4 ) - aStrgName.append(OUStringLiteral1( spcHexChars[ ::extract_value< sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] )); + aStrgName.append(OUStringChar( spcHexChars[ ::extract_value< sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] )); } return aStrgName.makeStringAndClear(); } diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 90d0d10ea807..df62f997daa9 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -320,7 +320,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString ) InsertLineBreak(); break; default: - maCurrText.append(OUStringLiteral1(*pChar)); + maCurrText.append(OUStringChar(*pChar)); } } break; @@ -594,7 +594,7 @@ void lclAppendUrlChar( OUString& rUrl, sal_Unicode cChar ) { case '#': rUrl += "%23"; break; case '%': rUrl += "%25"; break; - default: rUrl += OUStringLiteral1( cChar ); + default: rUrl += OUStringChar( cChar ); } } @@ -688,7 +688,7 @@ void XclImpUrlHelper::DecodeUrl( rUrl += "\\"; else // control character in raw name -> DDE link { - rUrl += OUStringLiteral1(EXC_DDE_DELIM); + rUrl += OUStringChar(EXC_DDE_DELIM); eState = xlUrlRaw; } break; @@ -730,7 +730,7 @@ void XclImpUrlHelper::DecodeUrl( // --- sheet name --- case xlUrlSheetName: - rTabName += OUStringLiteral1( *pChar ); + rTabName += OUStringChar( *pChar ); break; // --- raw read mode --- diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 67a0c193b315..49885050cff0 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -108,7 +108,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : if( (GetBiff() == EXC_BIFF5) && (maXclName == XclTools::GetXclBuiltInDefName(EXC_BUILTIN_FILTERDATABASE)) ) { bBuiltIn = true; - maXclName = OUStringLiteral1(EXC_BUILTIN_FILTERDATABASE); + maXclName = OUStringChar(EXC_BUILTIN_FILTERDATABASE); } // convert Excel name to Calc name diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 99fb54a530d0..4665f6dde359 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -889,7 +889,7 @@ bool XclTokenArrayHelper::GetStringList( OUString& rStringList, const ScTokenArr } case STATE_SEP: bRet = aIt->GetOpCode() == ocSep; - if( bRet ) rStringList += OUStringLiteral1(cSep); + if( bRet ) rStringList += OUStringChar(cSep); eState = (bRet && (++aIt).Is()) ? STATE_STR : STATE_END; break; default:; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index a116d448d971..f90051af41ad 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -117,10 +117,10 @@ rtl_TextEncoding ScfTools::GetSystemTextEncoding() OUString ScfTools::GetHexStr( sal_uInt16 nValue ) { const sal_Char pHex[] = "0123456789ABCDEF"; - OUString aStr = OUStringLiteral1( pHex[ nValue >> 12 ] ) - + OUStringLiteral1( pHex[ (nValue >> 8) & 0x000F ] ) - + OUStringLiteral1( pHex[ (nValue >> 4) & 0x000F ] ) - + OUStringLiteral1( pHex[ nValue & 0x000F ] ); + OUString aStr = OUStringChar( pHex[ nValue >> 12 ] ) + + OUStringChar( pHex[ (nValue >> 8) & 0x000F ] ) + + OUStringChar( pHex[ (nValue >> 4) & 0x000F ] ) + + OUStringChar( pHex[ nValue & 0x000F ] ); return aStr; } diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 5e808c8c9a8e..a6887b7bd103 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2611,7 +2611,7 @@ void CellStyleBuffer::finalizeImport() OUString aUnusedName; do { - aUnusedName = aStyleName + OUStringLiteral1(' ') + OUString::number( ++nIndex ); + aUnusedName = aStyleName + OUStringChar(' ') + OUString::number( ++nIndex ); } while( aCellStyles.find( aUnusedName ) != aCellStyles.end() ); aCellStyles[ aUnusedName ] = rxStyle; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 5fb3dca410a1..4925c7841ee2 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -377,7 +377,7 @@ OUString findUnusedName( const ScRangeName* pRangeName, const OUString& rSuggest OUString aNewName = rSuggestedName; sal_Int32 nIndex = 0; while(pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aNewName))) - aNewName = rSuggestedName + OUStringLiteral1('_') + OUString::number( nIndex++ ); + aNewName = rSuggestedName + OUStringChar('_') + OUString::number( nIndex++ ); return aNewName; } diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 87d52e36186e..116304c5ad7e 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -182,7 +182,7 @@ ErrCode ScQProReader::parse( ScDocument *pDoc ) if( nTab < 26 ) { OUString aName; - aName += OUStringLiteral1( 'A' + nTab ); + aName += OUStringChar( 'A' + nTab ); if (!nTab) pDoc->RenameTab( nTab, aName ); else diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 6d897489bfcc..219081a0da31 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1268,7 +1268,7 @@ bool ScInputHandler::GetFuncName( OUString& aStart, OUString& aResult ) ::std::vector<sal_Unicode>::reverse_iterator rIt = aTemp.rbegin(); aResult = OUString( *rIt++ ); while ( rIt != aTemp.rend() ) - aResult += OUStringLiteral1( *rIt++ ); + aResult += OUStringChar( *rIt++ ); return true; } diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 40f62a357e63..70236bce8cbc 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -71,7 +71,7 @@ static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeF { sal_Int32 nVal = aCode.toInt32(); if ( nVal ) - aFieldSeps.append(OUStringLiteral1(nVal)); + aFieldSeps.append(OUStringChar(nVal)); } } while ( nPos >= 0 ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index b6f3b065df45..c3fa2fdc0651 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -679,7 +679,7 @@ void ScImportAsciiDlg::SetSeparators() case ' ': pCkbSpace->Check(); break; default: pCkbOther->Check(); - pEdOther->SetText( pEdOther->GetText() + OUStringLiteral1(aSep[i]) ); + pEdOther->SetText( pEdOther->GetText() + OUStringChar(aSep[i]) ); } } } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 494f0548a0c7..5f463d043de9 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -836,7 +836,7 @@ static void lcl_WriteString( SvStream& rStrm, OUString& rString, sal_Unicode cQu if (cQuote) { - rString = OUStringLiteral1(cQuote) + rString + OUStringLiteral1(cQuote); + rString = OUStringChar(cQuote) + rString + OUStringChar(cQuote); } ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); @@ -1174,7 +1174,7 @@ static bool lcl_PutString( if (nFound > 6) { sal_Unicode cDec = '.'; - OUString aT = OUStringLiteral1(cDec) + rStr.copy( nStart[6], nEnd[6]+1-nStart[6]); + OUString aT = OUStringChar(cDec) + rStr.copy( nStart[6], nEnd[6]+1-nStart[6]); rtl_math_ConversionStatus eStatus; double fV = rtl::math::stringToDouble( aT, cDec, 0, &eStatus ); if (eStatus == rtl_math_ConversionStatus_Ok) @@ -1695,7 +1695,7 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) } if( mExportTextOptions.mcSeparatorConvertTo && cSep ) - aCellStr = aCellStr.replaceAll( OUStringLiteral1(cSep), OUStringLiteral1(mExportTextOptions.mcSeparatorConvertTo) ); + aCellStr = aCellStr.replaceAll( OUStringChar(cSep), OUStringChar(mExportTextOptions.mcSeparatorConvertTo) ); if( mExportTextOptions.mbAddQuotes && ( aCellStr.indexOf( cSep ) != -1 ) ) lcl_WriteString( rStrm, aCellStr, cStr, cStr ); @@ -1728,7 +1728,7 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) } if( mExportTextOptions.mcSeparatorConvertTo && cSep ) - aCellStr = aCellStr.replaceAll( OUStringLiteral1(cSep), OUStringLiteral1(mExportTextOptions.mcSeparatorConvertTo) ); + aCellStr = aCellStr.replaceAll( OUStringChar(cSep), OUStringChar(mExportTextOptions.mcSeparatorConvertTo) ); if( mExportTextOptions.mbAddQuotes && hasLineBreaksOrSeps(aCellStr, cSep) ) lcl_WriteString( rStrm, aCellStr, cStr, cStr ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 652c4b2d0919..c50f171664fb 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -297,12 +297,12 @@ void ScTpUserLists::MakeListStr( OUString& rListStr ) sal_Int32 c = 0; while ( c < nLen ) { - rListStr += OUStringLiteral1(aStr[c]); + rListStr += OUStringChar(aStr[c]); ++c; if ((c < nLen) && (aStr[c] == cDelimiter)) { - rListStr += OUStringLiteral1(aStr[c]); + rListStr += OUStringChar(aStr[c]); while ((c < nLen) && (aStr[c] == cDelimiter)) ++c; diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 6302fc3018cb..015535adf644 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -200,7 +200,7 @@ void ScPrintAreasDlg::AddRefEntry() if (m_pRefInputEdit == m_xEdPrintArea.get()) { const sal_Unicode sep = ScCompiler::GetNativeSymbolChar(ocSep); - OUString aVal = m_xEdPrintArea->GetText() + OUStringLiteral1(sep); + OUString aVal = m_xEdPrintArea->GetText() + OUStringChar(sep); m_xEdPrintArea->SetText(aVal); sal_Int32 nLen = aVal.getLength(); @@ -268,7 +268,7 @@ void ScPrintAreasDlg::Impl_Reset() if (pPrintRange) { if ( !aStrRange.isEmpty() ) - aStrRange += OUStringLiteral1(sep); + aStrRange += OUStringChar(sep); aStrRange += pPrintRange->Format(ScRefFlags::RANGE_ABS, pDoc, eConv); } } @@ -736,7 +736,7 @@ static bool lcl_CheckRepeatString( const OUString& rStr, const ScDocument* pDoc, bEndPos = true; } else - aBuf += OUStringLiteral1(c); + aBuf += OUStringChar(c); } if (!aBuf.isEmpty()) diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 469e67027d6c..b5fdcd159c10 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -282,7 +282,7 @@ void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) { - OUString aName = implGetBaseName() + OUStringLiteral1(' ') + OUString::number( nIndex + 1 ); + OUString aName = implGetBaseName() + OUStringChar(' ') + OUString::number( nIndex + 1 ); setName( aName ); implSetDefaultProperties(); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 7530f9f1b46e..493ce87228ce 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -899,7 +899,7 @@ void ScPreviewShell::WriteUserData(OUString& rData, bool /* bBrowse */) // nPageNo rData = OUString::number(pPreview->GetZoom()) - + OUStringLiteral1(SC_USERDATA_SEP) + + OUStringChar(SC_USERDATA_SEP) + OUString::number(pPreview->GetPageNo()); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index c3e5482a8670..0eb317ff1eca 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2835,7 +2835,7 @@ void ScViewData::WriteUserData(OUString& rData) ( maTabData[i]->eVSplitMode == SC_SPLIT_FIX && maTabData[i]->nFixPosY > MAXROW_30 ) ) { - cTabSep = OUStringLiteral1(SC_NEW_TABSEP); // in order to not kill a 3.1-version + cTabSep = OUStringChar(SC_NEW_TABSEP); // in order to not kill a 3.1-version } rData += OUString::number( maTabData[i]->nCurX ) + cTabSep + |