[Libreoffice-commits] core.git: chart2/qa chart2/source comphelper/qa compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source helpcompiler/source i18npool/qa i18npool/source idl/source include/rtl jvmfwk/plugins oox/source opencl/source package/qa package/source sal/qa scaddins/source sc/qa sc/source sd/source sfx2/source starmath/source stoc/source svl/qa svl/source svtools/source svx/source sw/qa sw/source test/source unoidl/source unotools/source vcl/source vcl/unx vcl/win winaccessibility/source writerfilter/source xmloff/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 17 05:30:12 UTC 2019
chart2/qa/extras/chart2_trendcalculators.cxx | 8 +-
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 4 -
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 4 -
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 2
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 2
comphelper/qa/string/test_string.cxx | 2
compilerplugins/clang/stringconstant.cxx | 16 ++--
connectivity/source/drivers/evoab2/NStatement.cxx | 6 -
connectivity/source/drivers/firebird/Util.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
cui/source/dialogs/FontFeaturesDialog.cxx | 2
cui/source/dialogs/hlinettp.cxx | 2
cui/source/options/optjava.cxx | 2
cui/source/options/optpath.cxx | 10 +-
cui/source/tabpages/grfpage.cxx | 4 -
dbaccess/source/ui/app/AppControllerDnD.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 6 -
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 4 -
editeng/source/items/bulitem.cxx | 2
editeng/source/items/textitem.cxx | 4 -
editeng/source/lookuptree/Trie.cxx | 2
editeng/source/outliner/outliner.cxx | 2
embeddedobj/source/msole/ownview.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
filter/source/graphicfilter/idxf/dxfreprd.cxx | 6 -
filter/source/msfilter/svdfppt.cxx | 2
forms/source/xforms/model_ui.cxx | 2
fpicker/source/office/fileview.cxx | 2
helpcompiler/source/HelpIndexer.cxx | 2
i18npool/qa/cppunit/test_breakiterator.cxx | 8 +-
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 12 +--
i18npool/source/indexentry/indexentrysupplier_default.cxx | 4 -
idl/source/prj/command.cxx | 4 -
include/rtl/stringconcat.hxx | 6 -
include/rtl/stringutils.hxx | 32 +++++---
include/rtl/ustring.hxx | 2
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 2
oox/source/core/relations.cxx | 2
oox/source/dump/dumperbase.cxx | 2
oox/source/helper/containerhelper.cxx | 2
oox/source/helper/textinputstream.cxx | 2
oox/source/vml/vmlshape.cxx | 2
opencl/source/openclconfig.cxx | 2
package/qa/cppunit/test_package.cxx | 4 -
package/source/zippackage/zipfileaccess.cxx | 2
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 28 +++----
sal/qa/rtl/uri/rtl_testuri.cxx | 14 +--
sc/qa/extras/macros-test.cxx | 2
sc/qa/unit/subsequent_export-test.cxx | 8 +-
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/source/core/data/global.cxx | 6 -
sc/source/core/data/global2.cxx | 2
sc/source/core/tool/compiler.cxx | 14 +--
sc/source/core/tool/editutil.cxx | 2
sc/source/core/tool/rangelst.cxx | 2
sc/source/core/tool/rangeutl.cxx | 2
sc/source/core/tool/unitconv.cxx | 2
sc/source/filter/excel/xehelper.cxx | 4 -
sc/source/filter/excel/xelink.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/excel/xihelper.cxx | 8 +-
sc/source/filter/excel/xiname.cxx | 2
sc/source/filter/excel/xlformula.cxx | 2
sc/source/filter/ftools/ftools.cxx | 8 +-
sc/source/filter/oox/stylesbuffer.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/filter/qpro/qpro.cxx | 2
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/dbgui/asciiopt.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/docshell/impex.cxx | 8 +-
sc/source/ui/optdlg/tpusrlst.cxx | 4 -
sc/source/ui/pagedlg/areasdlg.cxx | 6 -
sc/source/ui/vba/vbasheetobject.cxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
scaddins/source/analysis/analysishelper.cxx | 2
sd/source/core/drawdoc4.cxx | 4 -
sd/source/core/stlsheet.cxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 14 +--
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sfx2/source/appl/fileobj.cxx | 8 +-
sfx2/source/appl/linkmgr2.cxx | 6 -
starmath/source/mathtype.cxx | 34 ++++----
starmath/source/node.cxx | 2
starmath/source/ooxmlimport.cxx | 24 +++---
stoc/source/security/file_policy.cxx | 2
svl/qa/unit/svl.cxx | 8 +-
svl/qa/unit/test_lngmisc.cxx | 2
svl/source/misc/lngmisc.cxx | 4 -
svl/source/numbers/zformat.cxx | 2
svl/source/numbers/zforscan.cxx | 38 +++++-----
svl/source/passwordcontainer/passwordcontainer.cxx | 4 -
svtools/source/control/inettbc.cxx | 4 -
svtools/source/misc/langtab.cxx | 4 -
svx/source/dialog/pagectrl.cxx | 2
svx/source/gallery2/galmisc.cxx | 4 -
svx/source/items/rotmodit.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 2
svx/source/tbxctrls/layctrl.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 4 -
sw/qa/core/uwriter.cxx | 16 ++--
sw/qa/extras/odfimport/odfimport.cxx | 4 -
sw/qa/extras/uiwriter/uiwriter.cxx | 26 +++---
sw/source/core/access/accportions.cxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/doc/DocumentFieldsManager.cxx | 4 -
sw/source/core/doc/acmplwrd.cxx | 4 -
sw/source/core/doc/docfld.cxx | 10 +-
sw/source/core/doc/doctxm.cxx | 6 -
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/section.cxx | 4 -
sw/source/core/edit/autofmt.cxx | 14 +--
sw/source/core/edit/editsh.cxx | 2
sw/source/core/edit/edlingu.cxx | 4 -
sw/source/core/fields/authfld.cxx | 2
sw/source/core/fields/cellfml.cxx | 6 -
sw/source/core/fields/dbfld.cxx | 12 +--
sw/source/core/fields/ddefld.cxx | 2
sw/source/core/fields/docufld.cxx | 4 -
sw/source/core/fields/reffld.cxx | 2
sw/source/core/frmedt/fetab.cxx | 4 -
sw/source/core/graphic/ndgrf.cxx | 4 -
sw/source/core/table/swtable.cxx | 4 -
sw/source/core/text/porfld.cxx | 2
sw/source/core/tox/tox.cxx | 8 +-
sw/source/core/tox/txmsrt.cxx | 6 -
sw/source/core/txtnode/thints.cxx | 4 -
sw/source/core/undo/unins.cxx | 2
sw/source/core/undo/unovwr.cxx | 8 +-
sw/source/core/unocore/unofield.cxx | 6 -
sw/source/core/unocore/unosect.cxx | 14 +--
sw/source/filter/ascii/ascatr.cxx | 2
sw/source/filter/html/css1atr.cxx | 4 -
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlftn.cxx | 6 -
sw/source/filter/html/htmlsect.cxx | 4 -
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 6 -
sw/source/filter/ww8/ww8atr.cxx | 4 -
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 6 -
sw/source/filter/xml/xmltbli.cxx | 4 -
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 12 +--
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 30 +++----
sw/source/ui/envelp/envlop1.cxx | 4 -
sw/source/ui/fldui/changedb.cxx | 6 -
sw/source/ui/fldui/flddb.cxx | 8 +-
sw/source/ui/fldui/fldfunc.cxx | 2
sw/source/ui/fldui/fldvar.cxx | 12 +--
sw/source/ui/index/cnttab.cxx | 22 ++---
sw/source/ui/misc/bookmark.cxx | 6 -
sw/source/ui/misc/glosbib.cxx | 10 +-
sw/source/ui/misc/glossary.cxx | 6 -
sw/source/ui/vba/vbalisthelper.cxx | 2
sw/source/ui/vba/vbatablehelper.cxx | 4 -
sw/source/uibase/app/applab.cxx | 4 -
sw/source/uibase/app/docstyle.cxx | 4 -
sw/source/uibase/dbui/dbmgr.cxx | 8 +-
sw/source/uibase/dbui/mmconfigitem.cxx | 2
sw/source/uibase/dialog/regionsw.cxx | 4 -
sw/source/uibase/dochdl/gloshdl.cxx | 4 -
sw/source/uibase/docvw/edtwin.cxx | 2
sw/source/uibase/docvw/edtwin2.cxx | 2
sw/source/uibase/fldui/fldmgr.cxx | 8 +-
sw/source/uibase/misc/glosdoc.cxx | 10 +-
sw/source/uibase/ribbar/inputwin.cxx | 12 +--
sw/source/uibase/shells/textfld.cxx | 6 -
sw/source/uibase/shells/textsh2.cxx | 6 -
sw/source/uibase/sidebar/PageSizeControl.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 4 -
sw/source/uibase/utlui/content.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 4 -
sw/source/uibase/utlui/gloslst.cxx | 6 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
sw/source/uibase/wrtsh/wrtsh2.cxx | 4 -
test/source/sheet/xsheetauditing.cxx | 2
unoidl/source/sourceprovider-scanner.l | 2
unotools/source/config/bootstrap.cxx | 6 -
unotools/source/i18n/resmgr.cxx | 4 -
unotools/source/misc/datetime.cxx | 6 -
vcl/source/control/combobox.cxx | 4 -
vcl/source/control/edit.cxx | 2
vcl/source/control/quickselectionengine.cxx | 2
vcl/source/font/OpenTypeFeatureDefinitonList.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/outdev/text.cxx | 4 -
vcl/source/treelist/inetimg.cxx | 10 +-
vcl/source/uitest/logger.cxx | 4 -
vcl/source/window/mnemonic.cxx | 4 -
vcl/unx/generic/window/salframe.cxx | 2
vcl/win/window/salframe.cxx | 2
winaccessibility/source/UAccCOM/MAccessible.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
xmloff/source/style/xmlnumi.cxx | 4 -
212 files changed, 545 insertions(+), 533 deletions(-)
New commits:
commit 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 16 15:06:23 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 17 07:28:49 2019 +0200
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 at redhat.com>
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx
index a889b6637eb7..42dce791d83b 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -135,7 +135,7 @@ void Chart2TrendCalculators::testPotentialRegression2()
xValues[i] = d;
yValues[i] = -2.0 * pow ( d, 3 );
}
- checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x^3");
+ checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) +" 2 x^3");
}
// test y = - 2 X - 5
@@ -151,7 +151,7 @@ void Chart2TrendCalculators::testLinearRegression1()
xValues[i] = d;
yValues[i] = - 2.0 * d - 5.0 ;
}
- checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x "+ OUStringLiteral1(aMinusSign) +" 5");
+ checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) +" 2 x "+ OUStringChar(aMinusSign) +" 5");
}
// test y = A x ^ B
@@ -167,7 +167,7 @@ void Chart2TrendCalculators::testPolynomialRegression1()
xValues[i] = d;
yValues[i] = - 2.0 * d * d + 4 * d - 5;
}
- OUString sExpectedFormula( "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x" + OUStringLiteral1( aSuperscriptFigures[2] ) + " + 4 x "+ OUStringLiteral1(aMinusSign) +" 5" );
+ OUString sExpectedFormula( "f(x) = "+ OUStringChar(aMinusSign) +" 2 x" + OUStringChar( aSuperscriptFigures[2] ) + " + 4 x "+ OUStringChar(aMinusSign) +" 5" );
checkCalculator( xValues, yValues, sExpectedFormula );
}
@@ -198,7 +198,7 @@ void Chart2TrendCalculators::testExponentialRegression2()
xValues[i] = d;
yValues[i] = -2.0 * exp ( 0.3 * d );
}
- checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) + " 2 exp( 0.3 x )");
+ checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) + " 2 exp( 0.3 x )");
}
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 42d0480d6b73..2c2b81359355 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -179,7 +179,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation(
// if nValueLength not calculated then nullptr
sal_Int32* pValueLength = nValueLength ? &nValueLength : nullptr;
if ( m_fSign < 0.0 )
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " );
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " );
if ( bHasIntercept )
{
OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fIntercept, pValueLength );
@@ -204,7 +204,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation(
}
}
if ( m_fLogSlope < 0.0 )
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " );
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " );
if ( bHasLogSlope )
{
OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fLogSlope), pValueLength );
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index aecbc4ed39c9..d164918970ba 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -156,7 +156,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
{
if( m_fSlope < 0.0 )
{
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " );
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " );
}
if( bHasSlope )
{
@@ -175,7 +175,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
}
// add intercept value
if( m_fIntercept < 0.0 )
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " );
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " );
OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fIntercept), pValueLength );
if ( aValueString != "0" ) // aValueString may be rounded to 0 if nValueLength is small
{
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index b087fc52cede..8658f6004c1e 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -280,7 +280,7 @@ OUString PolynomialRegressionCurveCalculator::ImplGetRepresentation(
{
if ( bFindValue ) // if it is not the first aValue
aTmpBuf.append( " " );
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append(" ");
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append(" ");
aValue = - aValue;
}
else
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 16b24b47392b..abda608a3c34 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -170,7 +170,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation(
// if nValueLength not calculated then nullptr
sal_Int32* pValueLength = nValueLength ? &nValueLength : nullptr;
if ( m_fIntercept < 0.0 ) // add intercept value
- aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " );
+ aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " );
if( bHasIntercept )
{
OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fIntercept), pValueLength );
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index cacba0bab258..33424056d720 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1504,7 +1504,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
}
if( bShowCorrCoeff )
{
- aFormula.append( "R" ).append( OUStringLiteral1( aSuperscriptFigures[2] ) ).append( " = " );
+ aFormula.append( "R" ).append( OUStringChar( aSuperscriptFigures[2] ) ).append( " = " );
double fR( xRegressionCurveCalculator->getCorrelationCoefficient());
if (m_apNumberFormatterWrapper)
{
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index 47f001addcdf..08689d778d76 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -66,7 +66,7 @@ void TestString::testDecimalStringToNumber()
{
OUString s1("1234");
CPPUNIT_ASSERT_EQUAL(sal_uInt32(1234), comphelper::string::decimalStringToNumber(s1));
- s1 += OUStringLiteral1(0x07C6);
+ s1 += OUStringChar(0x07C6);
CPPUNIT_ASSERT_EQUAL(sal_uInt32(12346), comphelper::string::decimalStringToNumber(s1));
// Codepoints on 2 16bits words
sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */};
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index ed332e5644e0..309bf900e377 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -194,7 +194,7 @@ private:
enum class TreatEmpty { DefaultCtor, CheckEmpty, Error };
- enum class ChangeKind { Char, CharLen, SingleChar, OUStringLiteral1 };
+ enum class ChangeKind { Char, CharLen, SingleChar, OUStringChar };
enum class PassThrough { No, EmptyConstantString, NonEmptyConstantString };
@@ -871,10 +871,10 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
{
auto arg = expr->getArg(0);
if (loplugin::TypeCheck(arg->getType())
- .Class("OUStringLiteral1_").Namespace("rtl")
+ .Class("OUStringChar_").Namespace("rtl")
.GlobalNamespace())
{
- kind = ChangeKind::OUStringLiteral1;
+ kind = ChangeKind::OUStringChar;
pass = PassThrough::NonEmptyConstantString;
simplify = false;
} else {
@@ -1206,7 +1206,7 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
DiagnosticsEngine::Warning,
("rewrite construction of %0 with %1 in"
" call of '%2' as construction of"
- " 'OUStringLiteral1'"),
+ " 'OUStringChar'"),
getMemberLocation(expr))
<< classdecl << describeChangeKind(kind)
<< fdecl->getQualifiedNameAsString()
@@ -1331,8 +1331,8 @@ std::string StringConstant::describeChangeKind(ChangeKind kind) {
return "string constant and matching length arguments";
case ChangeKind::SingleChar:
return "sal_Unicode argument";
- case ChangeKind::OUStringLiteral1:
- return "OUStringLiteral1 argument";
+ case ChangeKind::OUStringChar:
+ return "OUStringChar argument";
}
llvm_unreachable("unknown change kind");
}
@@ -2000,12 +2000,12 @@ void StringConstant::handleStringCtor(
.Typedef(stringKind == StringKind::Unicode ? "sal_Unicode" : "char").GlobalNamespace()))
{
// It may not be easy to rewrite OUString(c), esp. given there is no
- // OUString ctor taking an OUStringLiteral1 arg, so don't warn there:
+ // OUString ctor taking an OUStringChar arg, so don't warn there:
if (!explicitFunctionalCastNotation) {
report(
DiagnosticsEngine::Warning,
("in call of '%0', replace 'OUString' constructed from a"
- " 'sal_Unicode' with an 'OUStringLiteral1'"),
+ " 'sal_Unicode' with an 'OUStringChar'"),
e3->getExprLoc())
<< callee->getQualifiedNameAsString() << expr->getSourceRange();
}
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 8f6d7959f222..e7f9dd6b794e 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -361,7 +361,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
OUString aMatchString = pAtom->getTokenValue();
// Determine where '%' character is...
- if( aMatchString == OUStringLiteral1(WILDCARD) )
+ if( aMatchString == OUStringChar(WILDCARD) )
{
// String containing only a '%' and nothing else matches everything
pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS,
@@ -381,7 +381,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
}
else if( aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) )
{ // One occurrence of '%' matches...
- if ( aMatchString.startsWith(OUStringLiteral1(WILDCARD)) )
+ if ( aMatchString.startsWith(OUStringChar(WILDCARD)) )
pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) );
else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 )
pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH, aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
@@ -389,7 +389,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
m_xConnection->throwGenericSQLException(STR_QUERY_LIKE_WILDCARD,*this);
}
else if( aMatchString.getLength() >= 3 &&
- aMatchString.startsWith(OUStringLiteral1(WILDCARD)) &&
+ aMatchString.startsWith(OUStringChar(WILDCARD)) &&
aMatchString.indexOf ( WILDCARD, 1) == aMatchString.getLength() - 1 ) {
// one '%' at the start and another at the end
pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, aMatchString.copy (1, aMatchString.getLength() - 2) );
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index 0c63c048d32e..c4d6eeece4d1 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -395,7 +395,7 @@ OUString firebird::escapeWith( const OUString& sText, const char aKey, const cha
while( (aIndex = sRet.indexOf(aKey, aIndex)) > 0 &&
aIndex < sRet.getLength())
{
- sRet = sRet.replaceAt(aIndex, 1, OUStringLiteral1(aEscapeChar) + OUStringLiteral1(aKey) );
+ sRet = sRet.replaceAt(aIndex, 1, OUStringChar(aEscapeChar) + OUStringChar(aKey) );
aIndex+= 2;
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 0e2290dddc91..05ac29b79ff2 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -673,7 +673,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
else
{
if ( cThousandDelimiter )
- aStrConverted = aStr.replaceAll(OUStringLiteral1(cThousandDelimiter), "");
+ aStrConverted = aStr.replaceAll(OUStringChar(cThousandDelimiter), "");
else
aStrConverted = aStr;
}
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 6e9831561ce0..20ac4b67e3c8 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -207,7 +207,7 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
sResultFontName = vcl::font::trimFontNameFeatures(m_sFontName);
if (!sNameSuffix.isEmpty())
sResultFontName
- += OUStringLiteral1(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear();
+ += OUStringChar(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear();
return sResultFontName;
}
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 4867a43bbe00..18df910f6054 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -376,7 +376,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( const OUString& aStrMark )
if( nPos != -1 )
aStrURL = aStrURL.copy(0, nPos);
- aStrURL += OUStringLiteral1(sUHash) + aStrMark;
+ aStrURL += OUStringChar(sUHash) + aStrMark;
m_xCbbTarget->set_entry_text(aStrURL);
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index bd88d04f7ce5..1073b71b23b6 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -155,7 +155,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::TreeView&, void)
OUString sLocation = m_xJavaList->get_selected_id();
OUString sInfo = m_sInstallText;
// tdf#80646 insert LTR mark after label
- sInfo += OUStringLiteral1(0x200E);
+ sInfo += OUStringChar(0x200E);
sInfo += sLocation;
m_xJavaPathText->set_label(sInfo);
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 73110b9e193f..b287852f2329 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -292,7 +292,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
OUString sTmpPath = sUser;
if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
- sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sTmpPath += OUStringChar(MULTIPATH_DELIMITER);
sTmpPath += sWritable;
const OUString aValue = Convert_Impl( sTmpPath );
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, weld::Button&, void)
if ( !bFound )
{
if ( !sTemp.isEmpty() )
- sTemp += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sTemp += OUStringChar(MULTIPATH_DELIMITER);
sTemp += sOnePath;
}
}
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void)
OUString sPath( sUser );
if ( !sPath.isEmpty() )
- sPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sPath += OUStringChar(MULTIPATH_DELIMITER);
sPath += sWritable;
pMultiDlg->SetPath( sPath );
@@ -514,12 +514,12 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void)
break;
}
if ( !sUser.isEmpty() )
- sUser += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sUser += OUStringChar(MULTIPATH_DELIMITER);
sUser += sToken;
}
sFullPath = sUser;
if ( !sFullPath.isEmpty() )
- sFullPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sFullPath += OUStringChar(MULTIPATH_DELIMITER);
sFullPath += sWritable;
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index f76d2da53fe2..b63f04ecb0c7 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -635,7 +635,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
OUString sTemp = aFld->GetText();
aFld->SetValue( aFld->Normalize( aOrigSize.Height() ), eUnit );
// multiplication sign (U+00D7)
- sTemp += OUStringLiteral1(0x00D7) + aFld->GetText();
+ sTemp += OUStringChar(0x00D7) + aFld->GetText();
if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) {
sal_Int32 ax = sal_Int32(floor(static_cast<float>(aOrigPixelSize.Width()) /
@@ -645,7 +645,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
sTemp += " " + CuiResId( RID_SVXSTR_PPI );
OUString sPPI = OUString::number(ax);
if (abs(ax - ay) > 1) {
- sPPI += OUStringLiteral1(0x00D7) + OUString::number(ay);
+ sPPI += OUStringChar(0x00D7) + OUString::number(ay);
}
sTemp = sTemp.replaceAll("%1", sPPI);
}
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index ae1d4725c205..52bcae8d53bd 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -241,7 +241,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const std::vecto
// which may also be a part of the list
// #i33353#
OSL_ENSURE( aThisRound->getLength() - 1 >= 0, "OApplicationController::deleteObjects: empty name?" );
- OUString sSmallestSiblingName = *aThisRound + OUStringLiteral1( sal_Unicode( '/' + 1) );
+ OUString sSmallestSiblingName = *aThisRound + OUStringChar( sal_Unicode( '/' + 1) );
std::set< OUString >::const_iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName );
for ( std::set< OUString >::const_iterator aObsolete = aThisRound;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index ff1b9dc6e0bf..aea709bc8c6e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -107,7 +107,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
{
++(*pIndex);
dp_misc::TRACE(__FILE__ ": identified option \'\'"
- + OUStringLiteral1( option_info->m_short_option ) + "\n");
+ + OUStringChar( option_info->m_short_option ) + "\n");
return true;
}
if (arg[ 1 ] == '-' && rtl_ustr_ascii_compare(
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 048f757542fe..c85cc3c9a589 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -719,11 +719,11 @@ namespace accessibility
//or at the end of the result string.
if ( bStart )
{
- aRes.insert(0, OUStringLiteral1(cNewLine));
+ aRes.insert(0, OUStringChar(cNewLine));
}
if ( bEnd )
{
- aRes.append(OUStringLiteral1(cNewLine));
+ aRes.append(OUStringChar(cNewLine));
}
return aRes.makeStringAndClear();
}
@@ -859,7 +859,7 @@ namespace accessibility
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
if ( bLineBreak )
{
- aResult.SegmentText = OUStringLiteral1(cNewLine) + aResult.SegmentText;
+ aResult.SegmentText = OUStringChar(cNewLine) + aResult.SegmentText;
}
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index d787bc65628c..7d72d45c3194 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2145,7 +2145,7 @@ void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
{
pImpEditEngine->aWordDelimiters = rDelimiters;
if (pImpEditEngine->aWordDelimiters.indexOf(CH_FEATURE) == -1)
- pImpEditEngine->aWordDelimiters += OUStringLiteral1(CH_FEATURE);
+ pImpEditEngine->aWordDelimiters += OUStringChar(CH_FEATURE);
}
const OUString& EditEngine::GetWordDelimiters() const
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 1137a1447e61..5006cd620d18 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1620,7 +1620,7 @@ void ImpEditView::Paste( css::uno::Reference< css::datatransfer::clipboard::XCli
OUString aTmpText;
aData >>= aTmpText;
OUString aText(convertLineEnd(aTmpText, LINEEND_LF));
- aText = aText.replaceAll( OUStringLiteral1(LINE_SEP), " " );
+ aText = aText.replaceAll( OUStringChar(LINE_SEP), " " );
aSel = pEditEngine->InsertText(aSel, aText);
}
catch( ... )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 846687d763f8..826bdea59998 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3365,7 +3365,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
{
if ( rTextPortion.GetExtraValue() )
aText = OUString(rTextPortion.GetExtraValue());
- aText += OUStringLiteral1(CH_HYPH);
+ aText += OUStringChar(CH_HYPH);
nTextStart = 0;
nTextLen = aText.getLength();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 8a35b36c8beb..f1cb5072735b 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1830,7 +1830,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
if ( cNext == '.' )
{
aCurSel.Max().SetIndex( aCurSel.Max().GetIndex()+1 );
- aWord += OUStringLiteral1(cNext);
+ aWord += OUStringChar(cNext);
}
}
@@ -1880,7 +1880,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r
if ( cNext == '.' )
{
aCurSel.Max().SetIndex( aCurSel.Max().GetIndex()+1 );
- aWord += OUStringLiteral1(cNext);
+ aWord += OUStringChar(cNext);
}
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 97b9b5370064..2b87196da1b6 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -122,7 +122,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
OUString SvxBulletItem::GetFullText() const
{
- return aPrevText + OUStringLiteral1(cSymbol) + aFollowText;
+ return aPrevText + OUStringChar(cSymbol) + aFollowText;
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ae7239a8e878..afd053da51e7 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2163,9 +2163,9 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
{
rText = EditResId( RID_SVXITEMS_TWOLINES );
if( GetStartBracket() )
- rText = OUStringLiteral1(GetStartBracket()) + rText;
+ rText = OUStringChar(GetStartBracket()) + rText;
if( GetEndBracket() )
- rText += OUStringLiteral1(GetEndBracket());
+ rText += OUStringChar(GetEndBracket());
}
return true;
}
diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx
index 184330ef4f2f..87a285fcdddc 100644
--- a/editeng/source/lookuptree/Trie.cxx
+++ b/editeng/source/lookuptree/Trie.cxx
@@ -99,7 +99,7 @@ void TrieNode::collectSuggestions(const OUString& sPath, vector<OUString>& rSugg
void TrieNode::collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector<OUString>& rSuggestionList)
{
- OUString aStringPath = sPath + OUStringLiteral1(pCurrent->mCharacter);
+ OUString aStringPath = sPath + OUStringChar(pCurrent->mCharacter);
if(pCurrent->mMarker)
{
rSuggestionList.push_back(aStringPath);
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index c6116b3b9520..e841c1fac408 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1846,7 +1846,7 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec
aBulletText += pFmt->GetPrefix();
if( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
{
- aBulletText += OUStringLiteral1(pFmt->GetBulletChar());
+ aBulletText += OUStringChar(pFmt->GetBulletChar());
}
else if( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE )
{
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 306f51dfe973..244ab320e270 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -289,7 +289,7 @@ bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io::XI
aReadSeq[0] == '.'
)
{
- aFileSuffix += OUStringLiteral1( aReadSeq[0] );
+ aFileSuffix += OUStringChar( aReadSeq[0] );
}
} while( aReadSeq[0] );
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index cd25a2b3b656..e368bdf5f100 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -209,7 +209,7 @@ namespace pcr
OUString lcl_getEventPropertyName( const OUString& _rListenerClassName, const OUString& _rMethodName )
{
- return _rListenerClassName + OUStringLiteral1(';') + _rMethodName;
+ return _rListenerClassName + OUStringChar(';') + _rMethodName;
}
ScriptEventDescriptor lcl_getAssignedScriptEvent( const EventDescription& _rEvent, const std::vector< ScriptEventDescriptor >& _rAllAssignedMacros )
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 1bd789876fd4..5de89903c499 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -460,9 +460,9 @@ OUString DXFRepresentation::ToOUString(const OString& s) const
| RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR);
result = result.replaceAll("%%o", "") // Overscore - simply remove
.replaceAll("%%u", "") // Underscore - simply remove
- .replaceAll("%%d", OUStringLiteral1(0x00B0)) // Degrees symbol (°)
- .replaceAll("%%p", OUStringLiteral1(0x00B1)) // Tolerance symbol (±)
- .replaceAll("%%c", OUStringLiteral1(0x2205)) // Diameter symbol
+ .replaceAll("%%d", OUStringChar(0x00B0)) // Degrees symbol (°)
+ .replaceAll("%%p", OUStringChar(0x00B1)) // Tolerance symbol (±)
+ .replaceAll("%%c", OUStringChar(0x2205)) // Diameter symbol
.replaceAll("%%%", "%"); // Percent symbol
sal_Int32 pos = result.indexOf("%%"); // %%nnn, where nnn - 3-digit decimal ASCII code
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 9b5e83596f05..5cfa5a968650 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6848,7 +6848,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
}
else
{
- aStr.append(OUStringLiteral1(n));
+ aStr.append(OUStringChar(n));
}
}
}
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index b2ffffa2ec0c..da5674cb3b40 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -734,7 +734,7 @@ static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode )
if ( sValue.indexOf( nQuote ) >= 0 )
nQuote = '\'';
- sResult = _rxAttrNode->getName() + "=" + OUStringLiteral1(nQuote) + sValue + OUStringLiteral1(nQuote) + " ";
+ sResult = _rxAttrNode->getName() + "=" + OUStringChar(nQuote) + sValue + OUStringChar(nQuote) + " ";
}
return sResult;
}
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 09ff753dd373..36de5f043997 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -715,7 +715,7 @@ void ViewTabListBox_Impl::DoQuickSearch( sal_Unicode rChar )
bool bFound = mpParent->SearchNextEntry( mnSearchIndex, maQuickSearchText, false );
if ( !bFound && ( aLastText.getLength() == 1 ) &&
- ( aLastText == OUStringLiteral1(rChar) ) )
+ ( aLastText == OUStringChar(rChar) ) )
{
mnSearchIndex = aLastPos + 1;
maQuickSearchText = aLastText;
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index d8f0b82a4f20..198824d3b92f 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -26,7 +26,7 @@ HelpIndexer::HelpIndexer(OUString const &lang, OUString const &module,
OUString const &srcDir, OUString const &outDir)
: d_lang(lang), d_module(module)
{
- d_indexDir = outDir + OUStringLiteral1('/') + module + ".idxl";
+ d_indexDir = outDir + OUStringChar('/') + module + ".idxl";
d_captionDir = srcDir + "/caption";
d_contentDir = srcDir + "/content";
}
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index df51c575d06d..7daf9e98e573 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -280,7 +280,7 @@ void TestBreakIterator::testWordBoundaries()
if (aBreakTests[i] == 0x200B)
continue;
#endif
- OUString aTest = "Word" + OUStringLiteral1(aBreakTests[i]) + "Word";
+ OUString aTest = "Word" + OUStringChar(aBreakTests[i]) + "Word";
aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true);
switch (mode)
{
@@ -309,7 +309,7 @@ void TestBreakIterator::testWordBoundaries()
//make sure that in all cases isBeginWord and isEndWord matches getWordBoundary
for (size_t i = 0; i < SAL_N_ELEMENTS(aJoinTests); ++i)
{
- OUString aTest = "Word" + OUStringLiteral1(aJoinTests[i]) + "Word";
+ OUString aTest = "Word" + OUStringChar(aJoinTests[i]) + "Word";
aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true);
switch (mode)
{
@@ -370,7 +370,7 @@ void TestBreakIterator::testWordBoundaries()
const sal_Int32 aSinglePositions[] = {0, 1, 3, 4, 6, 7, 9, 10};
for (size_t j = 1; j < SAL_N_ELEMENTS(aTests); ++j)
{
- OUString aTest = aBase.replaceAll("xx", OUStringLiteral1(aTests[j]));
+ OUString aTest = aBase.replaceAll("xx", OUStringChar(aTests[j]));
sal_Int32 nPos = -1;
size_t i = 0;
do
@@ -395,7 +395,7 @@ void TestBreakIterator::testWordBoundaries()
const sal_Int32 aSingleQuotePositions[] = {0, 1, 9, 10};
CPPUNIT_ASSERT_EQUAL(u'\'', aTests[0]);
{
- OUString aTest = aBase.replaceAll("xx", OUStringLiteral1(aTests[0]));
+ OUString aTest = aBase.replaceAll("xx", OUStringChar(aTests[0]));
sal_Int32 nPos = -1;
size_t i = 0;
do
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 0bc9b1870116..4a44dd841791 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -364,7 +364,7 @@ void lcl_formatChars( const sal_Unicode table[], int tableSize, int n, OUString&
if( n>=tableSize ) lcl_formatChars( table, tableSize, (n-tableSize)/tableSize, s );
- s += OUStringLiteral1( table[ n % tableSize ] );
+ s += OUStringChar( table[ n % tableSize ] );
}
static
@@ -377,7 +377,7 @@ void lcl_formatChars1( const sal_Unicode table[], int tableSize, int n, OUString
int repeat_count = n / tableSize + 1;
for( int i=0; i<repeat_count; i++ )
- s += OUStringLiteral1( table[ n%tableSize ] );
+ s += OUStringChar( table[ n%tableSize ] );
}
static
@@ -389,9 +389,9 @@ void lcl_formatChars2( const sal_Unicode table_capital[], const sal_Unicode tabl
if( n>=tableSize )
{
lcl_formatChars2( table_capital, table_small, tableSize, (n-tableSize)/tableSize, s );
- s += OUStringLiteral1( table_small[ n % tableSize ] );
+ s += OUStringChar( table_small[ n % tableSize ] );
} else
- s += OUStringLiteral1( table_capital[ n % tableSize ] );
+ s += OUStringChar( table_capital[ n % tableSize ] );
}
static
@@ -401,10 +401,10 @@ void lcl_formatChars3( const sal_Unicode table_capital[], const sal_Unicode tabl
// if A=='A' then 0=>A, 1=>B, ..., 25=>Z, 26=>Aa, 27=>Bb, ...
int repeat_count = n / tableSize + 1;
- s += OUStringLiteral1( table_capital[ n%tableSize ] );
+ s += OUStringChar( table_capital[ n%tableSize ] );
for( int i=1; i<repeat_count; i++ )
- s += OUStringLiteral1( table_small[ n%tableSize ] );
+ s += OUStringChar( table_small[ n%tableSize ] );
}
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 186f3a511f59..399b19b17382 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -205,10 +205,10 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
continue;
} else if (keyStr[i] == '_') {
for (curr=keyStr[i-1]+1; curr <= keyStr[i+1]; curr++)
- skipping_chars+=OUStringLiteral1(curr);
+ skipping_chars+=OUStringChar(curr);
i+=2;
} else {
- skipping_chars+=OUStringLiteral1(keyStr[i]);
+ skipping_chars+=OUStringChar(keyStr[i]);
}
}
break;
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index b04892165057..2e09351d5d68 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -250,7 +250,7 @@ SvCommand::SvCommand( int argc, char ** argv )
{ // define include paths
OUString aName( aParam.copy( 1 ) );
if( !aPath.isEmpty() )
- aPath += OUStringLiteral1(SAL_PATHSEPARATOR);
+ aPath += OUStringChar(SAL_PATHSEPARATOR);
aPath += aName;
}
else if( aParam.startsWithIgnoreAsciiCase( "rsc" ) )
@@ -289,7 +289,7 @@ SvCommand::SvCommand( int argc, char ** argv )
if( aInc.getLength() )
{
if( !aPath.isEmpty() )
- aPath += OUStringLiteral1(SAL_PATHSEPARATOR);
+ aPath += OUStringChar(SAL_PATHSEPARATOR);
aPath += OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
}
}
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index 96b018d23d7a..588be8f0073e 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -185,10 +185,10 @@ struct ToStringHelper<sal_Unicode const[N]>
};
template<>
-struct ToStringHelper<OUStringLiteral1_>
+struct ToStringHelper<OUStringChar_>
{
- static std::size_t length(OUStringLiteral1_) { return 1; }
- static sal_Unicode * addData(sal_Unicode * buffer, OUStringLiteral1_ literal)
+ static std::size_t length(OUStringChar_) { return 1; }
+ static sal_Unicode * addData(sal_Unicode * buffer, OUStringChar_ literal)
{ return addDataHelper(buffer, &literal.c, 1); }
static bool const allowOStringConcat = false;
static bool const allowOUStringConcat = true;
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index ec8c88211593..6ea44c72d8be 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -35,7 +35,7 @@ namespace rtl
#if defined LIBO_INTERNAL_ONLY
/// @cond INTERNAL
-/** A simple wrapper around a sal_Unicode character literal.
+/** A simple wrapper around a single sal_Unicode character.
Can be useful to pass a sal_Unicode constant into an OUString-related
function that is optimized for UTF-16 string literal arguments. That is,
@@ -53,23 +53,35 @@ namespace rtl
...
if (s[i] == WILDCARD) ...
...
- if (s.endsWith(OUStringLiteral1(WILDCARD))) ...
+ if (s.endsWith(OUStringChar(WILDCARD))) ...
to avoid creating a temporary OUString instance, and instead pick the
endsWith overload actually designed to take an argument of type
sal_Unicode const[N].
- Instances of OUStringLiteral1 need to be const, as those literal-optimized
+ (Because of the above use case,
+ instances of OUStringChar need to be const, as those literal-optimized
functions take the literal argument by non-const lvalue reference, for
technical reasons.
+ For actual arrays, it is important to distinguish string literals from other char or sal_Unicode
+ arrays, which may contain junk after the first NUL character or may be non-ASCII in the case of
+ char arrays. This is not so much a concern for single char and sal_Unicode values, where NUL is
+ assumed to always be meant as an actual character.)
+
+ Can also be useful in string concatenation contexts, like in
+
+ sal_Unicode const * s = ...;
+ sal_Unicode c = ...;
+ OUString t = s + OUStringChar(c);
+
@since LibreOffice 5.0
*/
-struct SAL_WARN_UNUSED OUStringLiteral1_ {
- constexpr OUStringLiteral1_(sal_Unicode theC): c(theC) {}
+struct SAL_WARN_UNUSED OUStringChar_ {
+ constexpr OUStringChar_(sal_Unicode theC): c(theC) {}
sal_Unicode const c;
};
-using OUStringLiteral1 = OUStringLiteral1_ const;
+using OUStringChar = OUStringChar_ const;
/// @endcond
#endif
@@ -222,14 +234,14 @@ struct ConstCharArrayDetector<sal_Unicode const [N], T> {
{ return literal; }
};
template<typename T> struct ConstCharArrayDetector<
- OUStringLiteral1,
+ OUStringChar,
T>
{
using TypeUtf16 = T;
static constexpr bool const ok = true;
static constexpr std::size_t const length = 1;
static constexpr sal_Unicode const * toPointer(
- OUStringLiteral1_ const & literal)
+ OUStringChar_ const & literal)
{ return &literal.c; }
};
#endif
@@ -248,7 +260,7 @@ struct ExceptConstCharArrayDetector< const char[ N ] >
template<std::size_t N>
struct ExceptConstCharArrayDetector<sal_Unicode const[N]> {};
template<> struct ExceptConstCharArrayDetector<
- OUStringLiteral1
+ OUStringChar
>
{};
#endif
@@ -273,7 +285,7 @@ struct ExceptCharArrayDetector< const char[ N ] >
#if defined LIBO_INTERNAL_ONLY
template<std::size_t N> struct ExceptCharArrayDetector<sal_Unicode[N]> {};
template<std::size_t N> struct ExceptCharArrayDetector<sal_Unicode const[N]> {};
-template<> struct ExceptCharArrayDetector<OUStringLiteral1_> {};
+template<> struct ExceptCharArrayDetector<OUStringChar_> {};
#endif
template< typename T1, typename T2 = void >
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index a2bb6c09c086..f648cddce1d8 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -3789,7 +3789,7 @@ using ::rtl::OUStringHash;
using ::rtl::OStringToOUString;
using ::rtl::OUStringToOString;
using ::rtl::OUStringLiteral;
-using ::rtl::OUStringLiteral1;
+using ::rtl::OUStringChar;
#endif
/// @cond INTERNAL
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 199b3fcb67d0..d9c0e7d5d25f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -268,7 +268,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
{
if(c > 0)
- m_sLD_LIBRARY_PATH+= OUStringLiteral1(SAL_PATHSEPARATOR);
+ m_sLD_LIBRARY_PATH+= OUStringChar(SAL_PATHSEPARATOR);
m_sLD_LIBRARY_PATH+= usSysPath;
}
else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 5981e325f080..b9f43ac2fad5 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -141,7 +141,7 @@ OString getPluginJarPath(
if (osl_getSystemPathFromFileURL(sName.pData, & sPath2.pData)
== osl_File_E_None)
{
- sPath = sPath1 + OUStringLiteral1(SAL_PATHSEPARATOR) + sPath2;
+ sPath = sPath1 + OUStringChar(SAL_PATHSEPARATOR) + sPath2;
}
}
OSL_ASSERT(!sPath.isEmpty());
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index efd6b92d550f..c4e70d1df27b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -143,7 +143,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
{
if(c > 0)
- m_sLD_LIBRARY_PATH+= OUStringLiteral1(SAL_PATHSEPARATOR);
+ m_sLD_LIBRARY_PATH+= OUStringChar(SAL_PATHSEPARATOR);
m_sLD_LIBRARY_PATH+= usSysPath;
}
else
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 49a84d368e56..25e8646d1669 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -35,7 +35,7 @@ OUString lclRemoveFileName( const OUString& rPath )
OUString lclAppendFileName( const OUString& rPath, const OUString& rFileName )
{
return rPath.isEmpty() ? rFileName :
- rPath + OUStringLiteral1('/') + rFileName;
+ rPath + OUStringChar('/') + rFileName;
}
OUString createOfficeDocRelationTypeTransitional(const OUString& rType)
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index c1a5f04b4035..9f4d18165f10 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -2380,7 +2380,7 @@ void XmlStreamObject::implDumpText( TextInputStream& rTextStrm )
{
while( (nPos < aElem.getLength()) && (aElem[ nPos ] >= 32) ) ++nPos;
if( nPos < aElem.getLength() )
- aElem = aElem.copy( 0, nPos ) + OUStringLiteral1(' ') + aElem.copy( nPos ).trim();
+ aElem = aElem.copy( 0, nPos ) + OUStringChar(' ') + aElem.copy( nPos ).trim();
++nPos;
}
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index eea52e254ac2..32296fbbd8c8 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -86,7 +86,7 @@ OUString ContainerHelper::getUnusedName(
OUString aNewName = rSuggestedName;
sal_Int32 nIndex = -1;
while( rxNameAccess->hasByName( aNewName ) )
- aNewName = rSuggestedName + OUStringLiteral1(cSeparator) + OUString::number( nIndex++ );
+ aNewName = rSuggestedName + OUStringChar(cSeparator) + OUString::number( nIndex++ );
return aNewName;
}
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 2884bd14d99d..3d284cfc8e72 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -194,7 +194,7 @@ OUString TextInputStream::createFinalString( const OUString& rString )
if( mcPendingChar == 0 )
return rString;
- OUString aString = OUStringLiteral1( mcPendingChar ) + rString;
+ OUString aString = OUStringChar( mcPendingChar ) + rString;
mcPendingChar = 0;
return aString;
}
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index c21471e5c475..e27700fec895 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -325,7 +325,7 @@ OUString ShapeBase::getShapeName() const
{
sal_Int32 nShapeIdx = mrDrawing.getLocalShapeIndex( getShapeId() );
if( nShapeIdx > 0 )
- return aBaseName + OUStringLiteral1(' ') + OUString::number( nShapeIdx );
+ return aBaseName + OUStringChar(' ') + OUString::number( nShapeIdx );
}
return OUString();
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index 6fcd59618789..ed122749bc3a 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -83,7 +83,7 @@ OUString getToken(const OUString& string, sal_Int32& index)
result.append(std::u16string_view(token).substr(i, p - i));
if (p < token.getLength() - 2)
{
- result.append(OUStringLiteral1(token.copy(p+1, 2).toInt32(16)));
+ result.append(OUStringChar(token.copy(p+1, 2).toInt32(16)));
i = p + 3;
}
else
diff --git a/package/qa/cppunit/test_package.cxx b/package/qa/cppunit/test_package.cxx
index cf191781ad30..29a8d9281cb5 100644
--- a/package/qa/cppunit/test_package.cxx
+++ b/package/qa/cppunit/test_package.cxx
@@ -152,7 +152,7 @@ namespace
for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
{
- OUString aName = OUStringLiteral1(c) + ".txt";
+ OUString aName = OUStringChar(c) + ".txt";
uno::Reference<io::XInputStream> xStrm;
mxNA->getByName(aName) >>= xStrm;
@@ -174,7 +174,7 @@ namespace
for (char c = 'a'; c <= 'z'; ++c, ++itBuf)
{
- OUString aName = OUStringLiteral1(c) + ".txt";
+ OUString aName = OUStringChar(c) + ".txt";
uno::Reference<io::XInputStream> xStrm;
//Size of each stream is 1mb (>10000) => XBufferedThreadedStream
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index fe584deaf7d9..31e38aff1dcd 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -107,7 +107,7 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt
}
else
{
- aPattern[nInd] += OUStringLiteral1( *pString );
+ aPattern[nInd] += OUStringChar( *pString );
pString++;
}
}
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index a98401351a7f..33902e28ad3b 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -36,7 +36,7 @@ private:
void checkNonconstChar();
void checkBuffer();
void checkOUStringLiteral();
- void checkOUStringLiteral1();
+ void checkOUStringChar();
void checkUtf16();
void testcall( const char str[] );
@@ -51,7 +51,7 @@ CPPUNIT_TEST(checkExtraIntArgument);
CPPUNIT_TEST(checkNonconstChar);
CPPUNIT_TEST(checkBuffer);
CPPUNIT_TEST(checkOUStringLiteral);
-CPPUNIT_TEST(checkOUStringLiteral1);
+CPPUNIT_TEST(checkOUStringChar);
CPPUNIT_TEST(checkUtf16);
CPPUNIT_TEST_SUITE_END();
};
@@ -317,39 +317,39 @@ void test::oustring::StringLiterals::checkOUStringLiteral()
sal_Int32(5), b.lastIndexOf(rtlunittest::OUStringLiteral("ab")));
}
-void test::oustring::StringLiterals::checkOUStringLiteral1()
+void test::oustring::StringLiterals::checkOUStringChar()
{
- auto l1 = rtlunittest::OUStringLiteral1('A');
+ auto l1 = rtlunittest::OUStringChar('A');
CPPUNIT_ASSERT_EQUAL(u'A', l1.c);
char const c2 = 'A';
- auto l2 = rtlunittest::OUStringLiteral1(c2);
+ auto l2 = rtlunittest::OUStringChar(c2);
CPPUNIT_ASSERT_EQUAL(u'A', l2.c);
- char c3 = 'A'; auto l3 = rtlunittest::OUStringLiteral1(c3);
+ char c3 = 'A'; auto l3 = rtlunittest::OUStringChar(c3);
CPPUNIT_ASSERT_EQUAL(u'A', l3.c);
- auto l4 = rtlunittest::OUStringLiteral1(u'A');
+ auto l4 = rtlunittest::OUStringChar(u'A');
CPPUNIT_ASSERT_EQUAL(u'A', l4.c);
sal_Unicode const c5 = 0x100;
- auto l5 = rtlunittest::OUStringLiteral1(c5);
+ auto l5 = rtlunittest::OUStringChar(c5);
CPPUNIT_ASSERT_EQUAL(c5, l5.c);
- rtl::OUString s1{rtlunittest::OUStringLiteral1('A')};
+ rtl::OUString s1{rtlunittest::OUStringChar('A')};
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s1.getLength());
CPPUNIT_ASSERT_EQUAL(u'A', s1[0]);
CPPUNIT_ASSERT_EQUAL(
- true, rtl::OUString("A") == rtlunittest::OUStringLiteral1('A'));
+ true, rtl::OUString("A") == rtlunittest::OUStringChar('A'));
CPPUNIT_ASSERT_EQUAL(
- false, rtl::OUString("AB") == rtlunittest::OUStringLiteral1('A'));
+ false, rtl::OUString("AB") == rtlunittest::OUStringChar('A'));
CPPUNIT_ASSERT_EQUAL(
- false, rtl::OUString("A") != rtlunittest::OUStringLiteral1('A'));
+ false, rtl::OUString("A") != rtlunittest::OUStringChar('A'));
CPPUNIT_ASSERT_EQUAL(
- true, rtl::OUString("AB") != rtlunittest::OUStringLiteral1('A'));
+ true, rtl::OUString("AB") != rtlunittest::OUStringChar('A'));
- rtl::OUString s2("A" + rtlunittest::OUStringLiteral1('b'));
+ rtl::OUString s2("A" + rtlunittest::OUStringChar('b'));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), s2.getLength());
CPPUNIT_ASSERT_EQUAL(u'A', s2[0]);
CPPUNIT_ASSERT_EQUAL(u'b', s2[1]);
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index aea0d50c6c54..b69013e1ed36 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -181,10 +181,10 @@ void Test::test_Uri() {
// Check surrogate handling:
- aText1 = OUStringLiteral1(u'\xD800') + // %ED%A0%80
- OUStringLiteral1(u'\xD800') + // %F0%90%8F%BF
- OUStringLiteral1(u'\xDFFF') +
- OUStringLiteral1(u'\xDFFF') + // %ED%BF%BF
+ aText1 = OUStringChar(u'\xD800') + // %ED%A0%80
+ OUStringChar(u'\xD800') + // %F0%90%8F%BF
+ OUStringChar(u'\xDFFF') +
+ OUStringChar(u'\xDFFF') + // %ED%BF%BF
"A"; // A
aText2 = "%ED%A0%80" "%F0%90%8F%BF" "%ED%BF%BF" "A";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -208,8 +208,8 @@ void Test::test_Uri() {
aText1 = "%ed%a0%80" "%f0%90%8f%bf" "%ed%bf%bf" "A";
aText2 = "%ED%A0%80" +
- OUStringLiteral1(u'\xD800') +
- OUStringLiteral1(u'\xDFFF') +
+ OUStringChar(u'\xD800') +
+ OUStringChar(u'\xDFFF') +
"%ED%BF%BF"
"A";
CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -248,7 +248,7 @@ void Test::test_Uri() {
aText1 = "%30%C3%BF";
aText2 = "%30" +
- OUStringLiteral1(u'\x00FF');
+ OUStringChar(u'\x00FF');
CPPUNIT_ASSERT_EQUAL_MESSAGE(
"failure 18",
aText2,
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\ _€_-;_-* "- "_€_-;_- at _-" // tdf#81222
- OUString rFormatStrExpected ( "_-* #,##0\\ _" + OUStringLiteral1(cEuro) + "_-;\\-* #,##0\\ _" +
- OUStringLiteral1(cEuro) + "_-;_-* \"- \"_" + OUStringLiteral1(cEuro) + "_-;_- at _-" );
+ OUString rFormatStrExpected ( "_-* #,##0\\ _" + OUStringChar(cEuro) + "_-;\\-* #,##0\\ _" +
+ OUStringChar(cEuro) + "_-;_-* \"- \"_" + OUStringChar(cEuro) + "_-;_- at _-" );
assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[4]", "formatCode", rFormatStrExpected );
// "_-* #,##0" €"_-;\-* #,##0" €"_-;_-* "- €"_-;_- at _-");
- rFormatStrExpected = "_-* #,##0\" " + OUStringLiteral1(cEuro) + "\"_-;\\-* #,##0\" " +
- OUStringLiteral1(cEuro) + "\"_-;_-* \"- " + OUStringLiteral1(cEuro) + "\"_-;_- at _-";
+ rFormatStrExpected = "_-* #,##0\" " + OUStringChar(cEuro) + "\"_-;\\-* #,##0\" " +
+ OUStringChar(cEuro) + "\"_-;_-* \"- " + OUStringChar(cEuro) + "\"_-;_- at _-";
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 +
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index ae4b798effa8..a42c18b44d61 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2064,7 +2064,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const OUString& rRef ) const
sal_Int32 nLen = rRef.getLength();
sal_Int32 nIndex = rRef.lastIndexOf( '^' );
if( nIndex > 0 && nIndex == ( nLen - 2 ) )
- aStr = aStr.copy( 0, nLen - 2 ) + OUStringLiteral1( aStr[ nLen - 1 ] );
+ aStr = aStr.copy( 0, nLen - 2 ) + OUStringChar( aStr[ nLen - 1 ] );
if( aName == aStr )
return 0;
else
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 9edf91062a16..8820252853d4 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1075,10 +1075,10 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
switch (mePageNumType)
{
case css::style::NumberingType::CHARS_UPPER_LETTER:
- aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'A' );
+ aPageNumValue += OUStringChar( (nNum - 1) % 26 + 'A' );
break;
case css::style::NumberingType::CHARS_LOWER_LETTER:
- aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'a' );
+ aPageNumValue += OUStringChar( (nNum - 1) % 26 + 'a' );
break;
case css::style::NumberingType::ROMAN_UPPER:
bUpper = true;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 99fdd72c6940..77f7908337bc 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -614,7 +614,7 @@ struct ApiNameMap
OUString GetApiNameForHelpId(sal_uLong nId)
{
if ((nId >= HID_PSEUDOSHEET_OUTLINE1) && (nId <= HID_PSEUDOSHEET_OUTLINE9))
- return "outline" + OUStringLiteral1('1' + (nId - HID_PSEUDOSHEET_OUTLINE1));
+ return "outline" + OUStringChar('1' + (nId - HID_PSEUDOSHEET_OUTLINE1));
for (const auto& i : pApiNameMap)
if (nId == i.mnHelpId)
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 01b837c1870a..ca8dc682ea60 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -569,7 +569,7 @@ bool PPTWriterBase::GetStyleSheets()
if ( nInstance == EPP_TEXTTYPE_Body )
{
sal_Unicode cTemp = aStyle[aStyle.getLength() - 1];
- aStyle = aStyle.copy(0, aStyle.getLength() - 1) + OUStringLiteral1(++cTemp);
+ aStyle = aStyle.copy(0, aStyle.getLength() - 1) + OUStringChar(++cTemp);
if ( aXFamily->hasByName( aStyle ) )
{
aXFamily->getByName( aStyle ) >>= xStyle;
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index e7def2808185..5c141cb65103 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1032,7 +1032,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1
break;
case SVX_NUM_NUMBER_LOWER_ZH :
{
- if ( sSuffix == OUStringLiteral1(0xff0e) )
+ if ( sSuffix == OUStringChar(0xff0e) )
nMappedNumType = 0x260001; // Japanese with double-byte period.
else if ( !sSuffix.isEmpty() )
nMappedNumType = 0x1B0001; // Japanese/Korean with single-byte period.
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index d83576b80abf..08d6dac24aef 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -71,13 +71,13 @@ CopyDlg::~CopyDlg()
{
SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
OUString sStr =
- OUString::number(m_xNumFldCopies->get_value()) + OUStringLiteral1(TOKEN) +
- OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) +
- OUString::number(m_xMtrFldMoveY->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) +
- OUString::number(m_xMtrFldAngle->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) +
- OUString::number(m_xMtrFldWidth->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) +
- OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) +
- OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUStringLiteral1(TOKEN) +
+ OUString::number(m_xNumFldCopies->get_value()) + OUStringChar(TOKEN) +
+ OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
+ OUString::number(m_xMtrFldMoveY->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
+ OUString::number(m_xMtrFldAngle->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
+ OUString::number(m_xMtrFldWidth->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
+ OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
+ OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUStringChar(TOKEN) +
OUString::number(static_cast<sal_uInt32>(m_xLbEndColor->GetSelectEntryColor()));
aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sStr));
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index a908348123b8..a2b3a8cefb3c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -798,7 +798,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
OUString aTmpStr( m_xLbTreeDocument->get_selected_text() );
if( !aTmpStr.isEmpty() )
{
- aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr;
+ aStr += OUStringChar(DOCUMENT_TOKEN) + aTmpStr;
}
}
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d26132af1496..2adcd977111f 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -525,7 +525,7 @@ void SdTpOptionsMisc::SetDrawMode()
OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
{
- return OUString::number(nX) + OUStringLiteral1(TOKEN) + OUString::number(nY);
+ return OUString::number(nX) + OUStringChar(TOKEN) + OUString::number(nY);
}
bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 13904969f8e8..2e33d4a64f35 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1788,7 +1788,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_7:
case KEY_8:
case KEY_9:
- maCharBuffer += OUStringLiteral1( rKEvt.GetCharCode() );
+ maCharBuffer += OUStringChar( rKEvt.GetCharCode() );
break;
case KEY_PAGEUP:
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 744793e0626e..cb6529fcfde2 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -280,8 +280,8 @@ void SvFileObject::Edit(weld::Window* pParent, sfx2::SvBaseLink* pLink, const Li
if( !aDlg.Execute() )
{
sFile = aDlg.GetPath()
- + OUStringLiteral1(sfx2::cTokenSeparator)
- + OUStringLiteral1(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator)
+ aDlg.GetDetectedFilter();
aEndEditLink.Call( sFile );
@@ -368,8 +368,8 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, vo
if ( _pFileDlg && _pFileDlg->GetError() == ERRCODE_NONE )
{
OUString sURL( _pFileDlg->GetPath() );
- sFile = sURL + OUStringLiteral1(sfx2::cTokenSeparator)
- + OUStringLiteral1(sfx2::cTokenSeparator)
+ sFile = sURL + OUStringChar(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator)
+ impl_getFilter( sURL );
}
}
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index fa242e0c34e3..3109ac7ff28a 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -377,7 +377,7 @@ void MakeLnkName( OUString& rName, const OUString* pType, const OUString& rFile,
if( pType )
{
rName = comphelper::string::strip(*pType, ' ')
- + OUStringLiteral1(cTokenSeparator);
+ + OUStringChar(cTokenSeparator);
}
else
rName.clear();
@@ -385,11 +385,11 @@ void MakeLnkName( OUString& rName, const OUString* pType, const OUString& rFile,
rName += rFile;
rName = comphelper::string::strip(rName, ' ')
- + OUStringLiteral1(cTokenSeparator);
+ + OUStringChar(cTokenSeparator);
rName = comphelper::string::strip(rName, ' ') + rLink;
if( pFilter )
{
- rName += OUStringLiteral1(cTokenSeparator) + *pFilter;
+ rName += OUStringChar(cTokenSeparator) + *pFilter;
rName = comphelper::string::strip(rName, ' ');
}
}
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index da48da787fa5..8d785dde61c8 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -115,56 +115,56 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " rightarrow ";
else
{
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
}
break;
case 0x00fb:
if ((nVersion < 3) && (nTypeFace == 0x81))
nChar = 0xDF;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'a':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3b1;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'b':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3b2;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'l':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3bb;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'n':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3bd;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'r':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x3c1;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 'D':
if ((nVersion < 3) && (nTypeFace == 0x84))
nChar = 0x394;
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 0xa9:
if ((nVersion < 3) && (nTypeFace == 0x82))
nChar = '\'';
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
case 0x00f1:
@@ -172,7 +172,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " \\rangle ";
else
{
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
}
break;
@@ -181,7 +181,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " <= ";
else
{
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
}
break;
@@ -190,7 +190,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " drarrow ";
else
{
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
}
break;
@@ -199,7 +199,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " %OMEGA ";
else
{
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
}
break;
@@ -313,10 +313,10 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
break;
case 0x2208: // in
case 0x2209: // notin
- rRet.append(" func ").append(OUStringLiteral1(nChar)).append(" ");
+ rRet.append(" func ").append(OUStringChar(nChar)).append(" ");
break;
case 0x220d: // owns
- rRet.append(" func ").append(OUStringLiteral1(0x220b)).append(" ");
+ rRet.append(" func ").append(OUStringChar(0x220b)).append(" ");
break;
case 0x220f:
pC = " prod ";
@@ -429,7 +429,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
case 0x2289: // nsupseteq
case 0x22b2: // NORMAL SUBGROUP OF
case 0x22b3: // CONTAINS AS NORMAL SUBGROUP
- rRet.append(" func ").append(OUStringLiteral1(nChar)).append(" ");
+ rRet.append(" func ").append(OUStringChar(nChar)).append(" ");
break;
case 0x22a5:
pC = " ortho ";
@@ -500,7 +500,7 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer &rRet,sal_uInt8 nVers
pC = " %OMEGA ";
break;
default:
- rRet.append(OUStringLiteral1(nChar));
+ rRet.append(OUStringChar(nChar));
bRet=true;
break;
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index ca5dd1a24a4e..f8f00cd8a949 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2550,7 +2550,7 @@ void SmAttributNode::CreateTextFromNode(OUStringBuffer &rText)
rText.append("bar ");
break;
default:
- rText.append(OUStringLiteral1(nLast));
+ rText.append(OUStringChar(nLast));
break;
}
}
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 912136e69aa8..4150dcba0209 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -317,25 +317,25 @@ OUString SmOoxmlImport::handleD()
opening = "left lbrace ";
if( closing == "}" )
closing = " right rbrace";
- if( opening == OUStringLiteral1(0x27e6) )
+ if( opening == OUStringChar(0x27e6) )
opening = "left ldbracket ";
- if( closing == OUStringLiteral1(0x27e7) )
+ if( closing == OUStringChar(0x27e7) )
closing = " right rdbracket";
if( opening == "|" )
opening = "left lline ";
if( closing == "|" )
closing = " right rline";
- if (opening == OUStringLiteral1(MS_DLINE)
- || opening == OUStringLiteral1(MS_DVERTLINE))
+ if (opening == OUStringChar(MS_DLINE)
+ || opening == OUStringChar(MS_DVERTLINE))
opening = "left ldline ";
- if (closing == OUStringLiteral1(MS_DLINE)
- || closing == OUStringLiteral1(MS_DVERTLINE))
+ if (closing == OUStringChar(MS_DLINE)
+ || closing == OUStringChar(MS_DVERTLINE))
closing = " right rdline";
- if (opening == OUStringLiteral1(MS_LANGLE)
- || opening == OUStringLiteral1(MS_LMATHANGLE))
+ if (opening == OUStringChar(MS_LANGLE)
+ || opening == OUStringChar(MS_LMATHANGLE))
opening = "left langle ";
- if (closing == OUStringLiteral1(MS_RANGLE)
- || closing == OUStringLiteral1(MS_RMATHANGLE))
+ if (closing == OUStringChar(MS_RANGLE)
+ || closing == OUStringChar(MS_RMATHANGLE))
closing = " right rangle";
// use scalable brackets (the explicit "left" or "right")
if( opening == "(" || opening == "[" )
@@ -467,9 +467,9 @@ OUString SmOoxmlImport::handleGroupChr()
if( pos == bot && chr == u'\x23df')
return "{" + e + "} underbrace { }";
if( pos == top )
- return "{" + e + "} csup {" + OUStringLiteral1( chr ) + "}";
+ return "{" + e + "} csup {" + OUStringChar( chr ) + "}";
else
- return "{" + e + "} csub {" + OUStringLiteral1( chr ) + "}";
+ return "{" + e + "} csub {" + OUStringChar( chr ) + "}";
}
OUString SmOoxmlImport::handleM()
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 08d97cfdbf44..05cbddbfc4ab 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -172,7 +172,7 @@ void PolicyReader::assureToken( sal_Unicode token )
sal_Unicode c = get();
if (c == token)
return;
- OUString msg = "expected >" + OUStringLiteral1(c) + "<!";
+ OUString msg = "expected >" + OUStringChar(c) + "<!";
error( msg );
}
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index d61daae8dd30..e36136e61896 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list