diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /sc | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc')
162 files changed, 773 insertions, 782 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index da29b141f94e..85d4801519b7 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -109,86 +109,86 @@ void ScMacrosTest::testVba() { TestMacroInfo testInfo[] = { { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestAddress.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestAddress."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")), + rtl::OUString("vba."), + rtl::OUString("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document"), }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("MiscRangeTests."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document")) + rtl::OUString("bytearraystring."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("AutoFilter."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("CalcFont."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestIntersection."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestUnion."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("range-4."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges-3."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestCalc_Rangetest."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestCalc_Rangetest2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("TestCalc_Rangetest2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if FIXRANGEADDRESSING //ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get confused //about the addressing mode of the document vs the addressing mode of a named //range ( need to fix that ) { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges-2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pagesetup.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("pagesetup."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Window."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window2.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("window2."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageBreaks.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("PageBreaks."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shapes.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Shapes."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #if VBA_TEST_WORKING { - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges.")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")) + rtl::OUString("Ranges."), + rtl::OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, #endif }; diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index 174debde8160..d404d335c97c 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -164,8 +164,7 @@ void ScChartRegressionTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); } diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index fdbd7486eef6..d5971c0033a2 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -98,7 +98,7 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 2c3694aa520a..62d662672352 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -87,7 +87,7 @@ uno::Reference< uno::XInterface > ScAnnontationsObj::init() { // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAnnotationObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScAnnotationObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 97366dec287f..a65a04878b9a 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -80,8 +80,8 @@ uno::Reference< lang::XComponent > ScCellRangeObj::mxComponent; ScCellRangeObj::ScCellRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), 1), - apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("15")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("35"))) + apitest::XSearchable(rtl::OUString("15"), 1), + apitest::XReplaceable(rtl::OUString("15"), rtl::OUString("35")) { } diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index c122e4fac742..a54716720883 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -80,7 +80,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const rtl::OUString& uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges"))), UNO_QUERY_THROW); + uno::Reference< container::XNameAccess > xNameAccess( xPropSet->getPropertyValue(rtl::OUString("DatabaseRanges")), UNO_QUERY_THROW); uno::Reference< sheet::XDatabaseRange > xDBRange( xNameAccess->getByName(rDBName), UNO_QUERY_THROW); CPPUNIT_ASSERT(xDBRange.is()); return xDBRange; diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index ccc7417638da..c52952eeff4f 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -76,7 +76,7 @@ ScDataPilotFieldObj::ScDataPilotFieldObj() uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("scdatapilotfieldobj.ods")), aFileURL); + createFileURL(rtl::OUString("scdatapilotfieldobj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > ScDataPilotFieldObj::init() CPPUNIT_ASSERT(xDPT.is()); uno::Sequence<rtl::OUString> aElementNames = xDPT->getElementNames(); - uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilot1"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotDescriptor > xDPDsc(xDPT->getByName(rtl::OUString("DataPilot1")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPDsc.is()); uno::Reference< container::XIndexAccess > xIA( xDPDsc->getDataPilotFields(), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturnValue( xIA->getByIndex(0), UNO_QUERY_THROW); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 1e9f2a873bad..05a7572d411c 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -84,7 +84,7 @@ uno::Reference< lang::XComponent > ScDataPilotTableObj::mxComponent; ScDataPilotTableObj::ScDataPilotTableObj() : UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))) + apitest::XNamed(rtl::OUString("DataPilotTable")) { } @@ -112,7 +112,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; @@ -128,7 +128,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets() uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScDataPilotTableObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScDataPilotTableObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -149,7 +149,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::initDP2() uno::Reference< sheet::XDataPilotTables > xDPT = xDPTS->getDataPilotTables(); CPPUNIT_ASSERT(xDPT.is()); - uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilotTable2"))),UNO_QUERY_THROW); + uno::Reference< sheet::XDataPilotTable > xDPTable(xDPT->getByName(rtl::OUString("DataPilotTable2")),UNO_QUERY_THROW); CPPUNIT_ASSERT(xDPTable.is()); return xDPTable; diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 167e3b290045..13384e83bd39 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -44,7 +44,7 @@ uno::Reference< lang::XComponent > ScModelObj::mxComponent; uno::Reference< uno::XInterface > ScModelObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScModelObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScModelObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 95e2b0f75e25..8403c051b076 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -74,7 +74,7 @@ uno::Reference< lang::XComponent > ScNamedRangeObj::mxComponent; ScNamedRangeObj::ScNamedRangeObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNamed(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))), + apitest::XNamed(rtl::OUString("NamedRange")), apitest::XCellRangeReferrer(table::CellRangeAddress(0,1,7,1,7)) { } @@ -82,7 +82,7 @@ ScNamedRangeObj::ScNamedRangeObj(): uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); @@ -106,7 +106,7 @@ uno::Reference< sheet::XNamedRange> ScNamedRangeObj::getNamedRange(const rtl::OU uno::Reference< uno::XInterface > ScNamedRangeObj::init() { - return getNamedRange(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRange"))); + return getNamedRange(rtl::OUString("NamedRange")); } void ScNamedRangeObj::setUp() diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index d921932c0900..b52962d85115 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -70,7 +70,7 @@ ScNamedRangesObj::ScNamedRangesObj() uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScNamedRangeObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScNamedRangeObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index f55178bd1e09..4e7f1540c528 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -73,7 +73,7 @@ uno::Reference< uno::XInterface > ScOutlineObj::init() { // get the test file rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScOutlineObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScOutlineObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index e10df62997d6..f41d2ac3d83e 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -65,8 +65,8 @@ uno::Reference< lang::XComponent > ScTableSheetObj::mxComponent; ScTableSheetObj::ScTableSheetObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XSearchable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), 4), - apitest::XReplaceable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("searchReplaceString")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replaceReplaceString"))) + apitest::XSearchable(rtl::OUString("test"), 4), + apitest::XReplaceable(rtl::OUString("searchReplaceString"), rtl::OUString("replaceReplaceString")) { } @@ -74,7 +74,7 @@ ScTableSheetObj::ScTableSheetObj(): uno::Reference< uno::XInterface > ScTableSheetObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScTableSheetObj.ods")), aFileURL); + createFileURL(rtl::OUString("ScTableSheetObj.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL, "com.sun.star.sheet.SpreadsheetDocument"); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index a1e97d5a73e8..cfc771c7b0a9 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -75,7 +75,7 @@ sal_Int32 ScTableSheetsObj::nTest = 0; ScTableSheetsObj::ScTableSheetsObj(): UnoApiTest("/sc/qa/extras/testdocuments"), - apitest::XNameContainer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sheet2"))) + apitest::XNameContainer(rtl::OUString("Sheet2")) { } @@ -98,7 +98,7 @@ uno::Reference< lang::XComponent > ScTableSheetsObj::loadFromDesktop(const rtl:: uno::Reference< uno::XInterface > ScTableSheetsObj::init() { rtl::OUString aFileURL; - createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods")), aFileURL); + createFileURL(rtl::OUString("rangenamessrc.ods"), aFileURL); if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 67db72eee7c4..3b23c60f19d5 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -131,16 +131,16 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, void ScFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("Quattro Pro 6.0")), + testDir(OUString("Quattro Pro 6.0"), getURLFromSrc("/sc/qa/unit/data/qpro/"), OUString()); //warning, the current "sylk filter" in sc (docsh.cxx) automatically //chains on failure on trying as csv, rtf, etc. so "success" may //not indicate that it imported as .slk. - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("SYLK")), + testDir(OUString("SYLK"), getURLFromSrc("/sc/qa/unit/data/slk/"), OUString()); - testDir(OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel 97")), + testDir(OUString("MS Excel 97"), getURLFromSrc("/sc/qa/unit/data/xls/"), OUString()); #endif } @@ -209,16 +209,16 @@ void testRangeNameImpl(ScDocument* pDoc) { //check one range data per sheet and one global more detailed //add some more checks here - ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1"))); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1")); CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData); double aValue; pDoc->GetValue(1,0,0,aValue); CPPUNIT_ASSERT_MESSAGE("range name Global1 should reference Sheet1.A1", aValue == 1); - pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1"))); + pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1")); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData); pDoc->GetValue(1,2,0,aValue); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", aValue == 3); - pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2"))); + pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2")); CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData); //check for correct results for the remaining formulas pDoc->GetValue(1,1,0, aValue); @@ -262,9 +262,9 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat ) //same code for ods, OUString aString = pDoc->GetString(1, 0, 0); //check string import - CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String1"))); + CPPUNIT_ASSERT_MESSAGE("string imported not correctly", aString == OUString("String1")); aString = pDoc->GetString(1, 1, 0); - CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString(RTL_CONSTASCII_USTRINGPARAM("String2"))); + CPPUNIT_ASSERT_MESSAGE("string not imported correctly", aString == OUString("String2")); //check basic formula import pDoc->GetValue(2,0,0,fValue); @@ -462,8 +462,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 0d77c0b0e67a..5325bbc37850 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -217,7 +217,7 @@ public: SfxFilter* pExportFilter = new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + rUserData, OUString("private:factory/scalc*") ); pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); pShell->DoSaveAs( aStoreMedium ); diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 621a6d77f8c5..d7998a78e28a 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -76,7 +76,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt SfxFilter* pExportFilter = new SfxFilter( rFilter, OUString(), nFormatType, nExportFormat, rTypeName, 0, OUString(), - rUserData, OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + rUserData, OUString("private:factory/scalc*") ); pExportFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); aStoreMedium.SetFilter(pExportFilter); SfxItemSet* pExportSet = aStoreMedium.GetItemSet(); @@ -212,8 +212,7 @@ void ScExportTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index cdaaa3e8c777..0bb7645944e5 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -239,16 +239,16 @@ void testRangeNameImpl(ScDocument* pDoc) { //check one range data per sheet and one global more detailed //add some more checks here - ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL1"))); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByUpperName(OUString("GLOBAL1")); CPPUNIT_ASSERT_MESSAGE("range name Global1 not found", pRangeData); double aValue; pDoc->GetValue(1,0,0,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Global1 should reference Sheet1.A1", 1.0, aValue); - pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL1"))); + pRangeData = pDoc->GetRangeName(0)->findByUpperName(OUString("LOCAL1")); CPPUNIT_ASSERT_MESSAGE("range name Sheet1.Local1 not found", pRangeData); pDoc->GetValue(1,2,0,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet1.Local1 should reference Sheet1.A3", 3.0, aValue); - pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL2"))); + pRangeData = pDoc->GetRangeName(1)->findByUpperName(OUString("LOCAL2")); CPPUNIT_ASSERT_MESSAGE("range name Sheet2.Local2 not found", pRangeData); pDoc->GetValue(1,1,1,aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE("range name Sheet2.Local2 should reference Sheet2.A2", 7.0, aValue); @@ -323,7 +323,7 @@ void ScFiltersTest::testHardRecalcODS() //test hard recalc: document has an incorrect cached formula result //hard recalc should have updated to the correct result - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("hard-recalc.")), aCSVFileName); + createCSVPath(OUString("hard-recalc."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -339,16 +339,16 @@ void ScFiltersTest::testFunctionsODS() OUString aCSVFileName; //test logical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName); + createCSVPath(OUString("logical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); //test spreadsheet functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName); + createCSVPath(OUString("spreadsheet-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); //test mathematical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName); + createCSVPath(OUString("mathematical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 2, PureString); //test information functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName); + createCSVPath(OUString("information-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 3); xDocSh->DoClose(); @@ -364,16 +364,16 @@ void ScFiltersTest::testCachedFormulaResultsODS() OUString aCSVFileName; //test cached formula results of logical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("logical-functions.")), aCSVFileName); + createCSVPath(OUString("logical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); //test cached formula results of spreadsheet functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("spreadsheet-functions.")), aCSVFileName); + createCSVPath(OUString("spreadsheet-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); //test cached formula results of mathematical functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName); + createCSVPath(OUString("mathematical-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 2, PureString); //test cached formula results of information functions - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName); + createCSVPath(OUString("information-functions."), aCSVFileName); testFile(aCSVFileName, pDoc, 3); xDocSh->DoClose(); @@ -537,7 +537,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n { //test Sheet1 with csv file OUString aCSVFileName; - pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("numberFormat.")), aCSVFileName); + pFiltersTest->createCSVPath(OUString("numberFormat."), aCSVFileName); testFile(aCSVFileName, pDoc, 0, PureString); //need to test the color of B3 //it's not a font color! @@ -609,7 +609,7 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n //test Sheet3 only for ods if ( nFormat == ODS || nFormat == XLSX ) { - pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName); + pFiltersTest->createCSVPath(OUString("conditionalFormatting."), aCSVFileName); testCondFile(aCSVFileName, pDoc, 2); // test parent cell style import ( fdo#55198 ) if ( nFormat == XLSX ) @@ -692,7 +692,7 @@ void ScFiltersTest::testMatrixODS() ScDocument* pDoc = xDocSh->GetDocument(); OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName); + createCSVPath(OUString("matrix."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -707,7 +707,7 @@ void ScFiltersTest::testMatrixXLS() ScDocument* pDoc = xDocSh->GetDocument(); OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("matrix.")), aCSVFileName); + createCSVPath(OUString("matrix."), aCSVFileName); testFile(aCSVFileName, pDoc, 0); xDocSh->DoClose(); @@ -903,7 +903,7 @@ void ScFiltersTest::testBugFixesODS() { // fdo#40967 OUString aCSVFileName; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("bugFix_Sheet2.")), aCSVFileName); + createCSVPath(OUString("bugFix_Sheet2."), aCSVFileName); testFile(aCSVFileName, pDoc, 1); } @@ -976,7 +976,7 @@ void ScFiltersTest::testMergedCellsODS() //check sheet1 content OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged1.")), aCSVFileName1); + createCSVPath(OUString("merged1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); //check sheet1 merged cells @@ -986,7 +986,7 @@ void ScFiltersTest::testMergedCellsODS() //check sheet2 content OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("merged2.")), aCSVFileName2); + createCSVPath(OUString("merged2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); //check sheet2 merged cells @@ -1002,12 +1002,12 @@ void ScFiltersTest::testRepeatedColumnsODS() //text OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns1.")), aCSVFileName1); + createCSVPath(OUString("repeatedColumns1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); //numbers OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns2.")), aCSVFileName2); + createCSVPath(OUString("repeatedColumns2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); xDocSh->DoClose(); @@ -1140,11 +1140,11 @@ void ScFiltersTest::testDataValidityODS() //check each sheet's content OUString aCSVFileName1; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity1.")), aCSVFileName1); + createCSVPath(OUString("dataValidity1."), aCSVFileName1); testFile(aCSVFileName1, pDoc, 0); OUString aCSVFileName2; - createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("dataValidity2.")), aCSVFileName2); + createCSVPath(OUString("dataValidity2."), aCSVFileName2); testFile(aCSVFileName2, pDoc, 1); xDocSh->DoClose(); @@ -1251,13 +1251,13 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) SfxFilter* aFilter = new SfxFilter( aFilterName, OUString(), aFileFormats[0].nFormatType, nFormat, aFilterType, 0, OUString(), - OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) ); + OUString(), OUString("private:factory/scalc*") ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocSh = new ScDocShell; SfxMedium* pMedium = new SfxMedium(aFileName, STREAM_STD_READWRITE); SfxItemSet* pSet = pMedium->GetItemSet(); - pSet->Put(SfxStringItem(SID_PASSWORD, OUString(RTL_CONSTASCII_USTRINGPARAM("test")))); + pSet->Put(SfxStringItem(SID_PASSWORD, OUString("test"))); pMedium->SetFilter(aFilter); if (!xDocSh->DoLoad(pMedium)) { @@ -1795,7 +1795,7 @@ void ScFiltersTest::testColorScaleODS() ScDocument* pDoc = xDocSh->GetDocument(); OUStringBuffer aBuffer(getSrcRootPath()); - aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/"))); + aBuffer.append(m_aBaseString).append(OUString("/reference/")); testColorScale_Impl(pDoc, aBuffer.makeStringAndClear()); xDocSh->DoClose(); @@ -1821,7 +1821,7 @@ void ScFiltersTest::testColorScaleXLSX() ScDocument* pDoc = xDocSh->GetDocument(); OUStringBuffer aBuffer(getSrcRootPath()); - aBuffer.append(m_aBaseString).append(OUString(RTL_CONSTASCII_USTRINGPARAM("/reference/"))); + aBuffer.append(m_aBaseString).append(OUString("/reference/")); testColorScale_Impl(pDoc, aBuffer.makeStringAndClear()); xDocSh->DoClose(); @@ -1974,8 +1974,7 @@ void ScFiltersTest::setUp() // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure, // which is a private symbol to us, gets called m_xCalcComponent = - getMultiServiceFactory()->createInstance(OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.SpreadsheetDocument"))); + getMultiServiceFactory()->createInstance(OUString("com.sun.star.comp.Calc.SpreadsheetDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is()); } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 75a2eb2b17fe..56afd712f7b1 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -3326,7 +3326,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc, return; OUString aTitle; - Any any = xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("String")) ); + Any any = xProp->getPropertyValue( OUString("String") ); if (any >>= aTitle) rSubTitle = aTitle; } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index a3f4d3271f61..e7069cdae9cb 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -207,8 +207,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) return; sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/sharedStrings.xml") ), - OUString(RTL_CONSTASCII_USTRINGPARAM( "sharedStrings.xml" )), + OUString( "xl/sharedStrings.xml"), + OUString( "sharedStrings.xml" ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" ); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ac9ca175c152..34304bfb6b67 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -3047,8 +3047,8 @@ XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/styles.xml") ), - OUString(RTL_CONSTASCII_USTRINGPARAM( "styles.xml" )), + OUString( "xl/styles.xml"), + OUString( "styles.xml" ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" ); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 256287305959..89d55be8e2f4 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1453,7 +1453,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { double fAngle = 180.0; com::sun::star::beans::PropertyValue aTextRotateAngle; - aTextRotateAngle.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); + aTextRotateAngle.Name = rtl::OUString( "TextRotateAngle" ); aTextRotateAngle.Value <<= fAngle; SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); aGeometryItem.SetPropertyValue( aTextRotateAngle ); diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9305c90fede7..646abc13ee4c 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -705,7 +705,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) nScTab = rDoc.GetTableCount(); rDoc.MakeTable( nScTab ); - rtl::OUStringBuffer aDummyName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DPCache") )); + rtl::OUStringBuffer aDummyName(rtl::OUString("DPCache")); if( maTabName.Len() > 0 ) aDummyName.append( '_' ).append( maTabName ); rtl::OUString aName = aDummyName.makeStringAndClear(); diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index cfc058e0bbe1..0c2f9c10b28a 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -62,12 +62,12 @@ MSOExcelCommandConvertor::MSOExcelCommandConvertor() /* // mso command id to ooo command string // #FIXME and *HUNDREDS* of id's to added here - msoToOOcmd[ 0x20b ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc") ); - msoToOOcmd[ 0x50 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Open") ); + msoToOOcmd[ 0x20b ] = rtl::OUString(".uno:CloseDoc"); + msoToOOcmd[ 0x50 ] = rtl::OUString(".uno:Open"); // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Print") ); + tcidToOOcmd[ 0x9d9 ] = rtl::OUString(".uno:Print"); */ } @@ -180,7 +180,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ), uno::makeAny( name.getString() ) ); + xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( name.getString() ) ); rtl::OUString sToolBarName = sToolbarPrefix.concat( name.getString() ); for ( std::vector< ScTBC >::iterator it = rTBC.begin(); it != rTBC.end(); ++it ) @@ -305,7 +305,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere else { beans::PropertyValue aProp; - aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ItemDescriptorContainer") ); + aProp.Name = rtl::OUString("ItemDescriptorContainer"); aProp.Value <<= xMenuDesc; props.push_back( aProp ); } @@ -316,7 +316,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere { // insert spacer uno::Sequence< beans::PropertyValue > sProps( 1 ); - sProps[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Type") ); + sProps[ 0 ].Name = rtl::OUString("Type"); sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE ); toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) ); } @@ -425,7 +425,7 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( std::vector<ScCTB>::iterator it = rCTB.begin(); it != it_end; ++it ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument" ) ) ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 916f7a2a7ef5..7982f1d378e5 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1398,7 +1398,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) if ( !pActEntry->bHasGraphic ) { // ALT text only if not any image loaded if (!pActEntry->aAltText.isEmpty()) - pActEntry->aAltText += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; ")); + pActEntry->aAltText += rtl::OUString("; "); pActEntry->aAltText += rOption.GetString(); } diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 70411f1b6674..eb33c39c04e0 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -203,7 +203,7 @@ void FormulaBuffer::createSharedFormula( const ::com::sun::star::table::CellAdd rtl::OUString aName = rtl::OUStringBuffer().appendAscii( RTL_CONSTASCII_STRINGPARAM( "__shared_" ) ). append( static_cast< sal_Int32 >( rAddress.Sheet + 1 ) ). append( sal_Unicode( '_' ) ).append( nSharedId ). - append( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_0") ) ).makeStringAndClear(); + append( rtl::OUString("_0") ).makeStringAndClear(); ScRangeData* pScRangeData = createNamedRangeObject( aName, aTokens, 0 ); pScRangeData->SetType(RT_SHARED); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 1c50a5cb1f9d..79a47fb378da 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1624,8 +1624,8 @@ void XclExpChangeTrack::Write() static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm ) { sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/userNames.xml" )), - OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/userNames.xml" )), + OUString( "xl/revisions/userNames.xml" ), + OUString( "revisions/userNames.xml" ), rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames" ); @@ -1648,8 +1648,8 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm ) lcl_WriteUserNamesXml( rWorkbookStrm ); sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream( - OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/revisionHeaders.xml" )), - OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/revisionHeaders.xml" )), + OUString( "xl/revisions/revisionHeaders.xml" ), + OUString( "revisions/revisionHeaders.xml" ), rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders" ); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 2b7bb8679489..a89a4827314d 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -76,27 +76,27 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( if (bUseRegularExpressions) return GetXMLToken(XML_MATCH); else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return rtl::OUString("="); } case SC_NOT_EQUAL : { if (bUseRegularExpressions) return GetXMLToken(XML_NOMATCH); else - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + return rtl::OUString("!="); } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + return rtl::OUString(">"); case SC_GREATER_EQUAL : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + return rtl::OUString(">="); case SC_LESS : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + return rtl::OUString("<"); case SC_LESS_EQUAL : - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + return rtl::OUString("<="); case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -104,7 +104,7 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return rtl::OUString("="); } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index c3abd40497eb..dade8e0d2144 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -397,21 +397,21 @@ private: if (bRegExp) return GetXMLToken(XML_MATCH); else - return OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return OUString("="); } case SC_GREATER: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + return rtl::OUString(">"); case SC_GREATER_EQUAL: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + return rtl::OUString(">="); case SC_LESS: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + return rtl::OUString("<"); case SC_LESS_EQUAL: - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + return rtl::OUString("<="); case SC_NOT_EQUAL: if (bRegExp) return GetXMLToken(XML_NOMATCH); else - return OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + return OUString("!="); case SC_TOPPERC: return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL: @@ -419,7 +419,7 @@ private: default: ; } - return OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + return OUString("="); } class WriteSetItem : public std::unary_function<ScQueryEntry::Item, void> @@ -472,7 +472,7 @@ private: // Store the 1st value for backward compatibility. const ScQueryEntry::Item& rItem = rItems.front(); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rItem.maString); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString(RTL_CONSTASCII_USTRINGPARAM("="))); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString("=")); SvXMLElementExport aElemC(mrExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true); std::for_each(rItems.begin(), rItems.end(), WriteSetItem(mrExport)); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 5e5c2161ac1b..3ee937109f72 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -194,7 +194,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-decimal-number()")); break; case sheet::ValidationType_LIST : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-in-list(")); + sCondition += rtl::OUString("cell-content-is-in-list("); sCondition += aValidation.sFormula1; sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); break; @@ -221,7 +221,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const !aValidation.sFormula2.isEmpty()))) { if (aValidation.aValidationType != sheet::ValidationType_TEXT_LEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" and ")); + sCondition += rtl::OUString(" and "); if (aValidation.aOperator != sheet::ConditionOperator_BETWEEN && aValidation.aOperator != sheet::ConditionOperator_NOT_BETWEEN) { @@ -230,22 +230,22 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const switch (aValidation.aOperator) { case sheet::ConditionOperator_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + sCondition += rtl::OUString("="); break; case sheet::ConditionOperator_GREATER : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + sCondition += rtl::OUString(">"); break; case sheet::ConditionOperator_GREATER_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + sCondition += rtl::OUString(">="); break; case sheet::ConditionOperator_LESS : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + sCondition += rtl::OUString("<"); break; case sheet::ConditionOperator_LESS_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + sCondition += rtl::OUString("<="); break; case sheet::ConditionOperator_NOT_EQUAL : - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + sCondition += rtl::OUString("!="); break; default: { @@ -259,19 +259,19 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const if (aValidation.aValidationType == sheet::ValidationType_TEXT_LEN) { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-between(")); + sCondition += rtl::OUString("cell-content-text-length-is-between("); else - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-text-length-is-not-between(")); + sCondition += rtl::OUString("cell-content-text-length-is-not-between("); } else { if (aValidation.aOperator == sheet::ConditionOperator_BETWEEN) - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between(")); + sCondition += rtl::OUString("cell-content-is-between("); else - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between(")); + sCondition += rtl::OUString("cell-content-is-not-between("); } sCondition += aValidation.sFormula1; - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sCondition += rtl::OUString(","); sCondition += aValidation.sFormula2; sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index ed892944e65a..e53ca9a66205 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -157,7 +157,7 @@ void ScXMLTableColContext::EndElement() // #i57915# ScXMLImport::SetStyleToRange can't handle empty style names. // The default for a column if there is no attribute is the style "Default" (programmatic API name). if ( sCellStyleName.isEmpty() ) - sCellStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Default" )); + sCellStyleName = rtl::OUString( "Default" ); GetScImport().GetTables().AddColStyle(nColCount, sCellStyleName); } diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index a926e539c208..091b66fd3d5c 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -472,7 +472,7 @@ void ScXMLContentValidationContext::SetErrorMessage(const rtl::OUString& sTitle, void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute) { - sErrorMessageType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("macro")); + sErrorMessageType = rtl::OUString("macro"); bDisplayError = bExecute; } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 175a6c6af5c5..1d55a64526e9 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -213,7 +213,7 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw() @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance( OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLMetaExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLMetaExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw() @@ -247,7 +247,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance( OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLStylesExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLStylesExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw() @@ -264,7 +264,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance( OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLContentExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLContentExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw() @@ -281,7 +281,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLSettingsExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw() @@ -300,7 +300,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstanc OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw() @@ -318,7 +318,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance( OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw() @@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance( OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw() @@ -354,7 +354,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstanc OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw() @@ -372,7 +372,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstan OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw() @@ -420,12 +420,12 @@ sal_Int16 ScXMLExport::GetFieldUnit() { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xProperties( comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" )) ), + rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ), com::sun::star::uno::UNO_QUERY); if (xProperties.is()) { sal_Int16 nFieldUnit = 0; - if (xProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metric"))) >>= nFieldUnit) + if (xProperties->getPropertyValue(rtl::OUString("Metric")) >>= nFieldUnit) return nFieldUnit; } return 0; @@ -506,7 +506,7 @@ ScXMLExport::ScXMLExport( // This name is reserved for the external ref cache tables. This // should not conflict with user-defined styles since this name is // used for a table style which is not available in the UI. - sExternalRefTabStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta_extref")); + sExternalRefTabStyleName = rtl::OUString("ta_extref"); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName); sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME)); @@ -801,11 +801,11 @@ void ScXMLExport::_ExportMeta() CollectSharedData(nTableCount, nShapesCount); uno::Sequence<beans::NamedValue> stats(3); - stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")), + stats[0] = beans::NamedValue(::rtl::OUString("TableCount"), uno::makeAny(nTableCount)); - stats[1] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellCount")), + stats[1] = beans::NamedValue(::rtl::OUString("CellCount"), uno::makeAny(nCellCount)); - stats[2] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount")), + stats[2] = beans::NamedValue(::rtl::OUString("ObjectCount"), uno::makeAny(nShapesCount)); // update document statistics at the model @@ -1058,7 +1058,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd void ScXMLExport::ExportExternalRefCacheStyles() { sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex( - "NumberFormat", XML_NAMESPACE_STYLE, OUString(RTL_CONSTASCII_USTRINGPARAM("data-style-name"))); + "NumberFormat", XML_NAMESPACE_STYLE, OUString("data-style-name")); if (nEntryIndex < 0) // No entry index for the number format is found. @@ -1072,7 +1072,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() // Export each unique number format used in the external ref cache. vector<sal_uInt32> aNumFmts; pRefMgr->getAllCachedNumberFormats(aNumFmts); - const OUString aDefaultStyle = OUString(RTL_CONSTASCII_USTRINGPARAM("Default")).intern(); + const OUString aDefaultStyle = OUString("Default").intern(); for (vector<sal_uInt32>::const_iterator itr = aNumFmts.begin(), itrEnd = aNumFmts.end(); itr != itrEnd; ++itr) { @@ -1755,7 +1755,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) aStylesExp.exportDefaultStyle(xProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper); if (pSharedData->HasShapes()) @@ -1769,7 +1769,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) uno::Reference <container::XNameAccess> xStylesFamilies(xStyleFamiliesSupplier->getStyleFamilies()); if (xStylesFamilies.is()) { - uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles"))), uno::UNO_QUERY); + uno::Reference <container::XIndexAccess> xCellStyles(xStylesFamilies->getByName(rtl::OUString("CellStyles")), uno::UNO_QUERY); if (xCellStyles.is()) { sal_Int32 nCount(xCellStyles->getCount()); @@ -1790,7 +1790,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) } exportDataStyles(); - aStylesExp.exportStyleFamily(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles")), + aStylesExp.exportStyleFamily(rtl::OUString("CellStyles"), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL); SvXMLExport::_ExportStyles(bUsed); @@ -3012,7 +3012,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (xShapeProps.is()) { sal_Int32 nZOrder = 0; - if (xShapeProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder"))) >>= nZOrder) + if (xShapeProps->getPropertyValue(rtl::OUString("ZOrder")) >>= nZOrder) { rtl::OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, nZOrder); @@ -4405,39 +4405,39 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue> beans::PropertyValue* pChangeProps(aChangeProps.getArray()); if (pChangeProps) { - pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChanges")); + pChangeProps[SC_SHOW_CHANGES].Name = rtl::OUString("ShowChanges"); pChangeProps[SC_SHOW_CHANGES].Value <<= pViewSettings->ShowChanges(); - pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAcceptedChanges")); + pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Name = rtl::OUString("ShowAcceptedChanges"); pChangeProps[SC_SHOW_ACCEPTED_CHANGES].Value <<= pViewSettings->IsShowAccepted(); - pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowRejectedChanges")); + pChangeProps[SC_SHOW_REJECTED_CHANGES].Name = rtl::OUString("ShowRejectedChanges"); pChangeProps[SC_SHOW_REJECTED_CHANGES].Value <<= pViewSettings->IsShowRejected(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Name = rtl::OUString("ShowChangesByDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME].Value <<= pViewSettings->HasDate(); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeMode")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Name = rtl::OUString("ShowChangesByDatetimeMode"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_MODE].Value <<= static_cast<sal_Int16>(pViewSettings->GetTheDateMode()); util::DateTime aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheFirstDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeFirstDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeFirstDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME].Value <<= aDateTime; ScXMLConverter::ConvertCoreToAPIDateTime(pViewSettings->GetTheLastDateTime(), aDateTime); - pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByDatetimeSecondDatetime")); + pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Name = rtl::OUString("ShowChangesByDatetimeSecondDatetime"); pChangeProps[SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME].Value <<= aDateTime; - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthor")); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Name = rtl::OUString("ShowChangesByAuthor"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR].Value <<= pViewSettings->HasAuthor(); - pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByAuthorName")); + pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Name = rtl::OUString("ShowChangesByAuthorName"); pChangeProps[SC_SHOW_CHANGES_BY_AUTHOR_NAME].Value <<= rtl::OUString (pViewSettings->GetTheAuthorToShow()); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByComment")); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Name = rtl::OUString("ShowChangesByComment"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT].Value <<= pViewSettings->HasComment(); - pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByCommentText")); + pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Name = rtl::OUString("ShowChangesByCommentText"); pChangeProps[SC_SHOW_CHANGES_BY_COMMENT_TEXT].Value <<= rtl::OUString (pViewSettings->GetTheComment()); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRanges")); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString("ShowChangesByRanges"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange(); rtl::OUString sRangeList; ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), FormulaGrammar::CONV_OOO); - pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRangesList")); + pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString("ShowChangesByRangesList"); pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList; - pProps[nChangePos].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesViewSettings")); + pProps[nChangePos].Name = rtl::OUString("TrackedChangesViewSettings"); pProps[nChangePos].Value <<= aChangeProps; } } @@ -4460,13 +4460,13 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { Rectangle aRect(pEmbeddedObj->GetVisArea()); sal_uInt16 i(0); - pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop")); + pProps[i].Name = rtl::OUString("VisibleAreaTop"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft")); + pProps[++i].Name = rtl::OUString("VisibleAreaLeft"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth")); + pProps[++i].Name = rtl::OUString("VisibleAreaWidth"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth()); - pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight")); + pProps[++i].Name = rtl::OUString("VisibleAreaHeight"); pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight()); } } @@ -4485,7 +4485,7 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")), uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(rProps, xProperties); @@ -4521,19 +4521,19 @@ void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps.realloc(nCount + nPropsToAdd); if (aTrackedChangesKey.getLength()) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey")); + rProps[nCount].Name = rtl::OUString("TrackedChangesProtectionKey"); rProps[nCount].Value <<= aTrackedChangesKey.makeStringAndClear(); ++nCount; } if( bVBACompat ) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode")); + rProps[nCount].Name = rtl::OUString("VBACompatibilityMode"); rProps[nCount].Value <<= bVBACompat; ++nCount; } if( xCodeNameAccess.is() ) { - rProps[nCount].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration")); + rProps[nCount].Name = rtl::OUString("ScriptConfiguration"); rProps[nCount].Value <<= xCodeNameAccess; ++nCount; } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 0d766521ea0f..c57810805c9f 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -107,7 +107,7 @@ using ::rtl::OUStringBuffer; OUString SAL_CALL ScXMLImport_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw() @@ -126,7 +126,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisMetaImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw() @@ -145,7 +145,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisStylesImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw() @@ -164,7 +164,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisContentImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisContentImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw() @@ -183,7 +183,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ); } uno::Sequence< rtl::OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw() @@ -2566,7 +2566,7 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa } } } - uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.SpreadsheetSettings"))); + uno::Reference <uno::XInterface> xInterface = xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.comp.SpreadsheetSettings")); uno::Reference <beans::XPropertySet> xProperties(xInterface, uno::UNO_QUERY); if (xProperties.is()) SvXMLUnitConverter::convertPropertySet(xProperties, aConfigProps); @@ -2615,7 +2615,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri { rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring ")); sErrorMessage += sFormatString; - sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" an Position ")); + sErrorMessage += rtl::OUString(" an Position "); sErrorMessage += rtl::OUString::valueOf(rException.CheckPos); uno::Sequence<rtl::OUString> aSeq(1); aSeq[0] = sErrorMessage; @@ -2746,7 +2746,7 @@ void ScXMLImport::AddStyleRange(const table::CellRangeAddress& rCellRange) { uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) - xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))), uno::UNO_QUERY)); + xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); } @@ -2802,7 +2802,7 @@ void ScXMLImport::SetStyleToRanges() if (xMultiServiceFactory.is()) xSheetCellRanges.set(uno::Reference <sheet::XSheetCellRangeContainer>( xMultiServiceFactory->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges"))), + rtl::OUString("com.sun.star.sheet.SheetCellRanges")), uno::UNO_QUERY)); } OSL_ENSURE(xSheetCellRanges.is(), "didn't get SheetCellRanges"); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index a74113bd6997..a0904fe90c1d 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -733,11 +733,11 @@ void ScXMLAutoStylePoolP::exportStyleContent( aOperator == sheet::ConditionOperator_NOT_BETWEEN) { if (aOperator == sheet::ConditionOperator_BETWEEN) - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-between(")); + sCondition = rtl::OUString("cell-content-is-between("); else - sCondition = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-not-between(")); + sCondition = rtl::OUString("cell-content-is-not-between("); sCondition += xSheetCondition->getFormula1(); - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sCondition += rtl::OUString(","); sCondition += xSheetCondition->getFormula2(); sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } @@ -747,22 +747,22 @@ void ScXMLAutoStylePoolP::exportStyleContent( switch (aOperator) { case sheet::ConditionOperator_LESS: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); + sCondition += rtl::OUString("<"); break; case sheet::ConditionOperator_GREATER: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); + sCondition += rtl::OUString(">"); break; case sheet::ConditionOperator_LESS_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); + sCondition += rtl::OUString("<="); break; case sheet::ConditionOperator_GREATER_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); + sCondition += rtl::OUString(">="); break; case sheet::ConditionOperator_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); + sCondition += rtl::OUString("="); break; case sheet::ConditionOperator_NOT_EQUAL: - sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!=")); + sCondition += rtl::OUString("!="); break; default: { @@ -1080,7 +1080,7 @@ sal_Bool XmlScPropHdl_CellProtection::exportXML( else if (aCellProtection.IsFormulaHidden && aCellProtection.IsLocked) { rStrExpValue = GetXMLToken(XML_PROTECTED); - rStrExpValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + rStrExpValue += rtl::OUString(" "); rStrExpValue += GetXMLToken(XML_FORMULA_HIDDEN); bRetval = sal_True; } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index a29930b69daf..249173dec035 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -577,7 +577,7 @@ void XMLTableStyleContext::SetDefaults() uno::Reference <lang::XMultiServiceFactory> xMultiServiceFactory(GetImport().GetModel(), uno::UNO_QUERY); if (xMultiServiceFactory.is()) { - uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.Defaults"))), uno::UNO_QUERY); + uno::Reference <beans::XPropertySet> xProperties(xMultiServiceFactory->createInstance(rtl::OUString("com.sun.star.sheet.Defaults")), uno::UNO_QUERY); if (xProperties.is()) FillPropertySet(xProperties); } @@ -709,7 +709,7 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, const uno::Reference< XAttributeList > & xAttrList, const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), - sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) )), + sCellStyleServiceName( rtl::OUString( "com.sun.star.style.CellStyle" )), sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), sRowStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))), sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))), @@ -800,7 +800,7 @@ uno::Reference < XNameContainer > xStyles.set(xTableStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TableStyles" ) )); + OUString( rtl::OUString( "TableStyles" )); } break; case XML_STYLE_FAMILY_TABLE_CELL: @@ -809,7 +809,7 @@ uno::Reference < XNameContainer > xStyles.set(xCellStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) )); + OUString( rtl::OUString( "CellStyles" )); } break; case XML_STYLE_FAMILY_TABLE_COLUMN: @@ -818,7 +818,7 @@ uno::Reference < XNameContainer > xStyles.set(xColumnStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnStyles" ) )); + OUString( rtl::OUString( "ColumnStyles" )); } break; case XML_STYLE_FAMILY_TABLE_ROW: @@ -827,7 +827,7 @@ uno::Reference < XNameContainer > xStyles.set(xRowStyles); else sName = - OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowStyles" ) )); + OUString( rtl::OUString( "RowStyles" )); } break; } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 67e8167e3d87..2aca9fda70d4 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -137,7 +137,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe aParserInput.aInputStream = xDocStream->getInputStream(); uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY ); - uno::Any aAny = xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); + uno::Any aAny = xSet->getPropertyValue( OUString("Encrypted") ); aAny >>= bEncrypted; } catch( const packages::WrongPasswordException& ) @@ -389,7 +389,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) { sal_Int32 nProgressRange(1000000); xStatusIndicator->start(ScGlobal::GetRscString(STR_LOAD_DOC), nProgressRange); - xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressRange")), uno::makeAny(nProgressRange)); + xInfoSet->setPropertyValue(rtl::OUString("ProgressRange"), uno::makeAny(nProgressRange)); } // Set base URI @@ -410,11 +410,11 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) aName = pDocHierarchItem->GetValue(); } else - aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" )); + aName = ::rtl::OUString( "dummyObjectName" ); if( !aName.isEmpty() ) { - sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = rtl::OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -528,9 +528,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import start" ); nStylesRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesImporter")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesImporter")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("styles.xml")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesImporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLStylesImporter"), + rtl::OUString("styles.xml"), sEmpty, aStylesArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles import end" ); @@ -549,10 +549,10 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import start" ); nDocRetval = ImportFromComponent(xServiceFactory, xModel, xXMLParser, aParserInput, - bOasis ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentImporter")) - : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentImporter")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content.xml")), aDocArgs, + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentImporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLContentImporter"), + rtl::OUString("content.xml"), + rtl::OUString("Content.xml"), aDocArgs, sal_True); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content import end" ); @@ -610,14 +610,14 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) } // Set Code Names - uno::Any aAny = xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration") )); + uno::Any aAny = xInfoSet->getPropertyValue(OUString("ScriptConfiguration")); uno::Reference <container::XNameAccess> xCodeNameAccess; if( aAny >>= xCodeNameAccess ) XMLCodeNameProvider::set( xCodeNameAccess, &rDoc ); // VBA compatibility bool bVBACompat = false; - if ( (xInfoSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"))) >>= bVBACompat) && bVBACompat ) + if ( (xInfoSet->getPropertyValue(OUString("VBACompatibilityMode")) >>= bVBACompat) && bVBACompat ) { /* Set library container to VBA compatibility mode, this forces loading the Basic project, which in turn creates the @@ -625,7 +625,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) if ( xModelSet.is() ) try { uno::Reference< script::vba::XVBACompatibility > xVBACompat( xModelSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW ); + OUString( "BasicLibraries" ) ), uno::UNO_QUERY_THROW ); xVBACompat->setVBACompatibilityMode( sal_True ); } catch( const uno::Exception& ) @@ -682,7 +682,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if (xSet.is()) { - xSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(sMediaType)); + xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType)); OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); // advise storage impl to use common encryption @@ -794,7 +794,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) SfxObjectShell* pObjSh = rDoc.GetDocumentShell(); uno::Sequence<beans::PropertyValue> aDescriptor(1); beans::PropertyValue* pProps = aDescriptor.getArray(); - pProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ) ); + pProps[0].Name = OUString( "FileName" ); pProps[0].Value <<= sFileName; /** property map for export info set */ @@ -852,7 +852,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if( !aName.isEmpty() ) { - sPropName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")); + sPropName = rtl::OUString("StreamRelPath"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aName ) ); } } @@ -873,7 +873,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) { ::rtl::OUString aVersion; if (( xPropSet->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version"))) >>= aVersion ) + rtl::OUString("Version")) >>= aVersion ) && !aVersion.equals(ODFVER_010_TEXT) && !aVersion.equals(ODFVER_011_TEXT) ) { @@ -902,10 +902,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export start" ); bMetaRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("meta.xml")), + rtl::OUString("meta.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisMetaExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisMetaExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLMetaExporter"), aMetaArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" ); @@ -943,10 +943,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export start" ); bStylesRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("styles.xml")), + rtl::OUString("styles.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisStylesExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLStylesExporter"), aStylesArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" ); @@ -967,10 +967,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export start" ); bDocRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("content.xml")), + rtl::OUString("content.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisContentExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLContentExporter"), aDocArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" ); @@ -995,10 +995,10 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export start" ); bSettingsRet = ExportToComponent(xServiceFactory, xModel, xWriter, aDescriptor, - rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("settings.xml")), + rtl::OUString("settings.xml"), sTextMediaType, - bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisSettingsExporter")) - : rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsExporter")), + bOasis ? rtl::OUString("com.sun.star.comp.Calc.XMLOasisSettingsExporter") + : rtl::OUString("com.sun.star.comp.Calc.XMLSettingsExporter"), aSettingsArgs, pSharedData); RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 4dd5387721b6..eadf4b239b4a 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -268,7 +268,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleCell::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCell")); + return rtl::OUString("ScAccessibleCell"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -280,7 +280,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessibleCell")); + pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessibleCell"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 0e7220ad3459..b9a0e082cd7d 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -290,7 +290,7 @@ uno::Any SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleCellBase")); + return rtl::OUString("ScAccessibleCellBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index a6b6c9e6d790..f19eb7c4692a 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -467,7 +467,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( ScAccessibleContextBase::getImplementationName(void) throw (uno::RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleContextBase")); + return OUString("ScAccessibleContextBase"); } sal_Bool SAL_CALL @@ -494,8 +494,8 @@ uno::Sequence< ::rtl::OUString> SAL_CALL OUString* pServiceNames = aServiceNames.getArray(); if (pServiceNames) { - pServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.Accessible")); - pServiceNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.accessibility.AccessibleContext")); + pServiceNames[0] = OUString("com.sun.star.accessibility.Accessible"); + pServiceNames[1] = OUString("com.sun.star.accessibility.AccessibleContext"); } return aServiceNames; diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 035004ae60f4..0b3141f7f3a8 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -450,7 +450,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc ::rtl::OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotControl")); + return rtl::OUString("ScAccessibleDataPilotControl"); } ///===== XTypeProvider =================================================== @@ -661,7 +661,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc ::rtl::OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDataPilotButton")); + return rtl::OUString("ScAccessibleDataPilotButton"); } ///===== XTypeProvider =================================================== diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e0d17a63dfbc..76f84f0441ed 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1040,7 +1040,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerID" ))); + uno::Any aPropAny = xShapeProp->getPropertyValue(rtl::OUString( "LayerID" )); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1787,7 +1787,7 @@ void SAL_CALL ScAccessibleDocument::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleDocument")); + return ::rtl::OUString("ScAccessibleDocument"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -1799,7 +1799,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetDocumentView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetDocumentView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index be40bd82f2be..99927af07599 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1594,7 +1594,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge ::rtl::OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) throw (uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleDocumentPagePreview")); + return ::rtl::OUString("ScAccessibleDocumentPagePreview"); } uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) @@ -1605,7 +1605,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSup aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheetPageView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheetPageView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 8a5ed0294479..8c8583ecf9cb 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -275,7 +275,7 @@ void SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleEditObject")); + return rtl::OUString("ScAccessibleEditObject"); } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index fbab89dfacc5..d2618789456a 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -160,7 +160,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() OUString ScAccessibleFilterMenu::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenu")); + return OUString("ScAccessibleFilterMenu"); } // XAccessibleEventBroadcaster diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index feb88a715d27..dfaae342ba46 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -79,7 +79,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet OUString ScAccessibleFilterMenuItem::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenuItem")); + return OUString("ScAccessibleFilterMenuItem"); } // XAccessibleAction @@ -99,7 +99,7 @@ sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("click")); + return OUString("click"); } Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding( diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 58df96c3638a..c5511140c64b 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -84,7 +84,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterTopWindow")); + return OUString("ScAccessibleFilterTopWindow"); } void ScAccessibleFilterTopWindow::setAccessibleChild( diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 5af2ec182fbc..7291e3ffc7ef 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -318,7 +318,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess rtl::OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePageHeader")); + return rtl::OUString("ScAccessiblePageHeader"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() @@ -329,7 +329,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServic aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AccessibleHeaderFooterView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.text.AccessibleHeaderFooterView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 40bf5a636892..61efa0e810e1 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -185,7 +185,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessiblePageHeaderArea")); + return rtl::OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -197,7 +197,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index f532a72492ff..ce6a79a52da1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -182,7 +182,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi rtl::OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewCell")); + return rtl::OUString("ScAccessiblePreviewCell"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() @@ -193,7 +193,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServi aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index eb80f9d9f14e..3f747ee53947 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -268,7 +268,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewHeaderCell")); + return rtl::OUString("ScAccessiblePreviewHeaderCell"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() @@ -279,7 +279,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupporte aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleCellView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleCellView"); return aSequence; } @@ -376,7 +376,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr { //! name for corner cell? -// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header")); +// sName = rtl::OUString("Column/Row Header"); } else { diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index d7833cd64674..557db8336f5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -568,7 +568,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce rtl::OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessiblePreviewTable")); + return rtl::OUString("ScAccessiblePreviewTable"); } uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() @@ -579,7 +579,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServ aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.AccessibleTableView")); + pNames[nOldSize] = rtl::OUString("com.sun.star.table.AccessibleTableView"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index e4d00607fa6b..88037b59b4c5 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -798,7 +798,7 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) ::rtl::OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleSpreadsheet")); + return rtl::OUString("ScAccessibleSpreadsheet"); } uno::Sequence< ::rtl::OUString> SAL_CALL @@ -810,7 +810,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL aSequence.realloc(nOldSize + 1); ::rtl::OUString* pNames = aSequence.getArray(); - pNames[nOldSize] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.AccessibleSpreadsheet")); + pNames[nOldSize] = rtl::OUString("com.sun.star.AccessibleSpreadsheet"); return aSequence; } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 3a950c49e3f6..b5de4ab84886 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -439,7 +439,7 @@ void SAL_CALL ::rtl::OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) throw (uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("ScAccessibleTableBase")); + return rtl::OUString("ScAccessibleTableBase"); } //===== XTypeProvider =================================================== diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 75bb92b8ad8e..f34b346b2ff7 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2776,7 +2776,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + rtl::OUString("'")); aReplace = rtl::OUString(pAuto->GetEndSingleQuote()); if (aReplace.isEmpty()) @@ -2784,7 +2784,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) if (!aReplace.equalsAsciiL("'", 1)) aString = aString.replaceAll( aReplace, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"))); + rtl::OUString("'")); } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6ada63d7fdff..27ff958d4176 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1088,7 +1088,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -2096,7 +2096,7 @@ namespace { rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) { rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aString.append(rtl::OUString(" (")); aString.append(rTableName); aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 7b35091fd679..01602ecf8460 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -136,7 +136,7 @@ void ScDLL::Init() ScModule* pMod = new ScModule( &ScDocShell::Factory() ); (*ppShlPtr) = pMod; - ScDocShell::Factory().SetDocumentServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) ); + ScDocShell::Factory().SetDocumentServiceName( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); ScGlobal::Init(); // erst wenn der ResManager initialisiert ist // erst nach ScGlobal::Init duerfen die App-Optionen diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 29f9618107da..2951c569a161 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -550,7 +550,7 @@ void ScModule::Execute( SfxRequest& rReq ) { try { - com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY); + com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY); if( xDialog.is() ) { xDialog->execute(); diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 925ff9963cc8..910b6c50d9c4 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -49,7 +49,7 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create() if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( ScAbstractDialogFactory* (SAL_CALL*)() ) - aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) ); + aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") ); if ( fp ) return fp(); return 0; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 98f37d0a31f2..e13894aef1f1 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -93,7 +93,7 @@ ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sa maLabelFont.SetHeight(nPopupFontHeight); SetFont(maLabelFont); - SetText( OUString(RTL_CONSTASCII_USTRINGPARAM("ScMenuFloatingWindow")) ); + SetText( OUString("ScMenuFloatingWindow") ); } ScMenuFloatingWindow::~ScMenuFloatingWindow() diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 9fcf586e362f..120a633b4812 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -311,7 +311,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); + aArgs[0].Name = rtl::OUString( "ScalingFactor" ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); @@ -351,7 +351,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" )); + aArgs[0].Name = rtl::OUString( "ScalingFactor" ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( m_xDispatchProvider, rtl::OUString(".uno:ScalingFactor"), aArgs ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index f45c7f20e288..23fdc2329f0f 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -75,7 +75,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY); uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), + rtl::OUString("_beamer"), frame::FrameSearchFlag::CHILDREN); if (xBeamerFrame.is()) { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 28c7af47d308..97cb21813ba3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2810,7 +2810,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St uno::Reference< uno::XInterface > xDocModuleApiObject; if ( xSF.is() ) { - xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY ); + xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY ); xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY ); } return xDocModuleApiObject; @@ -2855,12 +2855,12 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModul nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Sheet")) + rtl::OUString::valueOf( ++nNum ); + genModuleName = rtl::OUString( "Sheet") + rtl::OUString::valueOf( ++nNum ); uno::Any aSourceAny; rtl::OUString sTmpSource = sSource; if ( sTmpSource.isEmpty() ) - sTmpSource = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" )); + sTmpSource = ::rtl::OUString( "Rem Attribute VBA_ModuleType=VBADocumentModule\nOption VBASupport 1\n" ); aSourceAny <<= sTmpSource; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 150c26993b5a..67ae652f7d49 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -685,7 +685,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::UNO_QUERY_THROW ); uno::Reference< container::XContentEnumerationAccess > xEnumAccess( xServiceManager, uno::UNO_QUERY_THROW ); uno::Reference< container::XEnumeration> xEnum = xEnumAccess->createContentEnumeration( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ) ); + ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocumentJob" ) ); if ( xEnum.is() ) { while ( xEnum->hasMoreElements() ) @@ -703,7 +703,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL ); uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 ); uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW ); - aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )), + aArgsForJob[0] = beans::NamedValue( ::rtl::OUString( "SpreadsheetView" ), uno::makeAny( xSpreadsheetView ) ); xJob->execute( aArgsForJob ); } @@ -831,7 +831,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW ); // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge uno::Sequence< beans::PropertyValue > aValues(1); - aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName")); + aValues[0].Name = ::rtl::OUString( "FilterName"); aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); @@ -2921,7 +2921,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) // Grab the Calc configuration. Reference<XUIConfigurationManager> xConfigMgr = xModuleCfgSupplier->getUIConfigurationManager( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))); + OUString("com.sun.star.sheet.SpreadsheetDocument")); if (!xConfigMgr.is()) return; @@ -2968,15 +2968,15 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ) switch (eType) { case ScOptionsUtil::KEY_DEFAULT: - xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents"))); - xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete"))); - xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillDown"))); - xScAccel->setKeyEvent(aAltDown, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect"))); + xScAccel->setKeyEvent(aDelete, OUString(".uno:ClearContents")); + xScAccel->setKeyEvent(aBackspace, OUString(".uno:Delete")); + xScAccel->setKeyEvent(aCtrlD, OUString(".uno:FillDown")); + xScAccel->setKeyEvent(aAltDown, OUString(".uno:DataSelect")); break; case ScOptionsUtil::KEY_OOO_LEGACY: - xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete"))); - xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents"))); - xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect"))); + xScAccel->setKeyEvent(aDelete, OUString(".uno:Delete")); + xScAccel->setKeyEvent(aBackspace, OUString(".uno:ClearContents")); + xScAccel->setKeyEvent(aCtrlD, OUString(".uno:DataSelect")); break; default: ; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 5591d60b4cc8..93d1ca04f10e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2339,7 +2339,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() SC_MOD()->SetInSharedDocLoading( true ); uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + aArgs[0].Name = ::rtl::OUString( "Hidden" ); aArgs[0].Value <<= sal_True; if ( GetMedium() ) @@ -2354,7 +2354,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } xModel.set( - xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, aArgs ), + xLoader->loadComponentFromURL( GetSharedFileURL(), ::rtl::OUString( "_blank" ), 0, aArgs ), uno::UNO_QUERY_THROW ); SC_MOD()->SetInSharedDocLoading( false ); } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 82687c8458c1..40c4a0fe5ca4 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -175,7 +175,7 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands(); - rtl::OUString aTransferName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "transfer" )); + rtl::OUString aTransferName = rtl::OUString( "transfer" ); if ( xInfo->hasCommandByName( aTransferName ) ) { aDestPath.executeCommand( aTransferName, uno::makeAny( @@ -208,7 +208,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )), + aCnt.executeCommand( rtl::OUString( "delete" ), comphelper::makeBoolAny( sal_True ) ); } catch( uno::Exception& ) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 83b8bff74a5f..0429fc820b60 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2155,7 +2155,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt { // Generate a relative file path. INetURLObject aBaseURL(getOwnDocumentName()); - aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))); + aBaseURL.insertName(OUString("content.xml")); OUString aStr = URIHelper::simpleNormalizedMakeRelative( aBaseURL.GetMainURL(INetURLObject::NO_DECODE), aFile); @@ -2279,7 +2279,7 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const String& rO // Formulate the absolute file path from the relative path. const OUString& rRelPath = maRelativeName; INetURLObject aBaseURL(rOwnDocName); - aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"))); + aBaseURL.insertName(OUString("content.xml")); bool bWasAbs = false; maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::NO_DECODE); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 36d7d79086cc..4dca12ab764e 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2262,7 +2262,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get() bLoaded = aModule.load(sFilterLib); if (bLoaded) { - oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFilterCreate" )) ); + oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString( "ScFilterCreate" ) ); if (fn != NULL) plugin = reinterpret_cast<FilterFn>(fn)(); } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 95e589db63c9..c9cd38ea34b0 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -176,16 +176,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + ::rtl::OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + ::rtl::OUString("DataRowSource"), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); @@ -290,7 +290,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); if ( xSet.is() ) { - xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")), + xSet->setPropertyValue( ::rtl::OUString("PluginURL"), uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) ); } } @@ -667,7 +667,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { uno::Reference< ui::dialogs::XExecutableDialog > xDialog( xMCF->createInstanceWithContext( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog")) + rtl::OUString("com.sun.star.comp.chart2.WizardDialog") , xContext), uno::UNO_QUERY); uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY ); if( xChartModel.is() && xInit.is() ) @@ -677,10 +677,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* uno::Sequence<uno::Any> aSeq(2); uno::Any* pArray = aSeq.getArray(); beans::PropertyValue aParam1; - aParam1.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")); + aParam1.Name = rtl::OUString("ParentWindow"); aParam1.Value <<= uno::makeAny(xDialogParentWindow); beans::PropertyValue aParam2; - aParam2.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel")); + aParam2.Name = rtl::OUString("ChartModel"); aParam2.Value <<= uno::makeAny(xChartModel); pArray[0] <<= uno::makeAny(aParam1); pArray[1] <<= uno::makeAny(aParam2); @@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //get dialog size: awt::Size aDialogAWTSize; - if( xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) + if( xDialogProps->getPropertyValue( ::rtl::OUString("Size") ) >>= aDialogAWTSize ) { Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height ); @@ -702,12 +702,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* { //calculate and set new position Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect ); - xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")), + xDialogProps->setPropertyValue( ::rtl::OUString("Position"), uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) ); } } //tell the dialog to unlock controller - xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnlockControllersOnExecute")), + xDialogProps->setPropertyValue( ::rtl::OUString("UnlockControllersOnExecute"), uno::makeAny( sal_True ) ); } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index a3568b0992fb..d07cefa60b47 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -211,7 +211,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { try { - aCaller = xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ); + aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); } catch( uno::Exception& ) {} } diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index d74d32decda1..9799b70d55c6 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -643,7 +643,7 @@ namespace { rtl::OUString createLocalRangeName(const rtl::OUString& rName, const rtl::OUString& rTableName) { rtl::OUStringBuffer aString (rName); - aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("))); + aString.append(rtl::OUString(" (")); aString.append(rTableName); aString.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))); return aString.makeStringAndClear(); diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index fd8c3e0102d1..e3b3c6498a8b 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -186,7 +186,7 @@ void ScUndoDeleteContents::Undo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } @@ -202,7 +202,7 @@ void ScUndoDeleteContents::Redo() { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 3b935e7f521a..fd09d198dcc0 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -284,7 +284,7 @@ void ScUndoEnterData::Undo() { aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } @@ -318,7 +318,7 @@ void ScUndoEnterData::Redo() { aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index b2137e8e7c3f..33a788dfcbb2 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -195,7 +195,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance( rtl::OUString ScAutoFormatsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" )); + return rtl::OUString( "stardiv.StarCalc.ScAutoFormatsObj" ); } uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static() @@ -319,7 +319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess @@ -477,7 +477,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableAutoFormatEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 95a4c356a149..906a227a548d 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -367,7 +367,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( rtl::OUString ScSpreadsheetSettings::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" )); + return rtl::OUString( "stardiv.StarCalc.ScSpreadsheetSettings" ); } uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() @@ -629,7 +629,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance( rtl::OUString ScRecentFunctionsObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" )); + return rtl::OUString( "stardiv.StarCalc.ScRecentFunctionsObj" ); } uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static() @@ -710,7 +710,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance( rtl::OUString ScFunctionListObj::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" )); + return rtl::OUString( "stardiv.StarCalc.ScFunctionListObj" ); } uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static() @@ -882,7 +882,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptionEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); } // XElementAccess diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index b2454d3639c9..0109379986c8 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -79,7 +79,7 @@ namespace calc // register our property at the base class CellRangeAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRange" )), + ::rtl::OUString( "CellRange" ), PROP_HANDLE_RANGE_ADDRESS, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -176,7 +176,7 @@ namespace calc //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellListSource" ) ); + return ::rtl::OUString( "com.sun.star.comp.sheet.OCellListSource" ); } //-------------------------------------------------------------------- @@ -196,8 +196,8 @@ namespace calc Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeListSource" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ListEntrySource" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellRangeListSource" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ListEntrySource" ); return aServices; } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index bcab454b54ca..90511ae45d18 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3374,7 +3374,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe ScDocument* pDoc = pDocShell->GetDocument(); ScRangeListRef aRangesRef( new ScRangeList(aRanges) ); ScChartListenerCollection* pColl = pDoc->GetChartListenerCollection(); - rtl::OUString aName = pColl->getUniqueName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("__Uno"))); + rtl::OUString aName = pColl->getUniqueName(rtl::OUString("__Uno")); if (aName.isEmpty()) // failed to create unique name. return; @@ -4762,7 +4762,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); } // XIndexAccess @@ -4803,7 +4803,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException) rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" )); + return rtl::OUString( "ScCellRangesObj" ); } sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName ) @@ -6090,7 +6090,7 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" )); + return rtl::OUString( "ScCellRangeObj" ); } sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -6807,7 +6807,7 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" )); + return rtl::OUString( "ScCellObj" ); } sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName ) @@ -8706,7 +8706,7 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" )); + return rtl::OUString( "ScTableSheetObj" ); } sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 7356423f2980..b438d3b23973 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -85,7 +85,7 @@ namespace calc // register our property at the base class CellAddress aInitialPropValue; registerPropertyNoMember( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BoundCell" )), + ::rtl::OUString( "BoundCell" ), PROP_HANDLE_BOUND_CELL, PropertyAttribute::BOUND | PropertyAttribute::READONLY, ::getCppuType( &aInitialPropValue ), @@ -254,7 +254,7 @@ namespace calc if ( xProp.is() ) { CellContentType eResultType; - if ( (xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormulaResultType" )) ) >>= eResultType) && eResultType == CellContentType_VALUE ) + if ( (xProp->getPropertyValue(::rtl::OUString( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE ) bHasValue = sal_True; } } @@ -417,10 +417,10 @@ namespace calc if ( xOldFormat.is() ) { // use the locale of the existing format - xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale; + xOldFormat->getPropertyValue( ::rtl::OUString( "Locale" ) ) >>= aLocale; sal_Int16 nOldType = ::comphelper::getINT16( - xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) ); + xOldFormat->getPropertyValue( ::rtl::OUString( "Type" ) ) ); if ( nOldType & NumberFormat::LOGICAL ) bWasBoolean = sal_True; } @@ -471,7 +471,7 @@ namespace calc { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellValueBinding" ) ); + return ::rtl::OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } //-------------------------------------------------------------------- @@ -495,10 +495,10 @@ namespace calc DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); Sequence< ::rtl::OUString > aServices( m_bListPos ? 3 : 2 ); - aServices[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellValueBinding" ) ); - aServices[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.binding.ValueBinding" ) ); + aServices[ 0 ] = ::rtl::OUString( "com.sun.star.table.CellValueBinding" ); + aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.binding.ValueBinding" ); if ( m_bListPos ) - aServices[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.ListPositionCellBinding" ) ); + aServices[ 2 ] = ::rtl::OUString( "com.sun.star.table.ListPositionCellBinding" ); return aServices; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index ccb152484ff5..9282a2737371 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1802,7 +1802,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum { Reference< beans::XPropertySet > xSeqProp( xLS->getValues(), uno::UNO_QUERY ); ::rtl::OUString aRole; - if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role"))) >>= aRole) && + if( xSeqProp.is() && (xSeqProp->getPropertyValue(::rtl::OUString("Role")) >>= aRole) && aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) ) bThisIsCategories = bHasCategories = true; } @@ -1904,7 +1904,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); func.getList(aTableNumList); aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")), -1, + beans::PropertyValue( ::rtl::OUString("TableNumberList"), -1, uno::makeAny( lcl_createTableNumberList( aTableNumList ) ), beans::PropertyState_DIRECT_VALUE )); } @@ -1913,7 +1913,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + beans::PropertyValue( ::rtl::OUString("DataRowSource"), -1, uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE )); } @@ -1921,7 +1921,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + beans::PropertyValue( ::rtl::OUString("HasCategories"), -1, uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE )); } @@ -1929,7 +1929,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bRowSourceDetected ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + beans::PropertyValue( ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE )); } @@ -1955,7 +1955,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum // add cell range property aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + beans::PropertyValue( ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE )); //Sequence Mapping @@ -2025,7 +2025,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum if( bDifferentIndexes && !aSequenceMappingVector.empty() ) { aResult.push_back( - beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceMapping")), -1, + beans::PropertyValue( ::rtl::OUString("SequenceMapping"), -1, uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) ) , beans::PropertyState_DIRECT_VALUE )); } @@ -2486,7 +2486,7 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc, // rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument ); // m_aIdentifier = ::rtl::OUString( aStr ); -// m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_")); +// m_aIdentifier = ::rtl::OUString( "ID_"); // static sal_Int32 nID = 0; // m_aIdentifier += ::rtl::OUString::valueOf( ++nID); } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 8072f3b0d728..d0f688f424c7 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -259,16 +259,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, // set arguments uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1, + ::rtl::OUString("CellRangeRepresentation"), -1, uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1, + ::rtl::OUString("HasCategories"), -1, uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1, + ::rtl::OUString("FirstCellAsLabel"), -1, uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ); aArgs[3] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1, + ::rtl::OUString("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); xReceiver->setArguments( aArgs ); } @@ -314,7 +314,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableChartsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableChartsEnumeration")); } // XIndexAccess @@ -447,7 +447,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN) pDocShell->GetDocument()->AddUnoObject(*this); uno::Sequence< table::CellRangeAddress > aInitialPropValue; - registerPropertyNoMember( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RelatedCellRanges" )), + registerPropertyNoMember( ::rtl::OUString( "RelatedCellRanges" ), PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID, ::getCppuType( &aInitialPropValue ), &aInitialPropValue ); } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 8ac0dfbf9d75..f26007d854f1 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -268,13 +268,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( uno::Sequence< beans::PropertyValue > aInfo; if ( !( aValue >>= aInfo ) ) throw lang::IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ), + ::rtl::OUString( "Value of type Sequence<PropertyValue> expected!" ), uno::Reference< uno::XInterface >(), 2 ); if ( !pDocShell->SetModifyPasswordInfo( aInfo ) ) throw beans::PropertyVetoException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The hash is not allowed to be changed now!" ) ), + ::rtl::OUString( "The hash is not allowed to be changed now!" ), uno::Reference< uno::XInterface >() ); } else if ( aPropertyName.compareToAscii( SC_UNO_EMBED_FONTS ) == 0 ) @@ -461,7 +461,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" )); + return rtl::OUString( "ScDocumentConfiguration" ); } sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index ec6047707ff5..a71a324bf5c8 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -458,7 +458,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" )); + return rtl::OUString( "ScCellCursorObj" ); } sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ac9293f5f63f..bb7830dbd726 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -468,7 +468,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotTablesEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); } // XIndexAccess @@ -1746,7 +1746,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotFieldsEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); } // XIndexAccess @@ -2995,7 +2995,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ) ); + return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); } // XElementAccess @@ -3183,7 +3183,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration( this, OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ) ); + return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); } // XElementAccess @@ -3330,7 +3330,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() throw(RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DataPilotItemsEnumeration"))); + return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index c2b441dc3470..b45539503323 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -675,7 +675,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SubTotalFieldsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); } // XIndexAccess @@ -2218,7 +2218,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" )); + return rtl::OUString( "ScDatabaseRangeObj" ); } sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -2335,7 +2335,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DatabaseRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 18b9e5b6b7af..6fa397e52f8c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -250,7 +250,7 @@ ScPrintUIOptions::ScPrintUIOptions() ! bSuppress); // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; - aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ); + aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" ); m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aStrings.GetString(2)), rtl::OUString(), aPrintRangeOpt); @@ -258,13 +258,13 @@ ScPrintUIOptions::ScPrintUIOptions() // create a choice for the content to create uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpIds( 3 ), aWidgetIds( 3 ); aChoices[0] = aStrings.GetString( 3 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ); aWidgetIds[0] = "printallsheets"; aChoices[1] = aStrings.GetString( 4 ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ); aWidgetIds[1] = "printselectedsheets"; aChoices[2] = aStrings.GetString( 5 ); - aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); + aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ); aWidgetIds[2] = "printselectedcells"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), aHelpIds, "PrintContent", @@ -282,10 +282,10 @@ ScPrintUIOptions::ScPrintUIOptions() aHelpIds.realloc( 2 ); aWidgetIds.realloc( 2 ); aChoices[0] = aStrings.GetString( 7 ); - aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ) ); + aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0" ); aWidgetIds[0] = "printallpages"; aChoices[1] = aStrings.GetString( 8 ); - aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ) ); + aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1" ); aWidgetIds[1] = "printpages"; m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(), aHelpIds, @@ -1840,7 +1840,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa That constant will be equivelant to 'ThisComponent' but for each application, so e.g. a 'ThisExcelDoc' and a 'ThisWordDoc' constant can co-exist, as required by VBA. */ - aRet <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisExcelDoc" ) ); + aRet <<= rtl::OUString( "ThisExcelDoc" ); } else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { @@ -2013,7 +2013,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" )); + return rtl::OUString( "ScModelObj" ); } sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName ) @@ -2696,7 +2696,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); } // XIndexAccess @@ -2872,7 +2872,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableColumnsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableColumnsEnumeration")); } // XIndexAccess @@ -3131,7 +3131,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.TableRowsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.table.TableRowsEnumeration")); } // XIndexAccess @@ -3484,7 +3484,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera //! iterate directly (more efficiently)? SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAnnotationsEnumeration")); } // XIndexAccess @@ -3644,7 +3644,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.ScenariosEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.ScenariosEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index e515c223f7f0..8c2822ea6f77 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -141,10 +141,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName ) { uno::Sequence<beans::PropertyValue> aPropSeq( 2 ); aPropSeq[0] = beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")), -1, - uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ), beans::PropertyState_DIRECT_VALUE ); + rtl::OUString("EventType"), -1, + uno::makeAny( rtl::OUString("Script") ), beans::PropertyState_DIRECT_VALUE ); aPropSeq[1] = beans::PropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")), -1, + rtl::OUString("Script"), -1, uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE ); aRet <<= aPropSeq; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index dd97c91e62fb..b478f1bd146c 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -392,7 +392,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScCellFieldsObj::addContainerListener( @@ -572,7 +572,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFieldEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.text.TextFieldEnumeration")); } void SAL_CALL ScHeaderFieldsObj::addContainerListener( diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index c51f53192f14..a0c9abf624ed 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -383,7 +383,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); } // XIndexAccess diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index cd72688964b9..90d3b01dbdc1 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -246,7 +246,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( rtl::OUString ScFunctionAccess::getImplementationName_Static() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" )); + return rtl::OUString( "stardiv.StarCalc.ScFunctionAccess" ); } uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() @@ -261,7 +261,7 @@ uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static() rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess") ); + return rtl::OUString( "ScFunctionAccess"); } sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index e7a023bb239d..38f1ce4bd610 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -458,7 +458,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetLinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess @@ -993,7 +993,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAreaLinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); } // XIndexAccess @@ -1209,8 +1209,8 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinkObj::getResults: failed to get results!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinkObj::getResults: failed to get results!" ), uno::Reference< uno::XInterface >() ); } @@ -1241,8 +1241,8 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& if ( !bSuccess ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinkObj::setResults: failed to set results!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinkObj::setResults: failed to set results!" ), uno::Reference< uno::XInterface >() ); } } @@ -1319,7 +1319,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.DDELinksEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.DDELinksEnumeration")); } // XIndexAccess @@ -1461,8 +1461,8 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( if ( !xLink.is() ) { - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "ScDDELinksObj::addDDELink: cannot add DDE link!" ) ), + throw uno::RuntimeException( ::rtl::OUString( + "ScDDELinksObj::addDDELink: cannot add DDE link!" ), uno::Reference< uno::XInterface >() ); } @@ -1680,8 +1680,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.sheet.ExternalDocLink")))); + new ScIndexEnumeration(this, OUString( + "com.sun.star.sheet.ExternalDocLink"))); return aRef; } @@ -1796,8 +1796,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( - new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.sheet.ExternalDocLinks")))); + new ScIndexEnumeration(this, OUString( + "com.sun.star.sheet.ExternalDocLinks"))); return aRef; } diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index f69429b4940b..f7b05a8f4bf0 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -225,7 +225,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme ::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScIndexEnumeration")); + return ::rtl::OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName ) diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 7cc199c118a1..3539c7e30314 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -429,7 +429,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScNamedRangeObj" ) ); + return rtl::OUString( "ScNamedRangeObj" ); } sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const rtl::OUString& rServiceName ) @@ -611,7 +611,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.NamedRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.NamedRangesEnumeration")); } // container::XIndexAccess @@ -1186,7 +1186,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.LabelRangesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.LabelRangesEnumeration")); } // container::XIndexAccess diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 0e9ffbb131d4..dc4364a08bc2 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -45,7 +45,7 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons ::rtl::OUString SAL_CALL ScPageObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScPageObj")); + return rtl::OUString("ScPageObj"); } sal_Bool SAL_CALL ScPageObj::supportsService( const rtl::OUString& rServiceName ) @@ -60,7 +60,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScPageObj::getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDrawPage")); + pArray[0] = rtl::OUString("com.sun.star.sheet.SpreadsheetDrawPage"); return aRet; } diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 52f4841e5214..a6662f8bac22 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -86,7 +86,7 @@ public: { ScDocument* pDoc = mpDocShell->GetDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString(""), uno::Reference< uno::XInterface >() ); uno::Sequence< uno::Any > aArgs(2); // access the application object ( parent for workbook ) @@ -632,7 +632,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { uno::Sequence< uno::Any > aArgs(1); aArgs[ 0 ] <<= pDocShell->GetModel(); - xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs ); + xRet = ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( "ooo.vba.excel.Globals" ), aArgs ); pDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", uno::Any( xRet ) ); BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 21aced61bcf4..55fcc99bdb8e 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -278,7 +278,7 @@ static sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - xShapeProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" )) ) >>= rCaptionPoint; + xShapeProp->getPropertyValue( rtl::OUString( "CaptionPoint" ) ) >>= rCaptionPoint; bReturn = sal_True; } } @@ -446,7 +446,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } } else - throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("only XCell or XSpreadsheet objects allowed")), static_cast<cppu::OWeakObject*>(this), 0); + throw lang::IllegalArgumentException(rtl::OUString("only XCell or XSpreadsheet objects allowed"), static_cast<cppu::OWeakObject*>(this), 0); } else if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) ) { @@ -1403,9 +1403,9 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() return NULL; } -#define SC_EVENTACC_ONCLICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ) -#define SC_EVENTACC_SCRIPT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) ) -#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) ) +#define SC_EVENTACC_ONCLICK ::rtl::OUString( "OnClick" ) +#define SC_EVENTACC_SCRIPT ::rtl::OUString( "Script" ) +#define SC_EVENTACC_EVENTTYPE ::rtl::OUString( "EventType" ) typedef ::cppu::WeakImplHelper1< container::XNameReplace > ShapeUnoEventAcess_BASE; class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE @@ -1517,7 +1517,7 @@ ScShapeObj::getEvents( ) throw(uno::RuntimeException) ::rtl::OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sc.ScShapeObj" ) ); + return ::rtl::OUString( "com.sun.star.comp.sc.ScShapeObj" ); } ::sal_Bool SAL_CALL ScShapeObj::supportsService( const ::rtl::OUString& _ServiceName ) throw (uno::RuntimeException) @@ -1543,12 +1543,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( aSupported = xSI->getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Shape" ) ); + aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.Shape" ); if( bIsNoteCaption ) { aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.CellAnnotationShape" ) ); + aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.sheet.CellAnnotationShape" ); } return aSupported; diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index a0e24895120d..1ead24df1f09 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -193,7 +193,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellSearchObj" )); + return rtl::OUString( "ScCellSearchObj" ); } sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 3eb94ed4c669..dacd7ec34313 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star; ::rtl::OUString SAL_CALL ScDocument_getImplementationName() throw() { - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.SpreadsheetDocument" ) ); + return rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" ); } uno::Sequence< rtl::OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() { uno::Sequence< rtl::OUString > aSeq( 1 ); - aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )); + aSeq[0] = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); return aSeq; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 4c43504f0339..22c0d9d791a3 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -984,7 +984,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration throw(uno::RuntimeException) { SolarMutexGuard aGuard; - return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetViewPanesEnumeration"))); + return new ScIndexEnumeration(this, rtl::OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); } // XIndexAccess @@ -2149,7 +2149,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText ) rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTabViewObj" )); + return rtl::OUString( "ScTabViewObj" ); } sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName ) diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 676d05aadcee..b4bf3ff4670b 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnnamedDatabaseRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto; + xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying doc shell uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -113,7 +113,7 @@ private: comphelper::getProcessComponentContext() ); static uno::Reference<lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -265,7 +265,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); rtl::OUString sCodeName; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName; + xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); + xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); + xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); } } } diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 9372b208756a..186c7ffd4afb 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Internal error, can't exctract implementation object" ) ), rxWrapperIf ); + throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index 433dea872408..f3d32063b472 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -78,7 +78,7 @@ OUString convertToURL( const OUString& rPath ) { osl::FileBase::getFileURLFromSystemPath( rPath, aURL ); if ( aURL.equals( rPath ) ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "could'nt convert " )).concat( rPath ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " to a URL, is it a fully qualified path name? " )) ), Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); } return aURL; } @@ -123,9 +123,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelperAPI-test.log" )) ); + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) ); return sLogLocation; } rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) @@ -133,9 +133,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) printf("%s\n", getenv("HOME") ); printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )) ); + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) ); return sLogLocation; } @@ -150,13 +150,13 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); // Loading the wanted document Sequence< PropertyValue > propertyValues(1); - propertyValues[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" )); + propertyValues[0].Name = rtl::OUString( "Hidden" ); propertyValues[0].Value <<= false; rtl::OUString sfileUrl = convertToURL( sUrl ); printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); Reference< uno::XInterface > xDoc = - mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, propertyValues); + mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); @@ -173,15 +173,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Reference< script::provider::XScript > xScript; try { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document") )); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); } catch ( uno::Exception& e ) { try { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ))); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); } catch ( uno::Exception& e2 ) { - xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ))); + xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); } } OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -193,7 +193,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); - OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )); + OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ); try { printf("move log file\n"); @@ -253,7 +253,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); if ( !mxSFA->isFolder( sFileDirectoryURL) ) { - throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "not a directory: ")).concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); + throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); } // Getting all files and directories in the current directory Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, false ); diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 1a2e82b8d3b8..0825e457cad5 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -259,7 +259,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if (!aSelection.is()) { throw uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("failed to obtain current selection")), + rtl::OUString("failed to obtain current selection"), uno::Reference< uno::XInterface >() ); } @@ -277,15 +277,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Text" ) ) ) ) + if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRange")) ) || - xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges")) ) ) + else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) || + xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -299,8 +299,8 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) } else { - throw uno::RuntimeException( sImplementationName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - " not supported")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( sImplementationName + rtl::OUString( + " not supported"), uno::Reference< uno::XInterface >() ); } } @@ -311,10 +311,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -424,7 +424,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid prarameter. It should be a string or False" )), + throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ), uno::Reference< uno::XInterface >() ); } @@ -472,7 +472,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException) SbxVariableRef aRef = new SbxVariable; aRef->PutDouble( time ); aArgs->Put( aRef, 1 ); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WaitUntil") ), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD ); if ( pMeth ) { @@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NamedRanges" )) ), uno::UNO_QUERY_THROW ); + rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -525,7 +525,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No activeSheet available" )), + throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ), uno::Reference< uno::XInterface >() ); } return result; @@ -557,7 +557,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "second parameter should be boolean" )), + throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ), uno::Reference< uno::XInterface >() ); } @@ -599,11 +599,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro { //maybe this should be a procedure name //TODO for procedure name - //browse::XBrowseNodeFactory is a singlton. OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) + //browse::XBrowseNodeFactory is a singlton. OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference for range name, it should be procedure name" )), + throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ), uno::Reference< uno::XInterface >() ); } return; @@ -638,7 +638,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference or name" )), + throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ), uno::Reference< uno::XInterface >() ); } @@ -691,8 +691,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -757,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead if ( bSet != getDisplayFullScreen() ) - dispatchRequests( getCurrentDocument(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:FullScreen") ) ); + dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") ); } sal_Bool SAL_CALL @@ -777,8 +776,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasVerticalScrollBar") ), uno::makeAny( bSet ) ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasHorizontalScrollBar") ), uno::makeAny( bSet ) ); + xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); } sal_Bool SAL_CALL @@ -831,7 +830,7 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u if ( !xPathSettings.is() ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")), xContext ), uno::UNO_QUERY_THROW ); + xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); } return xPathSettings; } @@ -863,25 +862,25 @@ ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) t uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); rtl::OUString aURL; osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")), uno::Any( aURL ) ); + xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) ); } ::rtl::OUString SAL_CALL ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work"))); + return getOfficePath( rtl::OUString("Work")); } ::rtl::OUString SAL_CALL ScVbaApplication::getLibraryPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Basic"))); + return getOfficePath( rtl::OUString("Basic")); } ::rtl::OUString SAL_CALL ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template"))); + return getOfficePath( rtl::OUString("Template")); } ::rtl::OUString SAL_CALL @@ -1230,7 +1229,7 @@ uno::Any SAL_CALL ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException ) { StarBASIC* pBasic = SFX_APP()->GetBasic(); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD ); uno::Any aRet; if ( pMeth ) { @@ -1256,7 +1255,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( aArgs[ 5 ] = rMultiSelect; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.OpenFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1273,7 +1272,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( aArgs[ 5 ] = rButtonText; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.SaveAsFilePicker" ) ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1299,7 +1298,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio rtl::OUString ScVbaApplication::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication")); + return rtl::OUString("ScVbaApplication"); } uno::Sequence< rtl::OUString > @@ -1309,7 +1308,7 @@ ScVbaApplication::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Application" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 9944ea166f5b..0d3ed7eb84bf 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -107,7 +107,7 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt rtl::OUString ScVbaAssistant::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant")); + return rtl::OUString("ScVbaAssistant"); } uno::Sequence< rtl::OUString > @@ -117,7 +117,7 @@ ScVbaAssistant::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Assistant" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 6fa603aa7bd6..3174bd2ed093 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,7 +64,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Object failure, can't access chart implementation" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" ) ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Axes::Item Failed to extract type" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; @@ -177,7 +177,7 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) rtl::OUString ScVbaAxes::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes")); + return rtl::OUString("ScVbaAxes"); } uno::Sequence< rtl::OUString > @@ -187,7 +187,7 @@ ScVbaAxes::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axes" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index c1f92f22cc9e..035383a118c4 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -38,7 +38,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't access parent chart impl")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); return pChart; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasXAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasZAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")) ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,7 +281,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { @@ -296,7 +296,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp"))) >>= fMinor; + mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor; } catch (uno::Exception& ) { @@ -311,7 +311,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ) ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { @@ -327,7 +327,7 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp")) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto; } } catch (uno::Exception& ) @@ -357,7 +357,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) @@ -373,7 +373,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain"))) >>= fMax; + mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax; } catch (uno::Exception& ) { @@ -389,7 +389,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ) ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) @@ -406,7 +406,7 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain"))) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto; } } catch (uno::Exception& ) @@ -423,7 +423,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) @@ -440,7 +440,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax; + mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax; } } catch (uno::Exception& ) @@ -457,7 +457,7 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ) ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) @@ -474,7 +474,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" )) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto; } catch ( uno::Exception& ) { @@ -489,7 +489,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Min") ), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Min") )) >>= fMin; + mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin; } catch (const uno::Exception& e) { @@ -520,7 +520,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin") ), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) @@ -537,7 +537,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto; } } catch (uno::Exception& ) @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Logarithmic" ) ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown @@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { sal_Bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Logarithmic"))) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else @@ -641,7 +641,7 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx rtl::OUString ScVbaAxis::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis")); + return rtl::OUString("ScVbaAxis"); } uno::Sequence< rtl::OUString > @@ -651,7 +651,7 @@ ScVbaAxis::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Axis" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 2d715c46597e..986d1a3766e7 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -28,7 +28,7 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen rtl::OUString ScVbaAxisTitle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle")); + return rtl::OUString("ScVbaAxisTitle"); } uno::Sequence< rtl::OUString > @@ -39,7 +39,7 @@ ScVbaAxisTitle::getServiceNames() { uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.AxisTitle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index cb23dd87eed4..e792c6ea5418 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -146,7 +146,7 @@ private: protected: virtual rtl::OUString getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder")); + return rtl::OUString("ScVbaBorder"); } virtual css::uno::Sequence<rtl::OUString> getServiceNames() { @@ -154,7 +154,7 @@ protected: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Border" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" ); } return aServiceNames; } @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Method failed" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -549,7 +549,7 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run rtl::OUString ScVbaBorders::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders")); + return rtl::OUString("ScVbaBorders"); } uno::Sequence< rtl::OUString > @@ -559,7 +559,7 @@ ScVbaBorders::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Borders" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 2cfa4759b3ec..ae4f367c3a31 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -87,7 +87,7 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Not Implemented") ), uno::Reference< XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() ); } @@ -110,7 +110,7 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) rtl::OUString ScVbaCharacters::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters")); + return rtl::OUString("ScVbaCharacters"); } uno::Sequence< rtl::OUString > @@ -120,7 +120,7 @@ ScVbaCharacters::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Characters" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 7483da72f56b..a050d4f93553 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -262,7 +262,7 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram")); break; case xlLine: case xl3DLine: @@ -271,7 +271,7 @@ try case xlLineMarkers: case xlLineMarkersStacked: case xlLineMarkersStacked100: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.LineDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram")); break; case xl3DArea: case xlArea: @@ -279,17 +279,17 @@ try case xlAreaStacked100: case xl3DAreaStacked: case xl3DAreaStacked100: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.AreaDiagram")) ); + setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") ); break; case xlDoughnut: case xlDoughnutExploded: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.DonutDiagram") ) ); + setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") ); break; case xlStockHLC: case xlStockOHLC: case xlStockVHLC: case xlStockVOHLC: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.StockDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram")); mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; @@ -300,13 +300,13 @@ try case xl3DPie: case xlPie: case xlBarOfPie: // not possible (Zoom pie) - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram")); break; case xlRadar: case xlRadarMarkers: case xlRadarFilled: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.NetDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram")); break; case xlXYScatter: case xlBubble: // not possible @@ -315,7 +315,7 @@ try case xlXYScatterLinesNoMarkers: case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: - setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.XYDiagram"))); + setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram")); switch(_nChartType) { case xlXYScatter: @@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no ChartObject as parent" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) ); } void SAL_CALL @@ -1055,7 +1055,7 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro rtl::OUString ScVbaChart::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart")); + return rtl::OUString("ScVbaChart"); } uno::Sequence< rtl::OUString > @@ -1065,7 +1065,7 @@ ScVbaChart::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 17860737d13e..07183cc036da 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent is not ChartObjects" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) ); } void @@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartObject Activate internal error" ) ) ); + throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) ); } } @@ -130,7 +130,7 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) rtl::OUString ScVbaChartObject::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject")); + return rtl::OUString("ScVbaChartObject"); } uno::Sequence< rtl::OUString > @@ -140,7 +140,7 @@ ScVbaChartObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObject" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index d3df6585f12a..cdfd42545885 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -74,10 +74,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the impl class from the drawpage")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the docshell implclass")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); @@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem - rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Chart " ) ) , rtl::OUString(), 1); + rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); @@ -168,7 +168,7 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) rtl::OUString ScVbaChartObjects::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects")); + return rtl::OUString("ScVbaChartObjects"); } css::uno::Sequence<rtl::OUString> @@ -178,7 +178,7 @@ ScVbaChartObjects::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ChartObjects") ); + sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects"); } return sNames; } diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 865bf3dc746e..3fbe661f98fa 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -28,7 +28,7 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar rtl::OUString ScVbaChartTitle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle")); + return rtl::OUString("ScVbaChartTitle"); } uno::Sequence< rtl::OUString > @@ -39,7 +39,7 @@ ScVbaChartTitle::getServiceNames() { uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Chart" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index cc4a683a3141..1393237312bf 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { @@ -215,7 +215,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An rtl::OUString ScVbaComment::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment")); + return rtl::OUString("ScVbaComment"); } uno::Sequence< rtl::OUString > @@ -225,7 +225,7 @@ ScVbaComment::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.ScVbaComment" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 24423a7a3dfb..9e09ee631cda 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -91,7 +91,7 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaComments::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments")); + return rtl::OUString("ScVbaComments"); } css::uno::Sequence<rtl::OUString> @@ -101,7 +101,7 @@ ScVbaComments::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Comments") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Comments"); } return sNames; } diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index bc222676da8c..3ebd89adf753 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported"))); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported")); break; } return retvalue; diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 78fccd684510..1f1c3736bce9 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -65,7 +65,7 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) rtl::OUString ScVbaDialog::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog")); + return rtl::OUString("ScVbaDialog"); } uno::Sequence< rtl::OUString > @@ -75,7 +75,7 @@ ScVbaDialog::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialog" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 8375a06fb636..367dbcf6cea1 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -40,7 +40,7 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) rtl::OUString ScVbaDialogs::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs")); + return rtl::OUString("ScVbaDialogs"); } uno::Sequence< rtl::OUString > @@ -50,7 +50,7 @@ ScVbaDialogs::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Dialogs" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 17939060c89e..b89f3cd46416 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue; + xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapementHeight" ) ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), ( uno::Any )nValue ); + xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ) ) >>= nValue; + xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,9 +258,9 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharSize" ) ), ( uno::Any )fValue ); + //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue ); throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFontSize not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFontSize not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setStandardFont not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); } @@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getStandardFont not supported") ), uno::Reference< uno::XInterface >() ); + rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value for Underline")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), ( uno::Any )nValue ); + mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ) ) >>= nValue; + mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown value retrieved for Underline") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ), aValue ); + mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue ); } uno::Any SAL_CALL @@ -470,13 +470,13 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) ); + return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) ); } rtl::OUString ScVbaFont::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont")); + return rtl::OUString("ScVbaFont"); } uno::Sequence< rtl::OUString > @@ -486,7 +486,7 @@ ScVbaFont::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Font" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index c33dcf448222..e05e3ce53bd4 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -50,12 +50,12 @@ using namespace ::com::sun::star; #define LOCALE "Locale" template< typename Ifc1 > -ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "US") ), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) +ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) { try { if ( !mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved") ) ); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); // mxServiceInfo is unused, // mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats. } @@ -774,7 +774,7 @@ template< typename Ifc1 > rtl::OUString ScVbaFormat<Ifc1>::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat")); + return rtl::OUString("ScVbaFormat"); } template< typename Ifc1 > @@ -785,7 +785,7 @@ ScVbaFormat<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Format" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" ); } return aServiceNames; } @@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for XPropertySet" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index acdb253c60eb..09a1455a3d73 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -140,7 +140,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat") ), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { @@ -151,7 +151,7 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) rtl::OUString ScVbaFormatCondition::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition")); + return rtl::OUString("ScVbaFormatCondition"); } uno::Sequence< rtl::OUString > @@ -161,7 +161,7 @@ ScVbaFormatCondition::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatCondition" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 7cfb8a549f21..f0922d52f384 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -203,7 +203,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ConditionalFormat")), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { @@ -228,7 +228,7 @@ ScVbaFormatConditions::getStyleName() if ( !pStyles ) DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames(); - return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") )); + return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_")); } void @@ -263,7 +263,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, rtl::OUString ScVbaFormatConditions::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions")); + return rtl::OUString("ScVbaFormatConditions"); } uno::Sequence< rtl::OUString > @@ -273,7 +273,7 @@ ScVbaFormatConditions::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.FormatConditions" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index d213535c7f4a..707a5578b605 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.Debug" ) ), mxContext ); + ::rtl::OUString( "ooo.vba.Debug" ), mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index e8df70391fa8..0c1ce0e618da 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -55,7 +55,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch UrlComponents aUrlComp; OUString aTextToDisplay; if( !(rAddress >>= aUrlComp.first) || aUrlComp.first.isEmpty() ) - throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot get address" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot get address" ), uno::Reference< uno::XInterface >() ); rSubAddress >>= aUrlComp.second; rScreenTip >>= maScreenTip; rTextToDisplay >>= aTextToDisplay; @@ -84,7 +84,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnch } // create and initialize a new URL text field uno::Reference< lang::XMultiServiceFactory > xFactory( ScVbaRange::getUnoModel( xAnchorRange ), uno::UNO_QUERY_THROW ); - uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextField.URL" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< text::XTextContent > xUrlField( xFactory->createInstance( OUString( "com.sun.star.text.TextField.URL" ) ), uno::UNO_QUERY_THROW ); mxTextField.set( xUrlField, uno::UNO_QUERY_THROW ); setUrlComponents( aUrlComp ); setTextToDisplay( aTextToDisplay ); @@ -155,14 +155,14 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException) { ensureTextField(); OUString aTextToDisplay; - mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ) ) >>= aTextToDisplay; + mxTextField->getPropertyValue( OUString( "Representation" ) ) >>= aTextToDisplay; return aTextToDisplay; } void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException) { ensureTextField(); - mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Representation" ) ), uno::Any( rTextToDisplay ) ); + mxTextField->setPropertyValue( OUString( "Representation" ), uno::Any( rTextToDisplay ) ); } sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException) @@ -209,7 +209,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run { ensureTextField(); OUString aUrl; - mxTextField->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ) >>= aUrl; + mxTextField->getPropertyValue( OUString( "URL" ) ) >>= aUrl; sal_Int32 nHashPos = aUrl.indexOf( '#' ); if( nHashPos < 0 ) return UrlComponents( aUrl, OUString() ); @@ -222,7 +222,7 @@ void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (un OUStringBuffer aUrl( rUrlComp.first ); if( !rUrlComp.second.isEmpty() ) aUrl.append( sal_Unicode( '#' ) ).append( rUrlComp.second ); - mxTextField->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ), uno::Any( aUrl.makeStringAndClear() ) ); + mxTextField->setPropertyValue( OUString( "URL" ), uno::Any( aUrl.makeStringAndClear() ) ); } namespace hyperlink diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index c1d056f5e6d8..8711ba0a1168 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -38,7 +38,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Empty range objects" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 6cda078aefef..7b4d65d8496b 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -266,7 +266,7 @@ uno::Any ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; - aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" )); + aAttributeData.Type = rtl::OUString( "sal_Int32" ); aAttributeData.Value = rtl::OUString::valueOf( nValue ); return uno::makeAny( aAttributeData ); } @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern index" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,13 +382,13 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } rtl::OUString ScVbaInterior::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior")); + return rtl::OUString("ScVbaInterior"); } uno::Sequence< rtl::OUString > @@ -398,7 +398,7 @@ ScVbaInterior::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Interior" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index 19c1392eeb0c..dedb0398d6bb 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -69,7 +69,7 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio rtl::OUString ScVbaMenu::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu")); + return rtl::OUString("ScVbaMenu"); } uno::Sequence<rtl::OUString> @@ -79,7 +79,7 @@ ScVbaMenu::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menu" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 6d9b625326d5..91997c0b1b20 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -51,7 +51,7 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException rtl::OUString ScVbaMenuBar::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar")); + return rtl::OUString("ScVbaMenuBar"); } uno::Sequence<rtl::OUString> @@ -61,7 +61,7 @@ ScVbaMenuBar::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBar" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 33d43897657f..eb7aead78349 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -106,20 +106,20 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw if( nIndex == excel::XlSheetType::xlWorksheet ) { uno::Any aSource; - aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet Menu Bar" )); + aSource <<= rtl::OUString( "Worksheet Menu Bar" ); uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) ); return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } // XHelperInterface rtl::OUString ScVbaMenuBars::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars")); + return rtl::OUString("ScVbaMenuBars"); } uno::Sequence<rtl::OUString> @@ -129,7 +129,7 @@ ScVbaMenuBars::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuBars" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 37a701e8e726..881ef72fa9cc 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -67,7 +67,7 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti rtl::OUString ScVbaMenuItem::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem")); + return rtl::OUString("ScVbaMenuItem"); } uno::Sequence<rtl::OUString> @@ -77,7 +77,7 @@ ScVbaMenuItem::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItem" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 8df35adac119..90e70b127c18 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -135,7 +135,7 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt rtl::OUString ScVbaMenuItems::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems")); + return rtl::OUString("ScVbaMenuItems"); } uno::Sequence<rtl::OUString> @@ -145,7 +145,7 @@ ScVbaMenuItems::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.MenuItems" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index b7d50e590a92..f1ab8e120485 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -121,7 +121,7 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca rtl::OUString ScVbaMenus::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus")); + return rtl::OUString("ScVbaMenus"); } uno::Sequence<rtl::OUString> @@ -131,7 +131,7 @@ ScVbaMenus::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Menus" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index e02d7e0e99cb..6bd3cb59bc79 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -40,7 +40,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); css::uno::Reference< css::frame::XModel > xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } @@ -128,7 +128,7 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) rtl::OUString ScVbaOLEObject::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject")); + return rtl::OUString("ScVbaOLEObject"); } uno::Sequence< rtl::OUString > @@ -138,7 +138,7 @@ ScVbaOLEObject::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObject" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 88b1ac4d6a16..7b1c44fd94ad 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -161,7 +161,7 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaOLEObjects::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects")); + return rtl::OUString("ScVbaOLEObjects"); } uno::Sequence< rtl::OUString > @@ -171,7 +171,7 @@ ScVbaOLEObjects::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.OLEObjects" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 00ea233f7c48..29cbd0e09434 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -40,7 +40,7 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel rtl::OUString ScVbaOutline::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline")); + return rtl::OUString("ScVbaOutline"); } uno::Sequence< rtl::OUString > @@ -50,7 +50,7 @@ ScVbaOutline::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Outline" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index e8e3b8d0f48b..611c568243e6 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ))); + uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( "IsStartOfNewPage" )); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -61,11 +61,11 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak<Ifc1>::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); } template< typename Ifc1 > @@ -89,7 +89,7 @@ template< typename Ifc1 > rtl::OUString ScVbaPageBreak<Ifc1>::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak")); + return rtl::OUString("ScVbaPageBreak"); } template< typename Ifc1 > @@ -100,7 +100,7 @@ ScVbaPageBreak<Ifc1>::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PageBreak" ); } return aServiceNames; } @@ -111,7 +111,7 @@ template class ScVbaPageBreak< excel::XHPageBreak >; rtl::OUString ScVbaHPageBreak::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak")); + return rtl::OUString("ScVbaHPageBreak"); } uno::Sequence< rtl::OUString > @@ -121,7 +121,7 @@ ScVbaHPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.HPageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreak" ); } return aServiceNames; } @@ -144,7 +144,7 @@ ScVbaVPageBreak::~ScVbaVPageBreak() rtl::OUString ScVbaVPageBreak::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak")); + return rtl::OUString("ScVbaVPageBreak"); } uno::Sequence< rtl::OUString > @@ -154,7 +154,7 @@ ScVbaVPageBreak::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreak" ) ); + aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreak" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 5c02d5ddb702..8c6806e1992a 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -172,7 +172,7 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; @@ -240,7 +240,7 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaHPageBreaks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks")); + return rtl::OUString("ScVbaHPageBreaks"); } uno::Sequence< rtl::OUString > @@ -250,7 +250,7 @@ ScVbaHPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.HPageBreaks" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreaks" ); } return aServiceNames; } @@ -300,7 +300,7 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) rtl::OUString ScVbaVPageBreaks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreaks")); + return rtl::OUString("ScVbaVPageBreaks"); } uno::Sequence< rtl::OUString > @@ -310,7 +310,7 @@ ScVbaVPageBreaks::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.VPageBreaks" ) ); + aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreaks" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 738393591e62..fc43d9e9300c 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract palette, no doc shell" ) ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColorPalette") ) ), uno::UNO_QUERY ); + throw uno::RuntimeException( rtl::OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue( rtl::OUString("ColorPalette") ), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 18d754a5723e..3a8bcd856d5a 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Column number should not less than 1" )), + throw uno::RuntimeException( rtl::OUString( "Column number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Row number should not less than 1" )), + throw uno::RuntimeException( rtl::OUString( "Row number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); @@ -99,7 +99,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downRows += down; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -107,7 +107,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downRows -= up; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -115,7 +115,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) rightCols += right; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -123,7 +123,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) rightCols -= left; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); @@ -154,7 +154,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downPages += down; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -162,7 +162,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downPages -= up; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -170,7 +170,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) acrossPages += right; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -178,7 +178,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) acrossPages -= left; else - messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" )); + messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index 4b81fdfac08f..a37473e10349 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -35,7 +35,7 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) rtl::OUString ScVbaPivotCache::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache")); + return rtl::OUString("ScVbaPivotCache"); } uno::Sequence< rtl::OUString > @@ -45,7 +45,7 @@ ScVbaPivotCache::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotCache" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotCache" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 605ecdfaebf3..97ce5e200ad5 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -38,7 +38,7 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) rtl::OUString ScVbaPivotTable::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable")); + return rtl::OUString("ScVbaPivotTable"); } uno::Sequence< rtl::OUString > @@ -48,7 +48,7 @@ ScVbaPivotTable::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTable" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotTable" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index c407b9f3a25a..ffa5e173c385 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -69,7 +69,7 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) rtl::OUString ScVbaPivotTables::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables")); + return rtl::OUString("ScVbaPivotTables"); } css::uno::Sequence<rtl::OUString> @@ -79,7 +79,7 @@ ScVbaPivotTables::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.PivotTables") ); + sNames[0] = rtl::OUString("ooo.vba.excel.PivotTables"); } return sNames; } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index a42f756b252c..43f7d5076c79 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -389,7 +389,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -427,7 +427,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access underlying docshell from uno range object" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -2473,7 +2473,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -3554,7 +3554,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( ::rtl::OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index ff4c618f681e..364bd789a826 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -274,7 +274,7 @@ public: // XDefaultMethod ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); // XDefaultProperty - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } + ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 1889078a1edc..086dc8e322e4 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -31,7 +31,7 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); return xStylesAccess; } @@ -47,9 +47,9 @@ lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame: void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) ); + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) ) ) ) + if ( !xServiceInfo->supportsService( rtl::OUString( "com.sun.star.style.CellStyle" ) ) ) { DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); } @@ -160,7 +160,7 @@ ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeEx rtl::OUString ScVbaStyle::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle")); + return rtl::OUString("ScVbaStyle"); } uno::Sequence< rtl::OUString > @@ -170,7 +170,7 @@ ScVbaStyle::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XStyle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 5ced82e242c9..fa49f5f47819 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -121,7 +121,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CellStyle"))), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { @@ -157,7 +157,7 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE rtl::OUString ScVbaStyles::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles")); + return rtl::OUString("ScVbaStyles"); } uno::Sequence< rtl::OUString > @@ -167,7 +167,7 @@ ScVbaStyles::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XStyles" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyles" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index e0c318fa7b9d..ca7cc7270613 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 40b392c3517c..306f71318ee7 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -43,7 +43,7 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) rtl::OUString ScVbaTextFrame::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame")); + return rtl::OUString("ScVbaTextFrame"); } uno::Sequence< rtl::OUString > @@ -53,7 +53,7 @@ ScVbaTextFrame::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.TextFrame" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.TextFrame" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index ed2d4cc1b789..d3c84ac95198 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -68,7 +68,7 @@ public: { try { - xShapePropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("String") ), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue( rtl::OUString("String"), css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { @@ -80,7 +80,7 @@ public: ::rtl::OUString sText; try { - xShapePropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("String") ) ) >>= sText; + xShapePropertySet->getPropertyValue( rtl::OUString("String") ) >>= sText; } catch ( css::uno::Exception& ) { @@ -117,7 +117,7 @@ public: { try { - xShapePropertySet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextRotation")), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue(rtl::OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { @@ -129,7 +129,7 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextRotation"))) >>= nSOOrientation; + xShapePropertySet->getPropertyValue( rtl::OUString("TextRotation")) >>= nSOOrientation; } catch (css::uno::Exception& ) { @@ -140,7 +140,7 @@ public: // XHelperInterface rtl::OUString getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TitleImpl")); + return rtl::OUString("TitleImpl"); } css::uno::Sequence< rtl::OUString > getServiceNames() { @@ -148,7 +148,7 @@ public: if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.XTitle" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XTitle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 1ba1724ed179..6fe1ffca789e 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -230,10 +230,10 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "validation object already exists" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing required param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); Delete(); // set up defaults rtl::OUString sFormula1; @@ -247,7 +247,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing param" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "missing param" ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -259,7 +259,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported operation..." ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -280,7 +280,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad param..." ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); } } @@ -330,7 +330,7 @@ ScVbaValidation::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Validation" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Validation" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 925394cf741b..f56f3039987a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain current document" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain docshell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Implemented")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("No Implemented"), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Parameter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -867,7 +867,7 @@ void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::Runtime rtl::OUString ScVbaWindow::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow")); + return rtl::OUString("ScVbaWindow"); } uno::Sequence< rtl::OUString > @@ -877,7 +877,7 @@ ScVbaWindow::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Window" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Window" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 56ddccf9e9c0..0c090516961d 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -228,7 +228,7 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor rtl::OUString ScVbaWindows::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows")); + return rtl::OUString("ScVbaWindows"); } css::uno::Sequence<rtl::OUString> @@ -238,7 +238,7 @@ ScVbaWindows::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Windows") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Windows"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 2a87035ad301..6062b9e3bde5 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -257,8 +257,8 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::Runtime osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); - storeProps[0].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MS Excel 97" ) ); + storeProps[0].Name = rtl::OUString( "FilterName" ); + storeProps[0].Value <<= rtl::OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -279,7 +279,7 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -289,7 +289,7 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) rtl::OUString ScVbaWorkbook::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook")); + return rtl::OUString("ScVbaWorkbook"); } uno::Sequence< rtl::OUString > @@ -299,7 +299,7 @@ ScVbaWorkbook::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Workbook" ); } return aServiceNames; } @@ -308,7 +308,7 @@ ScVbaWorkbook::getServiceNames() ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CodeName" ) ) ).get< ::rtl::OUString >(); + return xModelProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index fb2eca206487..70d3ab4968c4 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -120,9 +120,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n") ) ) ); + xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) ); + xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); } } } @@ -266,9 +266,9 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) rtl::OUString ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("URL" ) ); + aMediaDesc[ 0 ].Name = rtl::OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; rtl::OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; @@ -304,7 +304,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterOptions" ) ); + sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) ); @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal value for Format" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,29 +330,29 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Expected value for Delimiter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); rtl::OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Incorrect value for Delimiter" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current sFormat = rtl::OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterName") ); + sProps[ nIndex ].Name = rtl::OUString("FilterName"); sProps[ nIndex++ ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentService") ); - sProps[ nIndex ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") ); + sProps[ nIndex ].Name = rtl::OUString("DocumentService"); + sProps[ nIndex ].Value <<= rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString("Bad Format"), uno::Reference< uno::XInterface >() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -365,7 +365,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi rtl::OUString ScVbaWorkbooks::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks")); + return rtl::OUString("ScVbaWorkbooks"); } css::uno::Sequence<rtl::OUString> @@ -375,7 +375,7 @@ ScVbaWorkbooks::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbooks") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Workbooks"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index e7f36f843808..7377ef8726ba 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -163,8 +163,8 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference <frame::XDesktop2 > xComponentLoader = frame::Desktop::create(xContext); uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:factory/scalc" ) ), - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" ) ), 0, + rtl::OUString( "private:factory/scalc" ), + rtl::OUString( "_blank" ), 0, uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) @@ -362,8 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ), + throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -404,8 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ), + throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -702,7 +700,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SpellDialog")); + rtl::OUString url = rtl::OUString( ".uno:SpellDialog"); uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -804,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -951,7 +949,7 @@ ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::U uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } @@ -1031,7 +1029,7 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) rtl::OUString ScVbaWorksheet::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet")); + return rtl::OUString("ScVbaWorksheet"); } void SAL_CALL @@ -1054,7 +1052,7 @@ ScVbaWorksheet::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Worksheet" ); } return aServiceNames; } @@ -1063,7 +1061,7 @@ rtl::OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CodeName" ) ) ).get< ::rtl::OUString >(); + return xSheetProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index a2d3524159fa..3986dcab2700 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -361,8 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Visible property doesn't support non boolean #FIXME" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -370,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; @@ -474,7 +473,7 @@ ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno: rtl::OUString ScVbaWorksheets::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets")); + return rtl::OUString("ScVbaWorksheets"); } css::uno::Sequence<rtl::OUString> @@ -484,7 +483,7 @@ ScVbaWorksheets::getServiceNames() if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheets") ); + sNames[0] = rtl::OUString("ooo.vba.excel.Worksheets"); } return sNames; } diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index bce1b6a0f918..4f507edfd91e 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -179,10 +179,10 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FunctionAccess" ) ), mxContext ), + ::rtl::OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsArrayFunction" ) ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue( ::rtl::OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } @@ -294,7 +294,7 @@ ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw ( rtl::OUString ScVbaWSFunction::getServiceImplName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction")); + return rtl::OUString("ScVbaWSFunction"); } uno::Sequence< rtl::OUString > @@ -304,7 +304,7 @@ ScVbaWSFunction::getServiceNames() if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.WorksheetFunction" ) ); + aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.WorksheetFunction" ); } return aServiceNames; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0434b1e9660e..a0d7634eebbb 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -851,7 +851,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) case Top10: pEntry->eOp = SC_TOPVAL; pEntry->GetQueryItem().meType = ScQueryEntry::ByString; - pEntry->GetQueryItem().maString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")); + pEntry->GetQueryItem().maString = rtl::OUString("10"); break; case Empty: pEntry->SetQueryByEmpty(); @@ -1433,7 +1433,7 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, if ( nSel == SC_AUTOFILTER_TOP10 ) { rNewEntry.eOp = SC_TOPVAL; - rItem.maString = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")); + rItem.maString = rtl::OUString("10"); } else if (nSel == SC_AUTOFILTER_EMPTY) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index bd716993d60a..04c21a224bfa 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1288,7 +1288,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, { ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } } @@ -1349,7 +1349,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, break; } aChangeRanges.Append( aChangeRange ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } } } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index b2a651065478..28481eefaccf 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1763,7 +1763,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark aChangeRanges.Append(aChangeRange); } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index cd48942494d2..33ac57649055 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -672,7 +672,7 @@ sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool //TODO/LATER: what about "bLink"? uno::Sequence < beans::PropertyValue > aMedium(1); - aMedium[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); + aMedium[0].Name = ::rtl::OUString( "URL" ); aMedium[0].Value <<= ::rtl::OUString( aStrURL ); comphelper::EmbeddedObjectContainer aCnt( xStorage ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 72750098905a..9fd5be01d827 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -216,13 +216,12 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, { uno::Reference< embed::XStorage > xTmpStor = ::comphelper::OStorageHelper::GetTemporaryStorage(); uno::Reference < embed::XEmbedObjectClipboardCreator > xClipboardCreator( - ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator") ) ), + ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.embed.MSOLEObjectSystemCreator") ), uno::UNO_QUERY_THROW ); embed::InsertedObjectInfo aInfo = xClipboardCreator->createInstanceInitFromClipboard( xTmpStor, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DummyName" ) ), + ::rtl::OUString( "DummyName" ), uno::Sequence< beans::PropertyValue >() ); // TODO/LATER: in future InsertedObjectInfo will be used to get container related information diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index fcd76aa3662b..932a59474ba2 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -556,7 +556,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, for (; itr != itrEnd; ++itr) aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } if ( bRecord ) @@ -744,7 +744,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, { aChangeRanges.Append( ScRange( nCol, nRow, *itr ) ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -1295,7 +1295,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, } } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute" ) ), aChangeRanges, aProperties ); + pModelObj->NotifyChanges( ::rtl::OUString( "attribute" ), aChangeRanges, aProperties ); } StartFormatArea(); @@ -1518,8 +1518,8 @@ sal_Bool ScViewFunc::InsertCells( InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bP ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); ::rtl::OUString aOperation = ( eCmd == INS_INSROWS ? - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert-rows" ) ) : - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert-columns" ) ) ); + ::rtl::OUString( "insert-rows" ) : + ::rtl::OUString( "insert-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1579,8 +1579,8 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord ) ScRangeList aChangeRanges; aChangeRanges.Append( aRange ); ::rtl::OUString aOperation = ( eCmd == DEL_DELROWS ? - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete-rows" ) ) : - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete-columns" ) ) ); + ::rtl::OUString( "delete-rows" ) : + ::rtl::OUString( "delete-columns" ) ); pModelObj->NotifyChanges( aOperation, aChangeRanges ); } } @@ -1951,7 +1951,7 @@ void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord ) { aFuncMark.FillRangeListWithMarks( &aChangeRanges, false ); } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "cell-change" ), aChangeRanges ); } aModificator.SetDocumentModified(); @@ -2255,7 +2255,7 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW } } } - pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "column-resize" ) ), aChangeRanges ); + pModelObj->NotifyChanges( ::rtl::OUString( "column-resize" ), aChangeRanges ); } } } |