basic/qa/cppunit/basic_coverage.cxx | 6
basic/qa/cppunit/basictest.cxx | 4
basic/qa/cppunit/test_append.cxx | 12 -
basic/qa/cppunit/test_compiler_checks.cxx | 48 ++--
basic/qa/cppunit/test_global_array.cxx | 12 -
basic/qa/cppunit/test_global_as_new.cxx | 12 -
basic/qa/cppunit/test_language_conditionals.cxx | 24 +-
basic/qa/cppunit/test_nested_struct.cxx | 40 +--
basic/qa/cppunit/test_scanner.cxx | 283 +++++++++++-------------
basic/qa/cppunit/test_tdf149714.cxx | 7
basic/qa/cppunit/test_vba.cxx | 6
basic/source/basmgr/basicmanagerrepository.cxx | 8
basic/source/basmgr/basmgr.cxx | 12 -
basic/source/classes/errobject.cxx | 6
basic/source/classes/eventatt.cxx | 10
basic/source/classes/image.cxx | 4
basic/source/classes/propacc.cxx | 2
basic/source/classes/sb.cxx | 44 +--
basic/source/classes/sbunoobj.cxx | 28 +-
basic/source/classes/sbxmod.cxx | 66 ++---
basic/source/comp/codegen.cxx | 6
basic/source/comp/dim.cxx | 12 -
basic/source/comp/exprgen.cxx | 2
basic/source/comp/exprtree.cxx | 2
basic/source/comp/io.cxx | 2
basic/source/comp/loops.cxx | 6
basic/source/comp/parser.cxx | 56 ++--
basic/source/comp/symtbl.cxx | 4
basic/source/comp/token.cxx | 2
basic/source/runtime/comenumwrapper.cxx | 4
basic/source/runtime/inputbox.cxx | 10
basic/source/runtime/iosys.cxx | 12 -
basic/source/runtime/methods.cxx | 12 -
basic/source/runtime/methods1.cxx | 28 +-
basic/source/runtime/runtime.cxx | 2
basic/source/runtime/stdobj.cxx | 4
basic/source/runtime/stdobj1.cxx | 38 +--
basic/source/sbx/sbxbase.cxx | 6
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxform.cxx | 2
basic/source/sbx/sbxobj.cxx | 2
basic/source/sbx/sbxscan.cxx | 2
basic/source/uno/dlgcont.cxx | 16 -
basic/source/uno/namecont.cxx | 62 ++---
basic/source/uno/scriptcont.cxx | 34 +-
45 files changed, 481 insertions(+), 481 deletions(-)
New commits:
commit 7d6e751faa545552de7859cd6530926676caf09f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 6 10:17:54 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 6 13:56:49 2024 +0200
loplugin:ostr basic
Change-Id: Ie5fc4676bd1cab2c0417b479bf08dda00936469a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167191
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basic/qa/cppunit/basic_coverage.cxx
b/basic/qa/cppunit/basic_coverage.cxx
index 0f0722917232..6f68e19dac4b 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -77,14 +77,14 @@ void Coverage::process_directory(const OUString& sDirName)
if (sFileURL.endsWith(".bas"))
{
MacroSnippet testMacro;
- testMacro.LoadSourceFromFile("TestUtil", sMacroUtilsURL);
- testMacro.LoadSourceFromFile("TestModule", sFileURL);
+ testMacro.LoadSourceFromFile(u"TestUtil"_ustr,
sMacroUtilsURL);
+ testMacro.LoadSourceFromFile(u"TestModule"_ustr, sFileURL);
SbxVariableRef pReturn = testMacro.Run();
CPPUNIT_ASSERT_MESSAGE("No return variable huh?",
pReturn.is());
fprintf(stderr, "macro result for %s
", OUStringToOString(sFileURL,RTL_TEXTENCODING_UTF8).getStr());
fprintf(stderr, "macro returned:
%s
",
OUStringToOString(pReturn->GetOUString(),
RTL_TEXTENCODING_UTF8).getStr());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected",
OUString("OK"),
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected",
u"OK"_ustr,
pReturn->GetOUString());
}
}
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 13dc8c72e4cb..f93961deab8a 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -30,7 +30,7 @@ MacroSnippet::MacroSnippet( const OUString& sSource )
: mbError(false)
{
InitSnippet();
- MakeModule("TestModule", sSource);
+ MakeModule(u"TestModule"_ustr, sSource);
}
MacroSnippet::MacroSnippet()
@@ -74,7 +74,7 @@ SbxVariableRef MacroSnippet::Run( const css::uno::Sequence<
css::uno::Any >& rAr
SbxVariableRef pReturn;
if ( !Compile() )
return pReturn;
- SbMethod* pMeth = mpMod.is() ? static_cast<SbMethod*>(mpMod->Find(
"doUnitTest", SbxClassType::Method )) : nullptr;
+ SbMethod* pMeth = mpMod.is() ? static_cast<SbMethod*>(mpMod->Find(
u"doUnitTest"_ustr, SbxClassType::Method )) : nullptr;
if ( pMeth )
{
if ( rArgs.hasElements() )
diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index aa3280a4ad86..d2de74167a70 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -31,18 +31,18 @@ namespace
};
OUString sTestEnableRuntime(
- "Function doUnitTest as Integer
"
+ u"Function doUnitTest as Integer
"
"Dim Enable as Integer
"
"Enable = 1
"
"Enable = Enable + 2
"
"doUnitTest = Enable
"
- "End Function
"
+ "End Function
"_ustr
);
OUString sTestDimEnable(
- "Sub doUnitTest
"
+ u"Sub doUnitTest
"
"Dim Enable as String
"
- "End Sub
"
+ "End Sub
"_ustr
);
void EnableTest::testEnableRuntime()
@@ -63,10 +63,10 @@ void EnableTest::testDimEnable()
void EnableTest::testWin64()
{
- MacroSnippet myMacro(" #If Win64
"
+ MacroSnippet myMacro(u" #If Win64
"
"Declare PtrSafe Function aht_apiGetOpenFileName Lib \"comdlg32.dll\""
"
"
- "#End if
");
+ "#End if
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("#if Win64 Declare PtrSafe causes compile error",
!myMacro.HasError() );
}
diff --git a/basic/qa/cppunit/test_compiler_checks.cxx
b/basic/qa/cppunit/test_compiler_checks.cxx
index 2b8e72997c64..06586aaa3382 100644
--- a/basic/qa/cppunit/test_compiler_checks.cxx
+++ b/basic/qa/cppunit/test_compiler_checks.cxx
@@ -14,11 +14,11 @@
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testRedefineArgument)
{
- MacroSnippet aMacro("Sub doUnitTest(argName)
"
+ MacroSnippet aMacro(u"Sub doUnitTest(argName)
"
" If False Then
"
" Dim argName
"
" End If
"
- "End Sub
");
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(aMacro.HasError());
CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED,
aMacro.getError().GetCode());
@@ -26,8 +26,8 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testRedefineArgument)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testDoubleArgument)
{
- MacroSnippet aMacro("Sub doUnitTest(argName, argName)
"
- "End Sub
");
+ MacroSnippet aMacro(u"Sub doUnitTest(argName, argName)
"
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(aMacro.HasError());
CPPUNIT_ASSERT_EQUAL(ERRCODE_BASIC_VAR_DEFINED,
aMacro.getError().GetCode());
@@ -35,81 +35,81 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testDoubleArgument)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157)
{
- MacroSnippet aMacro("Function extentComment() As Integer
"
+ MacroSnippet aMacro(u"Function extentComment() As Integer
"
" ' _
"
" If Not extentComment Then
"
" extentComment = 1
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_compatible)
{
- MacroSnippet aMacro("Option Compatible
"
+ MacroSnippet aMacro(u"Option Compatible
"
"Function extentComment() As Integer
"
" ' _
"
"
"
" If Not extentComment Then
"
" extentComment = 1
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149157_vba)
{
- MacroSnippet aMacro("Option VBASupport 1
"
+ MacroSnippet aMacro(u"Option VBASupport 1
"
"Function extentComment() As Integer
"
" ' _
"
"
"
" If Not extentComment Then
"
" extentComment = 1
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402)
{
- MacroSnippet aMacro("Function extentComment() As Integer
"
+ MacroSnippet aMacro(u"Function extentComment() As Integer
"
" ' _
"
" If Not extentComment Then
"
" extentComment = 1
"
" Else
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402_compatible)
{
- MacroSnippet aMacro("Option Compatible
"
+ MacroSnippet aMacro(u"Option Compatible
"
"Function extentComment() As Integer
"
" ' _
"
" If Not extentComment Then
"
" extentComment = 1
"
" Else
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf149402_vba)
{
- MacroSnippet aMacro("Option VBASupport 1
"
+ MacroSnippet aMacro(u"Option VBASupport 1
"
"Function extentComment() As Integer
"
" ' _
"
" If Not extentComment Then
"
" extentComment = 1
"
" Else
"
" End If
"
- "End Function
");
+ "End Function
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT(!aMacro.HasError());
}
@@ -117,11 +117,11 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testTdf149402_vba)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf93727_if)
{
// #If and #End directive
- MacroSnippet aMacro("Sub doUnitTest
"
+ MacroSnippet aMacro(u"Sub doUnitTest
"
" #If 1 = 1 Then
"
" Const a = 10
"
" #End If
"
- "End Sub
");
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("#If directive causes compile error",
!aMacro.HasError());
}
@@ -129,14 +129,14 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testTdf93727_if)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf93727_else)
{
// #Else directive
- MacroSnippet aMacro("Sub doUnitTest
"
+ MacroSnippet aMacro(u"Sub doUnitTest
"
"a = 0
"
"#If 1 = 0 Then
"
" a = 10
"
"#Else
"
" a = 20
"
"#End If
"
- "End Sub
");
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("#Else directive causes compile error",
!aMacro.HasError());
}
@@ -144,14 +144,14 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testTdf93727_else)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf93727_elseif)
{
// #ElseIf directive
- MacroSnippet aMacro("Sub doUnitTest
"
+ MacroSnippet aMacro(u"Sub doUnitTest
"
"a = 0
"
" #If 1 = 0 Then
"
" a = 10
"
" #ElseIf 2 = 2 Then
"
" a = 20
"
" #End If
"
- "End Sub
");
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("#ElseIf directive causes compile error",
!aMacro.HasError());
}
@@ -159,11 +159,11 @@ CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture,
testTdf93727_elseif)
CPPUNIT_TEST_FIXTURE(CppUnit::TestFixture, testTdf93727_const)
{
// #Const directive
- MacroSnippet aMacro("#Const MaxValue = 1000
"
+ MacroSnippet aMacro(u"#Const MaxValue = 1000
"
"Sub doUnitTest
"
" Dim value As Integer
"
" value = MaxValue
"
- "End Sub
");
+ "End Sub
"_ustr);
aMacro.Compile();
CPPUNIT_ASSERT_MESSAGE("#Const directive causes compile error",
!aMacro.HasError());
}
diff --git a/basic/qa/cppunit/test_global_array.cxx
b/basic/qa/cppunit/test_global_array.cxx
index d2dafcfbda00..3d978872245e 100644
--- a/basic/qa/cppunit/test_global_array.cxx
+++ b/basic/qa/cppunit/test_global_array.cxx
@@ -28,7 +28,7 @@ class GlobalArrayTest : public CppUnit::TestFixture
SbModuleRef Module()
{
interpreter = new StarBASIC();
- auto mod = interpreter->MakeModule("GlobalArray", R"BAS(
+ auto mod = interpreter->MakeModule(u"GlobalArray"_ustr, uR"BAS(
Type testType
iNr As Integer
@@ -49,7 +49,7 @@ Function Macro2 As String
Macro2 = aTestTypes(0).iNr & aTestTypes(0).sType & aTestTypes(1).iNr &
aTestTypes(1).sType
End Function
- )BAS");
+ )BAS"_ustr);
CPPUNIT_ASSERT(mod->Compile());
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, StarBASIC::GetErrBasic());
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, SbxBase::GetError());
@@ -61,15 +61,15 @@ End Function
void GlobalArrayTest::testMaintainsValueAcrossCalls()
{
auto m = Module();
- auto Macro1 = m->FindMethod("Macro1", SbxClassType::Method);
+ auto Macro1 = m->FindMethod(u"Macro1"_ustr, SbxClassType::Method);
CPPUNIT_ASSERT_MESSAGE("Could not Find Macro1 in module", Macro1 !=
nullptr);
// There is no SbxMethod::call(), the basic code is exercised here in the
copy ctor
SbxVariableRef returned = new SbxMethod{ *Macro1 };
CPPUNIT_ASSERT(returned->IsString());
- CPPUNIT_ASSERT_EQUAL(OUString{ "1A" }, returned->GetOUString());
+ CPPUNIT_ASSERT_EQUAL(u"1A"_ustr, returned->GetOUString());
- auto Macro2 = m->FindMethod("Macro2", SbxClassType::Method);
+ auto Macro2 = m->FindMethod(u"Macro2"_ustr, SbxClassType::Method);
CPPUNIT_ASSERT_MESSAGE("Could not Find Macro2 in module", Macro2 !=
nullptr);
returned = new SbxMethod{ *Macro2 };
CPPUNIT_ASSERT(returned->IsString());
@@ -77,7 +77,7 @@ void GlobalArrayTest::testMaintainsValueAcrossCalls()
// Without the fix in place, this test would have failed with:
// - Expected: 1A2B
// - Actual : 02B
- CPPUNIT_ASSERT_EQUAL(OUString("1A2B"), returned->GetOUString());
+ CPPUNIT_ASSERT_EQUAL(u"1A2B"_ustr, returned->GetOUString());
}
// Put the test suite in the registry
diff --git a/basic/qa/cppunit/test_global_as_new.cxx
b/basic/qa/cppunit/test_global_as_new.cxx
index 868f62d3ec15..44b767259985 100644
--- a/basic/qa/cppunit/test_global_as_new.cxx
+++ b/basic/qa/cppunit/test_global_as_new.cxx
@@ -28,7 +28,7 @@ class GlobalAsNewTest : public CppUnit::TestFixture
SbModuleRef Module()
{
interpreter = new StarBASIC();
- auto mod = interpreter->MakeModule("GlobalAsNew", R"BAS(
+ auto mod = interpreter->MakeModule(u"GlobalAsNew"_ustr, uR"BAS(
Global aDate As New "com.sun.star.util.Date"
Function GetDateAsString As String
@@ -43,7 +43,7 @@ Function SetDate
SetDate = GetDateAsString()
End Function
- )BAS");
+ )BAS"_ustr);
CPPUNIT_ASSERT(mod->Compile());
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, StarBASIC::GetErrBasic());
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, SbxBase::GetError());
@@ -55,20 +55,20 @@ End Function
void GlobalAsNewTest::testMaintainsValueAcrossCalls()
{
auto m = Module();
- auto GetDateAsString = m->FindMethod("GetDateAsString",
SbxClassType::Method);
+ auto GetDateAsString = m->FindMethod(u"GetDateAsString"_ustr,
SbxClassType::Method);
CPPUNIT_ASSERT_MESSAGE("Could not Find GetDateAsString in module",
GetDateAsString != nullptr);
// There is no SbxMethod::call(), the basic code is exercised here in the
copy ctor
SbxVariableRef returned = new SbxMethod{ *GetDateAsString };
CPPUNIT_ASSERT(returned->IsString());
//0-00-0 is the result of reading the default-initialized date
- CPPUNIT_ASSERT_EQUAL(OUString{ "0-00-0" }, returned->GetOUString());
+ CPPUNIT_ASSERT_EQUAL(u"0-00-0"_ustr, returned->GetOUString());
- auto SetDate = m->FindMethod("SetDate", SbxClassType::Method);
+ auto SetDate = m->FindMethod(u"SetDate"_ustr, SbxClassType::Method);
CPPUNIT_ASSERT_MESSAGE("Could not Find SetDate in module", SetDate !=
nullptr);
returned = new SbxMethod{ *SetDate };
CPPUNIT_ASSERT(returned->IsString());
- OUString set_val("2019-06-30");
+ OUString set_val(u"2019-06-30"_ustr);
CPPUNIT_ASSERT_EQUAL(set_val, returned->GetOUString());
returned = new SbxMethod{ *GetDateAsString };
diff --git a/basic/qa/cppunit/test_language_conditionals.cxx
b/basic/qa/cppunit/test_language_conditionals.cxx
index c35d5571e9db..d32b6c6fe144 100644
--- a/basic/qa/cppunit/test_language_conditionals.cxx
+++ b/basic/qa/cppunit/test_language_conditionals.cxx
@@ -34,7 +34,7 @@ public:
void Language_Conditionals::testIfNot()
{
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 1
"
+ MacroSnippet myMacro(u"Option VBASupport 1
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -45,14 +45,14 @@ void Language_Conditionals::testIfNot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
}
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 0
"
+ MacroSnippet myMacro(u"Option VBASupport 0
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -63,7 +63,7 @@ void Language_Conditionals::testIfNot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
@@ -74,7 +74,7 @@ void Language_Conditionals::testIfNot()
void Language_Conditionals::testIfAndNot()
{
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 1
"
+ MacroSnippet myMacro(u"Option VBASupport 1
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -87,14 +87,14 @@ void Language_Conditionals::testIfAndNot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
}
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 0
"
+ MacroSnippet myMacro(u"Option VBASupport 0
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -107,7 +107,7 @@ void Language_Conditionals::testIfAndNot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
@@ -118,7 +118,7 @@ void Language_Conditionals::testIfAndNot()
void Language_Conditionals::testNENot()
{
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 1
"
+ MacroSnippet myMacro(u"Option VBASupport 1
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -131,14 +131,14 @@ void Language_Conditionals::testNENot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(1), pNew->GetInteger());
}
{ // need a block to ensure MacroSnippet is cleaned properly
- MacroSnippet myMacro("Option VBASupport 0
"
+ MacroSnippet myMacro(u"Option VBASupport 0
"
"Option Explicit
"
"
"
"Function doUnitTest() As Integer
"
@@ -151,7 +151,7 @@ void Language_Conditionals::testNENot()
"Else
"
"doUnitTest = 0
"
"End If
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
SbxVariableRef pNew = myMacro.Run();
diff --git a/basic/qa/cppunit/test_nested_struct.cxx
b/basic/qa/cppunit/test_nested_struct.cxx
index daced48ba2bf..c7b9127592e2 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -52,19 +52,19 @@ namespace
// tests the new behaviour, we should be able to
// directly modify the value of the nested 'HorizontalLine' struct
OUString sTestSource1(
- "Function doUnitTest() as Integer
"
+ u"Function doUnitTest() as Integer
"
"Dim b0 as new \"com.sun.star.table.TableBorder\"
"
"b0.HorizontalLine.OuterLineWidth = 9
"
"doUnitTest = b0.HorizontalLine.OuterLineWidth
"
- "End Function
"
+ "End Function
"_ustr
);
OUString sTestSource1Alt(
- "Function doUnitTest() as Object
"
+ u"Function doUnitTest() as Object
"
"Dim b0 as new \"com.sun.star.table.TableBorder\"
"
"b0.HorizontalLine.OuterLineWidth = 9
"
"doUnitTest = b0
"
- "End Function
"
+ "End Function
"_ustr
);
// tests the old behaviour, we should still be able
@@ -74,23 +74,23 @@ OUString sTestSource1Alt(
// c) modifying the new instance
// d) setting b0.HorizontalLine with the value of the new instance
OUString sTestSource2(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\", l as new
\"com.sun.star.table.BorderLine\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
"b0.HorizontalLine = l
"
"doUnitTest = b0.HorizontalLine.OuterLineWidth
"
-"End Function
"
+"End Function
"_ustr
);
OUString sTestSource2Alt(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\", l as new
\"com.sun.star.table.BorderLine\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
"b0.HorizontalLine = l
"
"doUnitTest = b0
"
-"End Function
"
+"End Function
"_ustr
);
// it should be legal to assign a variant to a struct ( and copy by val )
// make sure we aren't copying by reference, we make sure that l is not
@@ -98,18 +98,18 @@ OUString sTestSource2Alt(
// OuterLineWidth of 4 & 9 respectively and we should be returning
// 13 the sum of the two ( hopefully unique values if we haven't copied by
reference )
OUString sTestSource3(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
"b0.HorizontalLine = l
"
"l.OuterLineWidth = 4
"
"doUnitTest = b0.HorizontalLine.OuterLineWidth + l.OuterLineWidth
"
-"End Function
"
+"End Function
"_ustr
);
OUString sTestSource3Alt(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
@@ -119,24 +119,24 @@ OUString sTestSource3Alt(
"result(0) = b0
"
"result(1) = l
"
"doUnitTest = result
"
-"End Function
"
+"End Function
"_ustr
);
// nearly the same as above but this time for a fixed type
// variable
OUString sTestSource4(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\", l as new
\"com.sun.star.table.BorderLine\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
"b0.HorizontalLine = l
"
"l.OuterLineWidth = 4
"
"doUnitTest = b0.HorizontalLine.OuterLineWidth + l.OuterLineWidth
"
-"End Function
"
+"End Function
"_ustr
);
OUString sTestSource4Alt(
- "Function doUnitTest()
"
+ u"Function doUnitTest()
"
"Dim b0 as new \"com.sun.star.table.TableBorder\", l as new
\"com.sun.star.table.BorderLine\"
"
"l = b0.HorizontalLine
"
"l.OuterLineWidth = 9
"
@@ -146,7 +146,7 @@ OUString sTestSource4Alt(
"result(0) = b0
"
"result(1) = l
"
"doUnitTest = result
"
-"End Function
"
+"End Function
"_ustr
);
// Although basic might appear to correctly change nested struct elements
@@ -155,13 +155,13 @@ OUString sTestSource4Alt(
// We need to additionally check the actual uno struct to see if the
// changes made are *really* reflected in the object
OUString sTestSource5(
- "Function doUnitTest() as Object
"
+ u"Function doUnitTest() as Object
"
"Dim aWinDesc as new \"com.sun.star.awt.WindowDescriptor\"
"
"Dim aRect as new \"com.sun.star.awt.Rectangle\"
"
"aRect.X = 200
"
"aWinDesc.Bounds = aRect
"
"doUnitTest = aWinDesc
"
-"End Function
"
+"End Function
"_ustr
);
@@ -300,13 +300,13 @@ void Nested_Struct::testUnoAccess()
void Nested_Struct::testTdf134576()
{
- MacroSnippet myMacro("Function doUnitTest()
"
+ MacroSnippet myMacro(u"Function doUnitTest()
"
" On Error Resume Next
"
" For Each a In b
"
" c.d
"
" Next
"
" doUnitTest = 1
"
- "End Function
");
+ "End Function
"_ustr);
myMacro.Compile();
CPPUNIT_ASSERT(!myMacro.HasError());
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index f17750c89a6e..1591ca891c85 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -106,53 +106,53 @@ std::vector<Symbol> getSymbols(const OUString& source,
bool bCompatible = false)
void ScannerTest::testBlankLines()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("");
+ symbols = getSymbols(u""_ustr);
CPPUNIT_ASSERT(symbols.empty());
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- symbols = getSymbols(" ");
+ symbols = getSymbols(u" "_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("
");
+ symbols = getSymbols(u"
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols(" ");
+ symbols = getSymbols(u" "_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -206,7 +206,7 @@ void ScannerTest::testOperators()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("==");
+ symbols = getSymbols(u"=="_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(sourceE, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -255,12 +255,12 @@ void ScannerTest::testAlphanum()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("1asfdasfd");
+ symbols = getSymbols(u"1asfdasfd"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT(symbols[0].text.isEmpty()); // Can't start symbol with a
digit
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("asfdasfd"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"asfdasfd"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[2].type);
@@ -293,33 +293,32 @@ void ScannerTest::testAlphanum()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
+ // tdf#125637 - don't change underscore to space
symbols = getSymbols(source7);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("joxclk_"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"joxclk_"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- // tdf#125637 - don't change underscore to space
- CPPUNIT_ASSERT_EQUAL(OUString("joxclk_"), source7);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols(" asdf ");
+ symbols = getSymbols(u" asdf "_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("asdf"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"asdf"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols(" 19395 asdfa ");
+ symbols = getSymbols(u" 19395 asdfa "_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT(symbols[0].text.isEmpty());
CPPUNIT_ASSERT_DOUBLES_EQUAL(19395.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("asdfa"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"asdfa"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[2].type);
- symbols = getSymbols("
1
2
a sdf");
+ symbols = getSymbols(u"
1
2
a sdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(8), symbols.size());
CPPUNIT_ASSERT_EQUAL(cr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -336,12 +335,12 @@ void ScannerTest::testAlphanum()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned
int>(symbols[5].text.getLength()));
CPPUNIT_ASSERT_EQUAL('a', static_cast<char>(symbols[5].text[0]));
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[5].type);
- CPPUNIT_ASSERT_EQUAL(OUString("sdf"), symbols[6].text);
+ CPPUNIT_ASSERT_EQUAL(u"sdf"_ustr, symbols[6].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[6].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[7].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[7].type);
- symbols = getSymbols("asdf.asdf");
+ symbols = getSymbols(u"asdf.asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -352,7 +351,7 @@ void ScannerTest::testAlphanum()
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[3].type);
- symbols = getSymbols("..");
+ symbols = getSymbols(u".."_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(dot, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -366,31 +365,31 @@ void ScannerTest::testComments()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("REM asdf");
+ symbols = getSymbols(u"REM asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(rem, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- symbols = getSymbols("REMasdf");
+ symbols = getSymbols(u"REMasdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("REMasdf"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"REMasdf"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("'asdf");
+ symbols = getSymbols(u"'asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(1), symbols.size());
CPPUNIT_ASSERT_EQUAL(rem, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- symbols = getSymbols("asdf _
'100");
+ symbols = getSymbols(u"asdf _
'100"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(rem, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("'asdf _
100");
+ symbols = getSymbols(u"'asdf _
100"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(rem, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -400,14 +399,14 @@ void ScannerTest::testComments()
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[2].type);
- symbols = getSymbols("'asdf _
'100");
+ symbols = getSymbols(u"'asdf _
'100"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(rem, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(rem, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("'asdf _
1234 _
asdf'");
+ symbols = getSymbols(u"'asdf _
1234 _
asdf'"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
CPPUNIT_ASSERT_EQUAL(rem, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
@@ -424,29 +423,29 @@ void ScannerTest::testGoto()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("goto");
+ symbols = getSymbols(u"goto"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(goto_, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- symbols = getSymbols("go to");
+ symbols = getSymbols(u"go to"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("go"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"go"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("to"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"to"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[2].type);
- symbols = getSymbols("go
to");
+ symbols = getSymbols(u"go
to"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("go"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"go"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
- CPPUNIT_ASSERT_EQUAL(OUString("to"), symbols[2].text);
+ CPPUNIT_ASSERT_EQUAL(u"to"_ustr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[2].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[3].type);
@@ -456,21 +455,21 @@ void ScannerTest::testGotoCompatible()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("goto", true);
+ symbols = getSymbols(u"goto"_ustr, true);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(goto_, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("go to", true);
+ symbols = getSymbols(u"go to"_ustr, true);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(goto_, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("go
to", true);
+ symbols = getSymbols(u"go
to"_ustr, true);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("go"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"go"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(OUString("to"), symbols[2].text);
+ CPPUNIT_ASSERT_EQUAL(u"to"_ustr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
}
@@ -478,39 +477,39 @@ void ScannerTest::testExclamation()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("asdf!asdf");
+ symbols = getSymbols(u"asdf!asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(excl, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(asdf, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
- symbols = getSymbols("!1234");
+ symbols = getSymbols(u"!1234"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(excl, symbols[0].text);
CPPUNIT_ASSERT(symbols[1].text.isEmpty());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1234.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("!_3");
+ symbols = getSymbols(u"!_3"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(excl, symbols[0].text);
- CPPUNIT_ASSERT_EQUAL(OUString("_3"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"_3"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("!$");
+ symbols = getSymbols(u"!$"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(excl, symbols[0].text);
- CPPUNIT_ASSERT_EQUAL(OUString("$"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"$"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("!%");
+ symbols = getSymbols(u"!%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(excl, symbols[0].text);
- CPPUNIT_ASSERT_EQUAL(OUString("%"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"%"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("!
");
+ symbols = getSymbols(u"!
"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(excl, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
@@ -521,14 +520,14 @@ void ScannerTest::testNumbers()
std::vector<Symbol> symbols;
sal_Int32 errors;
- symbols = getSymbols("12345", errors);
+ symbols = getSymbols(u"12345"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12345.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("1.2.3", errors);
+ symbols = getSymbols(u"1.2.3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.2, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
@@ -537,115 +536,115 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
- symbols = getSymbols("123.4", errors);
+ symbols = getSymbols(u"123.4"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(123.4, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("0.5", errors);
+ symbols = getSymbols(u"0.5"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(.5, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("5.0", errors);
+ symbols = getSymbols(u"5.0"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("0.0", errors);
+ symbols = getSymbols(u"0.0"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("-3", errors);
+ symbols = getSymbols(u"-3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("-"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"-"_ustr, symbols[0].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("-0.0", errors);
+ symbols = getSymbols(u"-0.0"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
- CPPUNIT_ASSERT_EQUAL(OUString("-"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"-"_ustr, symbols[0].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12dE3", errors);
+ symbols = getSymbols(u"12dE3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("dE3"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"dE3"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12e3", errors);
+ symbols = getSymbols(u"12e3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12000.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12D+3", errors);
+ symbols = getSymbols(u"12D+3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12000.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12e++3", errors);
+ symbols = getSymbols(u"12e++3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(6), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(12.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("e"), symbols[1].text);
- CPPUNIT_ASSERT_EQUAL(OUString("+"), symbols[2].text);
- CPPUNIT_ASSERT_EQUAL(OUString("+"), symbols[3].text);
+ CPPUNIT_ASSERT_EQUAL(u"e"_ustr, symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"+"_ustr, symbols[2].text);
+ CPPUNIT_ASSERT_EQUAL(u"+"_ustr, symbols[3].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[4].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[4].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[5].text);
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12e-3", errors);
+ symbols = getSymbols(u"12e-3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(.012, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("12e-3+", errors);
+ symbols = getSymbols(u"12e-3+"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(.012, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString("+"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"+"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("1,2,3", errors);
+ symbols = getSymbols(u"1,2,3"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(6), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
- CPPUNIT_ASSERT_EQUAL(OUString(","), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u","_ustr, symbols[1].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0, symbols[2].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[2].type);
- CPPUNIT_ASSERT_EQUAL(OUString(","), symbols[3].text);
+ CPPUNIT_ASSERT_EQUAL(u","_ustr, symbols[3].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, symbols[4].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[4].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[5].text);
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("1."
+ symbols = getSymbols(u"1."
"0000000000000000000000000000000000000000000000000000000000000000000000000"
- "000000000000000000000000000000000000000000000000000",
+
"000000000000000000000000000000000000000000000000000"_ustr,
errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[0].number, 1E-12);
@@ -655,7 +654,7 @@ void ScannerTest::testNumbers()
// the buffer is artificially constrained by the scanner.
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors)); // HACK
- symbols = getSymbols("10e308", errors);
+ symbols = getSymbols(u"10e308"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(std::numeric_limits<double>::infinity(),
symbols[0].number);
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
@@ -663,7 +662,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors)); // math
error, overflow
// trailing data type character % = SbxINTEGER
- symbols = getSymbols("1.23%");
+ symbols = getSymbols(u"1.23%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -671,7 +670,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// trailing data type character & = SbxLONG
- symbols = getSymbols("1.23&");
+ symbols = getSymbols(u"1.23&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -679,7 +678,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// trailing data type character ! = SbxSINGLE
- symbols = getSymbols("1.23!");
+ symbols = getSymbols(u"1.23!"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -687,7 +686,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// trailing data type character # = SbxDOUBLE
- symbols = getSymbols("1.23#");
+ symbols = getSymbols(u"1.23#"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -695,7 +694,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// trailing data type character @ = SbxCURRENCY
- symbols = getSymbols("1.23@");
+ symbols = getSymbols(u"1.23@"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -703,7 +702,7 @@ void ScannerTest::testNumbers()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// trailing data type character $ = SbxSTRING
- symbols = getSymbols("1.23$", errors);
+ symbols = getSymbols(u"1.23$"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.23, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -717,37 +716,37 @@ void ScannerTest::testDataType()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("asdf%");
+ symbols = getSymbols(u"asdf%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf&");
+ symbols = getSymbols(u"asdf&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf!");
+ symbols = getSymbols(u"asdf!"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxSINGLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf#");
+ symbols = getSymbols(u"asdf#"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxDOUBLE, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf@");
+ symbols = getSymbols(u"asdf@"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxCURRENCY, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf$");
+ symbols = getSymbols(u"asdf$"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxSTRING, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("asdf ");
+ symbols = getSymbols(u"asdf "_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
@@ -758,31 +757,31 @@ void ScannerTest::testHexOctal()
sal_Int32 errors;
std::vector<Symbol> symbols;
- symbols = getSymbols("&HA");
+ symbols = getSymbols(u"&HA"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&HASDF");
+ symbols = getSymbols(u"&HASDF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(2783.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&H10");
+ symbols = getSymbols(u"&H10"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(16.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&&H&1H1&H1");
+ symbols = getSymbols(u"&&H&1H1&H1"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(6), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
- CPPUNIT_ASSERT_EQUAL(OUString("&"), symbols[0].text);
+ CPPUNIT_ASSERT_EQUAL(u"&"_ustr, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[0].type);
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[1].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[1].text);
@@ -791,44 +790,44 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[2].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[2].type);
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[3].number, 1E-12);
- CPPUNIT_ASSERT_EQUAL(OUString("H1"), symbols[3].text);
+ CPPUNIT_ASSERT_EQUAL(u"H1"_ustr, symbols[3].text);
CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[3].type);
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[4].number, 1E-12);
- CPPUNIT_ASSERT_EQUAL(OUString("H1"), symbols[4].text);
+ CPPUNIT_ASSERT_EQUAL(u"H1"_ustr, symbols[4].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[4].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[5].text);
- symbols = getSymbols("&O&O12");
+ symbols = getSymbols(u"&O&O12"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type);
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[1].number, 1E-12);
- CPPUNIT_ASSERT_EQUAL(OUString("O12"), symbols[1].text);
+ CPPUNIT_ASSERT_EQUAL(u"O12"_ustr, symbols[1].text);
CPPUNIT_ASSERT_EQUAL(SbxVARIANT, symbols[1].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("&O10");
+ symbols = getSymbols(u"&O10"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(8.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&HO");
+ symbols = getSymbols(u"&HO"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&O123000000000000000000000");
+ symbols = getSymbols(u"&O123000000000000000000000"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
// TODO: this line fails on 64 bit systems!!!
// CPPUNIT_ASSERT_EQUAL(symbols[0].number, -1744830464);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&H1.23");
+ symbols = getSymbols(u"&H1.23"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, symbols[0].number, 1E-12);
@@ -841,7 +840,7 @@ void ScannerTest::testHexOctal()
/* tdf#62323, tdf#62326 - conversion of Hex literals to basic signed
Integers */
// &H0 = 0
- symbols = getSymbols("&H0");
+ symbols = getSymbols(u"&H0"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -849,7 +848,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &H8000 = -32768
- symbols = getSymbols("&H8000");
+ symbols = getSymbols(u"&H8000"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(SbxMININT, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -857,7 +856,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &H80000000 = -2147483648
- symbols = getSymbols("&H80000000");
+ symbols = getSymbols(u"&H80000000"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(SbxMINLNG, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -865,7 +864,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &HFFFF = -1
- symbols = getSymbols("&HFFFF");
+ symbols = getSymbols(u"&HFFFF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -873,7 +872,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &HFFFFFFFF = -1
- symbols = getSymbols("&HFFFFFFFF");
+ symbols = getSymbols(u"&HFFFFFFFF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -881,7 +880,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &H7FFF = 32767
- symbols = getSymbols("&H7FFF");
+ symbols = getSymbols(u"&H7FFF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(SbxMAXINT, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -889,7 +888,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &H7FFFFFFF = 2147483647
- symbols = getSymbols("&H7FFFFFFF");
+ symbols = getSymbols(u"&H7FFFFFFF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(SbxMAXLNG, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -899,7 +898,7 @@ void ScannerTest::testHexOctal()
/* tdf#130476 - trailing data type characters */
// % = SbxINTEGER
- symbols = getSymbols("&H0%");
+ symbols = getSymbols(u"&H0%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -907,7 +906,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// & = SbxLONG
- symbols = getSymbols("&H0&");
+ symbols = getSymbols(u"&H0&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -915,7 +914,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// ! = SbxSINGLE
- symbols = getSymbols("&H0!");
+ symbols = getSymbols(u"&H0!"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -923,7 +922,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// # = SbxDOUBLE
- symbols = getSymbols("&H0#");
+ symbols = getSymbols(u"&H0#"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -931,7 +930,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// @ = SbxCURRENCY
- symbols = getSymbols("&H0@");
+ symbols = getSymbols(u"&H0@"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -939,7 +938,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// $ = SbxSTRING
- symbols = getSymbols("&H0$", errors);
+ symbols = getSymbols(u"&H0$"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -949,7 +948,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
// % = SbxINTEGER
- symbols = getSymbols("&O0%");
+ symbols = getSymbols(u"&O0%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -957,7 +956,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// & = SbxLONG
- symbols = getSymbols("&O0&");
+ symbols = getSymbols(u"&O0&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -965,7 +964,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// ! = SbxSINGLE
- symbols = getSymbols("&O0!");
+ symbols = getSymbols(u"&O0!"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -973,7 +972,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// # = SbxDOUBLE
- symbols = getSymbols("&O0#");
+ symbols = getSymbols(u"&O0#"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -981,7 +980,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// @ = SbxCURRENCY
- symbols = getSymbols("&O0@");
+ symbols = getSymbols(u"&O0@"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -989,7 +988,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// $ = SbxSTRING
- symbols = getSymbols("&O0$", errors);
+ symbols = getSymbols(u"&O0$"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -999,7 +998,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
// maximum for Hex % = SbxINTEGER
- symbols = getSymbols("&HFFFF%");
+ symbols = getSymbols(u"&HFFFF%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1007,7 +1006,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// overflow for Hex % = SbxINTEGER
- symbols = getSymbols("&H10000%", errors);
+ symbols = getSymbols(u"&H10000%"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1017,7 +1016,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
// maximum for Octal % = SbxINTEGER
- symbols = getSymbols("&O177777%");
+ symbols = getSymbols(u"&O177777%"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1025,7 +1024,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// overflow for Octal % = SbxINTEGER
- symbols = getSymbols("&O200000%", errors);
+ symbols = getSymbols(u"&O200000%"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1035,7 +1034,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
// maximum for Hex & = SbxLONG
- symbols = getSymbols("&H7FFFFFFF&");
+ symbols = getSymbols(u"&H7FFFFFFF&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1043,7 +1042,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// minimum for Hex & = SbxLONG
- symbols = getSymbols("&H80000000&");
+ symbols = getSymbols(u"&H80000000&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1051,7 +1050,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// overflow for Hex & = SbxLONG
- symbols = getSymbols("&H100000000&", errors);
+ symbols = getSymbols(u"&H100000000&"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1061,7 +1060,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(1u, static_cast<unsigned int>(errors));
// maximum for Octal & = SbxLONG
- symbols = getSymbols("&O17777777777&");
+ symbols = getSymbols(u"&O17777777777&"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1069,7 +1068,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// minimum for Octal & = SbxLONG
- symbols = getSymbols("&O20000000000&", errors);
+ symbols = getSymbols(u"&O20000000000&"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1077,7 +1076,7 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// overflow for Octal & = SbxLONG
- symbols = getSymbols("&O40000000000&", errors);
+ symbols = getSymbols(u"&O40000000000&"_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1089,7 +1088,7 @@ void ScannerTest::testHexOctal()
/* test for leading zeros */
// &H0000000FFFF = 65535
- symbols = getSymbols("&H0000000FFFF");
+ symbols = getSymbols(u"&H0000000FFFF"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1097,14 +1096,14 @@ void ScannerTest::testHexOctal()
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
// &O00000123 = 83
- symbols = getSymbols("&O00000123");
+ symbols = getSymbols(u"&O00000123"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(83.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type);
CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text);
- symbols = getSymbols("&O7777777");
+ symbols = getSymbols(u"&O7777777"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size());
CPPUNIT_ASSERT_DOUBLES_EQUAL(2097151.0, symbols[0].number, 1E-12);
CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text);
@@ -1116,14 +1115,14 @@ void ScannerTest::testTdf103104()
{
std::vector<Symbol> symbols;
- symbols = getSymbols("asdf _
asdf");
+ symbols = getSymbols(u"asdf _
asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(3), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(asdf, symbols[1].text);
CPPUNIT_ASSERT(symbols[1].ws);
CPPUNIT_ASSERT_EQUAL(cr, symbols[2].text);
- symbols = getSymbols("asdf. _
asdf");
+ symbols = getSymbols(u"asdf. _
asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(dot, symbols[1].text);
@@ -1132,7 +1131,7 @@ void ScannerTest::testTdf103104()
CPPUNIT_ASSERT(symbols[2].ws);
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
- symbols = getSymbols("asdf _
.asdf");
+ symbols = getSymbols(u"asdf _
.asdf"_ustr);
CPPUNIT_ASSERT_EQUAL(size_t(4), symbols.size());
CPPUNIT_ASSERT_EQUAL(asdf, symbols[0].text);
CPPUNIT_ASSERT_EQUAL(dot, symbols[1].text);
@@ -1149,10 +1148,10 @@ void ScannerTest::testTdf136032()
// tdf#136032 - abort scan of a string beginning with a hashtag,
// if a comma/whitespace is found. Otherwise, the compiler raises a syntax
error.
- symbols = getSymbols("Print #i,\"A#B\"", errors);
+ symbols = getSymbols(u"Print #i,\"A#B\""_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(5), symbols.size());
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
- symbols = getSymbols("Print #i, \"A#B\"", errors);
+ symbols = getSymbols(u"Print #i, \"A#B\""_ustr, errors);
CPPUNIT_ASSERT_EQUAL(size_t(5), symbols.size());
CPPUNIT_ASSERT_EQUAL(0u, static_cast<unsigned int>(errors));
}
diff --git a/basic/qa/cppunit/test_tdf149714.cxx
b/basic/qa/cppunit/test_tdf149714.cxx
index 76713508560c..0c58038daedf 100644
--- a/basic/qa/cppunit/test_tdf149714.cxx
+++ b/basic/qa/cppunit/test_tdf149714.cxx
@@ -52,7 +52,7 @@ End Function
sBasic = sBasic.replaceFirst("$PNGFILENAME", aDataFileName);
interpreter = new StarBASIC();
- auto mod = interpreter->MakeModule("BitsPerPixel", sBasic);
+ auto mod = interpreter->MakeModule(u"BitsPerPixel"_ustr, sBasic);
CPPUNIT_ASSERT(mod->Compile());
CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, StarBASIC::GetErrBasic());
@@ -65,7 +65,8 @@ End Function
void TestTdf149714::testBitsPerPixel()
{
auto m = Module();
- auto GetBitsPerPixelAsString = m->FindMethod("GetBitsPerPixelAsString",
SbxClassType::Method);
+ auto GetBitsPerPixelAsString
+ = m->FindMethod(u"GetBitsPerPixelAsString"_ustr, SbxClassType::Method);
CPPUNIT_ASSERT_MESSAGE("Could not Find GetBitsPerPixelAsString in module",
GetBitsPerPixelAsString != nullptr);
@@ -75,7 +76,7 @@ void TestTdf149714::testBitsPerPixel()
// Without the fix in place this would fail with:
// - Expected: 24
// - Actual: True
- CPPUNIT_ASSERT_EQUAL(OUString{ "24" }, returned->GetOUString());
+ CPPUNIT_ASSERT_EQUAL(u"24"_ustr, returned->GetOUString());
}
// Put the test suite in the registry
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 8a15ba7234e8..d9c26acb87e5 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -164,14 +164,14 @@ void VBATest::testMiscVBAFunctions()
+ OUString::createFromAscii( macroSource[ i ] );
MacroSnippet myMacro;
- myMacro.LoadSourceFromFile("TestUtil", sMacroUtilsURL);
- myMacro.LoadSourceFromFile("TestModule", sMacroURL);
+ myMacro.LoadSourceFromFile(u"TestUtil"_ustr, sMacroUtilsURL);
+ myMacro.LoadSourceFromFile(u"TestModule"_ustr, sMacroURL);
SbxVariableRef pReturn = myMacro.Run();
CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn.is());
fprintf(stderr, "macro result for %s
", macroSource[i]);
fprintf(stderr, "macro returned:
%s
",
OUStringToOString(pReturn->GetOUString(),
RTL_TEXTENCODING_UTF8).getStr());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"),
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", u"OK"_ustr,
pReturn->GetOUString());
}
}
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index 525482d8dbae..7912c2a723d6 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -272,12 +272,12 @@ namespace basic
OUString aAppBasicDir( aPathCFG.GetBasicPath() );
if ( aAppBasicDir.isEmpty() )
{
- aPathCFG.SetBasicPath("$(prog)");
+ aPathCFG.SetBasicPath(u"$(prog)"_ustr);
}
// Create basic and load it
// AppBasicDir is now a PATH
- INetURLObject aAppBasic(
SvtPathOptions().SubstituteVariable("$(progurl)") );
+ INetURLObject aAppBasic(
SvtPathOptions().SubstituteVariable(u"$(progurl)"_ustr) );
aAppBasic.insertName( Application::GetAppName() );
BasicManager* pBasicManager = new BasicManager( new StarBASIC,
&aAppBasicDir );
@@ -307,7 +307,7 @@ namespace basic
// StarDesktop
Reference< XComponentContext > xContext =
::comphelper::getProcessComponentContext();
- pBasicManager->SetGlobalUNOConstant( "StarDesktop", css::uno::Any(
Desktop::create(xContext)));
+ pBasicManager->SetGlobalUNOConstant( u"StarDesktop"_ustr,
css::uno::Any( Desktop::create(xContext)));
// (BasicLibraries and DialogLibraries have automatically been added
in SetLibraryContainerInfo)
@@ -473,7 +473,7 @@ namespace basic
_out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
// global properties in the document's Basic
- _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent",
css::uno::Any( _rxDocumentModel ) );
+ _out_rpBasicManager->SetGlobalUNOConstant( u"ThisComponent"_ustr,
css::uno::Any( _rxDocumentModel ) );
// notify
impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 72b6f0de5ddf..985f66e0f3f2 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -529,7 +529,7 @@ void BasicManager::SetLibraryContainerInfo( const
LibraryContainerInfo& rInfo )
{
// Register listener for lib container
uno::Reference< container::XContainerListener > xLibContainerListener
- = new BasMgrContainerListenerImpl( this, "" );
+ = new BasMgrContainerListenerImpl( this, u""_ustr );
uno::Reference< container::XContainer> xLibContainer( xScriptCont,
uno::UNO_QUERY );
xLibContainer->addContainerListener( xLibContainerListener );
@@ -579,8 +579,8 @@ void BasicManager::SetLibraryContainerInfo( const
LibraryContainerInfo& rInfo )
}
}
- SetGlobalUNOConstant( "BasicLibraries", uno::Any(
maContainerInfo.mxScriptCont ) );
- SetGlobalUNOConstant( "DialogLibraries", uno::Any(
maContainerInfo.mxDialogCont ) );
+ SetGlobalUNOConstant( u"BasicLibraries"_ustr, uno::Any(
maContainerInfo.mxScriptCont ) );
+ SetGlobalUNOConstant( u"DialogLibraries"_ustr, uno::Any(
maContainerInfo.mxDialogCont ) );
}
BasicManager::BasicManager( StarBASIC* pSLib, OUString const * pLibPath, bool
bDocMgr ) : mbDocMgr( bDocMgr )
@@ -1688,7 +1688,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString&
aName )
SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
if( !pMod )
throw container::NoSuchElementException();
- uno::Reference< script::XStarBasicModuleInfo > xMod = new ModuleInfo_Impl(
aName, "StarBasic", pMod->GetSource32() );
+ uno::Reference< script::XStarBasicModuleInfo > xMod = new ModuleInfo_Impl(
aName, u"StarBasic"_ustr, pMod->GetSource32() );
uno::Any aRetAny;
aRetAny <<= xMod;
return aRetAny;
@@ -1729,7 +1729,7 @@ void ModuleContainer_Impl::insertByName( const OUString&
aName, const uno::Any&
const uno::Type& aAnyType = aElement.getValueType();
if( aModuleType != aAnyType )
{
- throw lang::IllegalArgumentException("types do not match", getXWeak(),
2);
+ throw lang::IllegalArgumentException(u"types do not match"_ustr,
getXWeak(), 2);
}
uno::Reference< script::XStarBasicModuleInfo > xMod;
aElement >>= xMod;
@@ -1893,7 +1893,7 @@ void DialogContainer_Impl::insertByName( const OUString&,
const uno::Any& aEleme
const uno::Type& aAnyType = aElement.getValueType();
if( aModuleType != aAnyType )
{
- throw lang::IllegalArgumentException("types do not match", getXWeak(),
2);
+ throw lang::IllegalArgumentException(u"types do not match"_ustr,
getXWeak(), 2);
}
uno::Reference< script::XStarBasicDialogInfo > xMod;
aElement >>= xMod;
diff --git a/basic/source/classes/errobject.cxx
b/basic/source/classes/errobject.cxx
index 85423101b827..b2340fe3fc54 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -156,13 +156,13 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any&
Source, const uno::Any
OUString SAL_CALL
ErrObject::getDefaultPropertyName( )
{
- return "Number";
+ return u"Number"_ustr;
}
void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const
uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
{
if ( !Number.hasValue() )
- throw uno::RuntimeException("Missing Required Parameter" );
+ throw uno::RuntimeException(u"Missing Required Parameter"_ustr );
Number >>= m_nNumber;
Description >>= m_sDescription;
Source >>= m_sSource;
@@ -202,7 +202,7 @@ SbxErrObject::getErrObject()
static std::mutex aMutex;
std::scoped_lock aGuard(aMutex);
if (!rGlobErr)
- rGlobErr = new SbxErrObject("Err",
+ rGlobErr = new SbxErrObject(u"Err"_ustr,
uno::Any(uno::Reference<vba::XErrObject>(new ErrObject())));
}
return rGlobErr;
diff --git a/basic/source/classes/eventatt.cxx
b/basic/source/classes/eventatt.cxx
index 6cf371f3869a..3ffe183e3a3b 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -85,7 +85,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any*
pRet, const Refere
provider::theMasterScriptProviderFactory::get( xContext );
Any aCtx;
- aCtx <<= OUString("user");
+ aCtx <<= u"user"_ustr;
xScriptProvider = xFactory->createScriptProvider( aCtx );
}
@@ -318,7 +318,7 @@ css::uno::Reference< css::container::XNameContainer >
implFindDialogLibForDialog
{
css::uno::Reference< css::container::XNameContainer > aRetDlgLib;
- SbxVariable* pDlgLibContVar = pBasic->Find("DialogLibraries",
SbxClassType::Object);
+ SbxVariable* pDlgLibContVar = pBasic->Find(u"DialogLibraries"_ustr,
SbxClassType::Object);
if( auto pDlgLibContUnoObj = dynamic_cast<SbUnoObject*>( pDlgLibContVar) )
{
Any aDlgLibContAny = pDlgLibContUnoObj->getUnoAny();
@@ -433,7 +433,7 @@ void RTL_Impl_CreateUnoDialog( SbxArray& rPar )
// Create new uno dialog
Reference< XNameContainer > xDialogModel(
xContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.awt.UnoControlDialogModel", xContext),
UNO_QUERY );
+ u"com.sun.star.awt.UnoControlDialogModel"_ustr,
xContext), UNO_QUERY );
if( !xDialogModel.is() )
{
return;
@@ -455,13 +455,13 @@ void RTL_Impl_CreateUnoDialog( SbxArray& rPar )
try
{
bool bDecoration = true;
- OUString aDecorationPropName("Decoration");
+ OUString aDecorationPropName(u"Decoration"_ustr);
Any aDecorationAny = xDlgModPropSet->getPropertyValue(
aDecorationPropName );
aDecorationAny >>= bDecoration;
if( !bDecoration )
{
xDlgModPropSet->setPropertyValue( aDecorationPropName, Any(
true ) );
- xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
+ xDlgModPropSet->setPropertyValue( u"Title"_ustr, Any(
OUString() ) );
}
}
catch(const UnknownPropertyException& )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index eafb129894ab..336666300fd2 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -343,8 +343,8 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
}
- pType->Remove( "Name", SbxClassType::DontCare );
- pType->Remove( "Parent", SbxClassType::DontCare );
+ pType->Remove( u"Name"_ustr, SbxClassType::DontCare );
+ pType->Remove( u"Parent"_ustr, SbxClassType::DontCare );
AddType(pType);
}
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index f9eacc3d1298..3f72c50f0683 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -129,7 +129,7 @@ Sequence< PropertyValue >
SbPropertyValues::getPropertyValues()
void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >&
rPropertyValues )
{
if (!m_aPropVals.empty())
- throw IllegalArgumentException("m_aPropVals not empty", getXWeak(),
-1);
+ throw IllegalArgumentException(u"m_aPropVals not empty"_ustr,
getXWeak(), -1);
for (const PropertyValue& i : rPropertyValues)
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 9b702e08d5a1..143bf86ff18f 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -136,7 +136,7 @@ void DocBasicItem::clearDependingVarsOnDelete( StarBASIC&
rDeletedBasic )
void DocBasicItem::startListening()
{
Any aThisComp;
- mrDocBasic.GetUNOConstant( "ThisComponent", aThisComp );
+ mrDocBasic.GetUNOConstant( u"ThisComponent"_ustr, aThisComp );
Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
mbDisposed = !xCloseBC.is();
if( xCloseBC.is() )
@@ -150,7 +150,7 @@ void DocBasicItem::stopListening()
if( mbDisposed ) return;
mbDisposed = true;
Any aThisComp;
- if (!mrDocBasic.GetUNOConstant("ThisComponent", aThisComp))
+ if (!mrDocBasic.GetUNOConstant(u"ThisComponent"_ustr, aThisComp))
return;
Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
@@ -235,14 +235,14 @@ SbxObject* StarBASIC::getVBAGlobals( )
if ( !pVBAGlobals.is() )
{
Any aThisDoc;
- if ( GetUNOConstant("ThisComponent", aThisDoc) )
+ if ( GetUNOConstant(u"ThisComponent"_ustr, aThisDoc) )
{
Reference< XMultiServiceFactory > xDocFac( aThisDoc, UNO_QUERY );
if ( xDocFac.is() )
{
try
{
- xDocFac->createInstance("ooo.vba.VBAGlobals");
+ xDocFac->createInstance(u"ooo.vba.VBAGlobals"_ustr);
}
catch(const Exception& )
{
@@ -250,7 +250,7 @@ SbxObject* StarBASIC::getVBAGlobals( )
}
}
}
- pVBAGlobals = static_cast<SbUnoObject*>(Find( "VBAGlobals" ,
SbxClassType::DontCare ));
+ pVBAGlobals = static_cast<SbUnoObject*>(Find( u"VBAGlobals"_ustr ,
SbxClassType::DontCare ));
}
return pVBAGlobals.get();
}
@@ -422,11 +422,11 @@ SbxBaseRef SbiFactory::Create( sal_uInt16 nSbxId,
sal_uInt32 nCreator )
case SBXID_BASIC:
return new StarBASIC( nullptr );
case SBXID_BASICMOD:
- return new SbModule( "" );
+ return new SbModule( u""_ustr );
case SBXID_BASICPROP:
- return new SbProperty( "", SbxVARIANT, nullptr );
+ return new SbProperty( u""_ustr, SbxVARIANT, nullptr );
case SBXID_BASICMETHOD:
- return new SbMethod( "", SbxVARIANT, nullptr );
+ return new SbMethod( u""_ustr, SbxVARIANT, nullptr );
case SBXID_JSCRIPTMOD:
return new SbJScriptModule;
case SBXID_JSCRIPTMETH:
@@ -448,14 +448,14 @@ SbxObjectRef SbiFactory::CreateObject( const OUString&
rClass )
}
else if( rClass.equalsIgnoreAsciiCase( "Collection" ) )
{
- return new BasicCollection( "Collection" );
+ return new BasicCollection( u"Collection"_ustr );
}
else if( rClass.equalsIgnoreAsciiCase( "FileSystemObject" ) )
{
try
{
Reference< XMultiServiceFactory > xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
- OUString aServiceName("ooo.vba.FileSystemObject");
+ OUString aServiceName(u"ooo.vba.FileSystemObject"_ustr);
Reference< XInterface > xInterface( xFactory->createInstance(
aServiceName ), UNO_SET_THROW );
return new SbUnoObject( aServiceName, uno::Any( xInterface ) );
}
@@ -728,7 +728,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule*
pClassModule )
}
else if( aObjClass.equalsIgnoreAsciiCase( "Collection"
) )
{
- BasicCollection* pNewCollection = new
BasicCollection( "Collection" );
+ BasicCollection* pNewCollection = new
BasicCollection( u"Collection"_ustr );
pNewCollection->SetName( pProp->GetName() );
pNewCollection->SetParent( pClassModule->pParent );
pNewProp->PutObject( pNewCollection );
@@ -794,7 +794,7 @@ void SbClassModuleObject::triggerInitializeEvent()
mbInitializeEventDone = true;
// Search method
- SbxVariable* pMeth = SbxObject::Find("Class_Initialize",
SbxClassType::Method);
+ SbxVariable* pMeth = SbxObject::Find(u"Class_Initialize"_ustr,
SbxClassType::Method);
if( pMeth )
{
SbxValues aVals;
@@ -809,7 +809,7 @@ void SbClassModuleObject::triggerTerminateEvent()
return;
}
// Search method
- SbxVariable* pMeth = SbxObject::Find("Class_Terminate",
SbxClassType::Method );
+ SbxVariable* pMeth = SbxObject::Find(u"Class_Terminate"_ustr,
SbxClassType::Method );
if( pMeth )
{
SbxValues aVals;
@@ -893,7 +893,7 @@ SbModule* SbClassFactory::FindClass( const OUString&
rClassName )
}
StarBASIC::StarBASIC( StarBASIC* p, bool bIsDocBasic )
- : SbxObject("StarBASIC"), bDocBasic( bIsDocBasic )
+ : SbxObject(u"StarBASIC"_ustr), bDocBasic( bIsDocBasic )
{
SetParent( p );
bNoRtl = bBreak = false;
@@ -1562,7 +1562,7 @@ void StarBASIC::MakeErrorText( ErrCode nId,
std::u16string_view aMsg )
OUString sError = BasResId(pErrorMsg);
OUStringBuffer aMsg1(sError);
// replace argument placeholder with %s
- OUString aSrgStr( "$(ARG1)" );
+ OUString aSrgStr( u"$(ARG1)"_ustr );
sal_Int32 nResult = sError.indexOf(aSrgStr);
if( nResult >= 0 )
@@ -1831,12 +1831,12 @@ bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
}
}
// HACK for SFX-Bullshit!
- SbxVariable* p = Find( "FALSE", SbxClassType::Property );
+ SbxVariable* p = Find( u"FALSE"_ustr, SbxClassType::Property );
if( p )
{
Remove( p );
}
- p = Find( "TRUE", SbxClassType::Property );
+ p = Find( u"TRUE"_ustr, SbxClassType::Property );
if( p )
{
Remove( p );
@@ -1991,15 +1991,15 @@ void BasicCollection::Initialize()
if ( !xAddInfo.is() )
{
xAddInfo = new SbxInfo;
- xAddInfo->AddParam( "Item", SbxVARIANT );
- xAddInfo->AddParam( "Key", SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
- xAddInfo->AddParam( "Before", SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
- xAddInfo->AddParam( "After", SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
+ xAddInfo->AddParam( u"Item"_ustr, SbxVARIANT );
+ xAddInfo->AddParam( u"Key"_ustr, SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
+ xAddInfo->AddParam( u"Before"_ustr, SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
+ xAddInfo->AddParam( u"After"_ustr, SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional );
}
if ( !xItemInfo.is() )
{
xItemInfo = new SbxInfo;
- xItemInfo->AddParam( "Index", SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional);
+ xItemInfo->AddParam( u"Index"_ustr, SbxVARIANT, SbxFlagBits::Read |
SbxFlagBits::Optional);
}
}
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 5fea3f14179f..419b2bb31a84 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -193,14 +193,14 @@ static Reference< XHierarchicalNameAccess > const &
getTypeProvider_Impl()
if( xContext.is() )
{
xContext->getValueByName(
-
"/singletons/com.sun.star.reflection.theTypeDescriptionManager" )
+
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager"_ustr )
>>= xAccess;
OSL_ENSURE( xAccess.is(), "### TypeDescriptionManager singleton
not accessible!?" );
}
if( !xAccess.is() )
{
throw DeploymentException(
-
"/singletons/com.sun.star.reflection.theTypeDescriptionManager singleton not
accessible" );
+
u"/singletons/com.sun.star.reflection.theTypeDescriptionManager singleton not
accessible"_ustr );
}
}
return xAccess;
@@ -223,7 +223,7 @@ static Reference< XTypeConverter > const &
getTypeConverter_Impl()
if( !xTypeConverter.is() )
{
throw DeploymentException(
- "com.sun.star.script.Converter service not accessible" );
+ u"com.sun.star.script.Converter service not accessible"_ustr );
}
}
return xTypeConverter;
@@ -240,7 +240,7 @@ SbUnoObject* createOLEObject_Impl( const OUString& aType )
{
Reference<XMultiComponentFactory> xSMgr =
xContext->getServiceManager();
xFactory.set(
- xSMgr->createInstanceWithContext(
"com.sun.star.bridge.OleObjectFactory", xContext ),
+ xSMgr->createInstanceWithContext(
u"com.sun.star.bridge.OleObjectFactory"_ustr, xContext ),
UNO_QUERY );
}
return xFactory;
@@ -1703,7 +1703,7 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const
OUString& rClass)
if ( xInv.is() )
{
OUString sTypeName;
- xInv->getValue( "$GetTypeName" ) >>= sTypeName;
+ xInv->getValue( u"$GetTypeName"_ustr ) >>= sTypeName;
if ( sTypeName.isEmpty() || sTypeName == "IDispatch" )
{
// can't check type, leave it pass
@@ -2287,8 +2287,8 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const
Any& aUnoObj_ )
, bNativeCOMObject( false )
{
// beat out again the default properties of Sbx
- Remove( "Name", SbxClassType::DontCare );
- Remove( "Parent", SbxClassType::DontCare );
+ Remove( u"Name"_ustr, SbxClassType::DontCare );
+ Remove( u"Parent"_ustr, SbxClassType::DontCare );
// check the type of the objects
TypeClass eType = aUnoObj_.getValueType().getTypeClass();
@@ -3028,7 +3028,7 @@ void RTL_Impl_GetProcessServiceManager( SbxArray& rPar )
Reference< XMultiServiceFactory > xFactory(
comphelper::getProcessServiceFactory() );
// Create a SbUnoObject out of it and return it
- SbUnoObjectRef xUnoObj = new SbUnoObject( "ProcessServiceManager",
Any(xFactory) );
+ SbUnoObjectRef xUnoObj = new SbUnoObject( u"ProcessServiceManager"_ustr,
Any(xFactory) );
refVar->PutObject( xUnoObj.get() );
}
@@ -3220,7 +3220,7 @@ void VBAConstantHelper::init()
if ( isInited )
return;
- Reference< XTypeDescriptionEnumeration > xEnum =
getTypeDescriptorEnumeration( "ooo.vba", {TypeClass_CONSTANTS},
TypeDescriptionSearchDepth_INFINITE );
+ Reference< XTypeDescriptionEnumeration > xEnum =
getTypeDescriptorEnumeration( u"ooo.vba"_ustr, {TypeClass_CONSTANTS},
TypeDescriptionSearchDepth_INFINITE );
if ( !xEnum.is())
{
@@ -3706,7 +3706,7 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName )
SbUnoSingleton::SbUnoSingleton( const OUString& aName_ )
: SbxObject( aName_ )
{
- SbxVariableRef xGetMethodRef = new SbxMethod( "get", SbxOBJECT );
+ SbxVariableRef xGetMethodRef = new SbxMethod( u"get"_ustr, SbxOBJECT );
QuickInsert( xGetMethodRef.get() );
}
@@ -4064,7 +4064,7 @@ void RTL_Impl_GetDefaultContext( SbxArray& rPar )
Any aContextAny( comphelper::getProcessComponentContext() );
- SbUnoObjectRef xUnoObj = new SbUnoObject( "DefaultContext", aContextAny );
+ SbUnoObjectRef xUnoObj = new SbUnoObject( u"DefaultContext"_ustr,
aContextAny );
refVar->PutObject( xUnoObj.get() );
}
@@ -4374,7 +4374,7 @@ Reference< XInterface > createComListener( const Any&
aControlAny, const OUStrin
try
{
xRet = xServiceMgr->createInstanceWithArgumentsAndContext(
- "com.sun.star.custom.UnoComListener",
+ u"com.sun.star.custom.UnoComListener"_ustr,
args, xContext );
}
catch( const Exception& )
@@ -4480,7 +4480,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny,
SbClassModuleObject* pP
Reference< XMultiComponentFactory > xServiceMgr(
xContext->getServiceManager() );
Reference< XSingleServiceFactory > xComImplementsFactory
(
- xServiceMgr->createInstanceWithContext(
"com.sun.star.custom.ComImplementsFactory", xContext ),
+ xServiceMgr->createInstanceWithContext(
u"com.sun.star.custom.ComImplementsFactory"_ustr, xContext ),
UNO_QUERY
);
if( !xComImplementsFactory.is() )
@@ -4559,7 +4559,7 @@ bool handleToStringForCOMObjects( SbxObject* pObj,
SbxValue* pVal )
// Only for native COM objects
if( pUnoObj->isNativeCOMObject() )
{
- SbxVariableRef pMeth = pObj->Find( "toString",
SbxClassType::Method );
+ SbxVariableRef pMeth = pObj->Find( u"toString"_ustr,
SbxClassType::Method );
if ( pMeth.is() )
{
SbxValues aRes;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8ca156b1238a..f3551bc1b425 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -199,7 +199,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName,
const Sequence< Any >&
return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex,
aOutParam );
SbMethodRef pMethod = getMethod( aFunctionName );
if ( !pMethod.is() )
- throw RuntimeException("DocObjectWrapper::invoke - Could not get the
method reference!");
+ throw RuntimeException(u"DocObjectWrapper::invoke - Could not get the
method reference!"_ustr);
// check number of parameters
sal_Int32 nParamsCount = aParams.getLength();
SbxInfo* pInfo = pMethod->GetInfo();
@@ -217,7 +217,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName,
const Sequence< Any >&
sal_Int32 nSbxCount = n - 1;
if ( nParamsCount < nSbxCount - nSbxOptional )
{
- throw RuntimeException( "wrong number of parameters!" );
+ throw RuntimeException( u"wrong number of parameters!"_ustr );
}
}
// set parameters
@@ -384,7 +384,7 @@ uno::Reference< frame::XModel > getDocumentModel(
StarBASIC* pb )
if( pb && pb->IsDocBasic() )
{
uno::Any aDoc;
- if( pb->GetUNOConstant( "ThisComponent", aDoc ) )
+ if( pb->GetUNOConstant( u"ThisComponent"_ustr, aDoc ) )
xModel.set( aDoc, uno::UNO_QUERY );
}
return xModel;
@@ -396,7 +396,7 @@ static uno::Reference< vba::XVBACompatibility >
getVBACompatibility( const uno::
try
{
uno::Reference< beans::XPropertySet > xModelProps( rxModel,
uno::UNO_QUERY_THROW );
- xVBACompat.set( xModelProps->getPropertyValue( "BasicLibraries" ),
uno::UNO_QUERY );
+ xVBACompat.set( xModelProps->getPropertyValue( u"BasicLibraries"_ustr
), uno::UNO_QUERY );
}
catch(const uno::Exception& )
{
@@ -417,7 +417,7 @@ static bool getDefaultVBAMode( StarBASIC* pb )
// could be found from other module.
SbModule::SbModule( const OUString& rName, bool bVBASupport )
- : SbxObject( "StarBASICModule" ),
+ : SbxObject( u"StarBASICModule"_ustr ),
pBreaks(nullptr), mbVBASupport(bVBASupport), mbCompat(bVBASupport),
bIsProxyModule(false)
{
SetName( rName );
@@ -425,7 +425,7 @@ SbModule::SbModule( const OUString& rName, bool bVBASupport
)
SetModuleType( script::ModuleType::NORMAL );
// #i92642: Set name property to initial name
- SbxVariable* pNameProp = pProps->Find( "Name", SbxClassType::Property );
-e
... etc. - the rest is truncated
