diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /sc/qa | |
parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc/qa')
-rw-r--r-- | sc/qa/extras/macros-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/regression-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sccellrangeobj.cxx | 4 | ||||
-rw-r--r-- | sc/qa/extras/scnamedrangeobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scnamedrangesobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/filters-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/helper/qahelper.hxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 18 |
8 files changed, 17 insertions, 17 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 85d4801519b7..906c49400784 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -84,7 +84,7 @@ void ScMacrosTest::testStarBasic() CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); - rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document")); + rtl::OUString aURL("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"); String sUrl = aURL; Any aRet; Sequence< sal_Int16 > aOutParamIndex; diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index d404d335c97c..771f7e33296b 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -103,7 +103,7 @@ private: void ScChartRegressionTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) { - rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString aSep("/"); rtl::OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index a65a04878b9a..a3e925a17f12 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -88,7 +88,7 @@ ScCellRangeObj::ScCellRangeObj(): uno::Reference< uno::XInterface > ScCellRangeObj::init() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) @@ -108,7 +108,7 @@ uno::Reference< uno::XInterface > ScCellRangeObj::init() uno::Reference< uno::XInterface > ScCellRangeObj::getXCellRangeData() { rtl::OUString aFileURL; - const rtl::OUString aFileBase(RTL_CONSTASCII_USTRINGPARAM("xcellrangesquery.ods")); + const rtl::OUString aFileBase("xcellrangesquery.ods"); createFileURL(aFileBase, aFileURL); std::cout << rtl::OUStringToOString(aFileURL, RTL_TEXTENCODING_UTF8).getStr() << std::endl; if( !mxComponent.is()) diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 8403c051b076..892db8e1ec64 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -88,7 +88,7 @@ uno::Reference< sheet::XNamedRanges > ScNamedRangeObj::init_impl() CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index b52962d85115..05424366c59d 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -76,7 +76,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) CPPUNIT_ASSERT(mxComponent.is()); uno::Reference< beans::XPropertySet > xPropSet (mxComponent, UNO_QUERY_THROW); - rtl::OUString aNamedRangesPropertyString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges")); + rtl::OUString aNamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW); //set value from xnamedranges.hxx diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 3b23c60f19d5..191feb5ad7d1 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -242,7 +242,7 @@ void ScFiltersTest::testRangeNameODS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); testFile( aCSVPath, pDoc, 1); diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 5325bbc37850..8261358835d1 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -189,7 +189,7 @@ public: ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString( rsBaseString ) {} void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); + OUString aSep("/"); OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 0bb7645944e5..d7cf013bee23 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -292,7 +292,7 @@ void ScFiltersTest::testRangeNameXLS() ScDocument* pDoc = xDocSh->GetDocument(); testRangeNameImpl(pDoc); - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("rangeExp_Sheet2.")); + OUString aSheet2CSV("rangeExp_Sheet2."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#44587 @@ -1152,7 +1152,7 @@ void ScFiltersTest::testDataValidityODS() void ScFiltersTest::testBrokenQuotesCSV() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes.")); + const OUString aFileNameBase("fdo48621_broken_quotes."); OUString aFileExtension(aFileFormats[CSV].pName, strlen(aFileFormats[CSV].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[CSV].pFilterName, strlen(aFileFormats[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1169,7 +1169,7 @@ void ScFiltersTest::testBrokenQuotesCSV() ScDocument* pDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test - OUString aSheet2CSV(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes_exported.")); + OUString aSheet2CSV("fdo48621_broken_quotes_exported."); OUString aCSVPath; createCSVPath( aSheet2CSV, aCSVPath ); // fdo#48621 @@ -1180,7 +1180,7 @@ void ScFiltersTest::testBrokenQuotesCSV() void ScFiltersTest::testSharedFormulaXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("shared-formula.")); + const OUString aFileNameBase("shared-formula."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1215,7 +1215,7 @@ void ScFiltersTest::testSharedFormulaXLSX() void ScFiltersTest::testCellValueXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("cell-value.")); + const OUString aFileNameBase("cell-value."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1276,14 +1276,14 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) void ScFiltersTest::testPasswordNew() { //tests opening a file with new password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("password.")); + const OUString aFileNameBase("password."); testPassword_Impl(aFileNameBase); } void ScFiltersTest::testPasswordOld() { //tests opening a file with old password algorithm - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("passwordOld.")); + const OUString aFileNameBase("passwordOld."); testPassword_Impl(aFileNameBase); } @@ -1777,7 +1777,7 @@ void testColorScale_Impl(ScDocument* pDoc, const OUString& aBaseString) void ScFiltersTest::testColorScaleODS() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[ODS].pName, strlen(aFileFormats[ODS].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[ODS].pFilterName, strlen(aFileFormats[ODS].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; @@ -1803,7 +1803,7 @@ void ScFiltersTest::testColorScaleODS() void ScFiltersTest::testColorScaleXLSX() { - const OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("colorScale.")); + const OUString aFileNameBase("colorScale."); OUString aFileExtension(aFileFormats[XLSX].pName, strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 ); OUString aFilterName(aFileFormats[XLSX].pFilterName, strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ; OUString aFileName; |