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/extras | |
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/extras')
-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 |
5 files changed, 6 insertions, 6 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 |