diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-16 15:06:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 07:28:49 +0200 |
commit | 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch) | |
tree | d3ec594b343f56c76056418d835d3bc7b696a9ab /sc/source/ui | |
parent | f51cd77bcecc5134e0e04c398bfb7b34eb65d68d (diff) |
Rename OUStringLiteral1 to OUStringChar
It started out as a wrapper around character literals, but has by now become a
wrapper around arbitrary single characters. Besides updating the documentation,
this change is a mechanical
for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done
Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f
Reviewed-on: https://gerrit.libreoffice.org/80892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobject.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 2 |
9 files changed, 15 insertions, 15 deletions
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 + |