From 39d45390f4fab1e9e85f211d74ed2c08fda5b652 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 19 Mar 2013 11:39:07 +0100 Subject: 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 Tested-by: Thomas Arnhold --- sc/qa/unit/filters-test.cxx | 2 +- sc/qa/unit/helper/qahelper.hxx | 2 +- sc/qa/unit/subsequent_filters-test.cxx | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sc/qa/unit') 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; -- cgit