From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- test/inc/test/beans/xpropertyset.hxx | 12 +++--- test/inc/test/container/xnamecontainer.hxx | 4 +- test/inc/test/container/xnamed.hxx | 4 +- test/inc/test/container/xnamereplace.hxx | 4 +- test/inc/test/sheet/xdatabaserange.hxx | 2 +- test/inc/test/sheet/xdatapilotdescriptor.hxx | 2 +- test/inc/test/sheet/xnamedrange.hxx | 2 +- test/inc/test/sheet/xnamedranges.hxx | 4 +- test/inc/test/sheet/xspreadsheets2.hxx | 14 +++---- test/inc/test/unoapi_test.hxx | 4 +- test/inc/test/util/xreplaceable.hxx | 8 ++-- test/inc/test/util/xsearchable.hxx | 4 +- test/source/beans/xpropertyset.cxx | 12 +++--- test/source/container/xnamecontainer.cxx | 2 +- test/source/container/xnamed.cxx | 2 +- test/source/sheet/cellproperties.cxx | 4 +- test/source/sheet/datapilotfield.cxx | 24 +++++------ test/source/sheet/tableautoformatfield.cxx | 6 +-- test/source/sheet/xdatabaserange.cxx | 34 ++++++++-------- test/source/sheet/xdatapilotdescriptor.cxx | 10 ++--- test/source/sheet/xdatapilotfieldgrouping.cxx | 2 +- test/source/sheet/xdatapilottable2.cxx | 4 +- test/source/sheet/xnamedrange.cxx | 24 +++++------ test/source/sheet/xnamedranges.cxx | 28 ++++++------- test/source/sheet/xsheetannotation.cxx | 4 +- test/source/sheet/xsheetannotations.cxx | 6 +-- test/source/sheet/xspreadsheets2.cxx | 58 +++++++++++++-------------- test/source/text/xtextfield.cxx | 2 +- test/source/unoapi_test.cxx | 4 +- 29 files changed, 145 insertions(+), 145 deletions(-) (limited to 'test') diff --git a/test/inc/test/beans/xpropertyset.hxx b/test/inc/test/beans/xpropertyset.hxx index 03839ea91073..d309c7d02bf7 100644 --- a/test/inc/test/beans/xpropertyset.hxx +++ b/test/inc/test/beans/xpropertyset.hxx @@ -57,19 +57,19 @@ public: void testRemoveVetoableChangeListener(); protected: - virtual bool isPropertyValueChangeable(const rtl::OUString& rName); + virtual bool isPropertyValueChangeable(const OUString& rName); private: void fillPropsToTest(const uno::Reference& xPropInfo); static bool getSinglePropertyValue( - const uno::Reference& xPropSet, const rtl::OUString& rName); + const uno::Reference& xPropSet, const OUString& rName); struct OOO_DLLPUBLIC_TEST PropsToTest { - std::vector constrained; - std::vector bound; - std::vector normal; - std::vector readonly; + std::vector constrained; + std::vector bound; + std::vector normal; + std::vector readonly; bool initialized; diff --git a/test/inc/test/container/xnamecontainer.hxx b/test/inc/test/container/xnamecontainer.hxx index 152edca8fa5a..f8261f99d649 100644 --- a/test/inc/test/container/xnamecontainer.hxx +++ b/test/inc/test/container/xnamecontainer.hxx @@ -40,7 +40,7 @@ public: // removes default entry XNameContainer(); // removes given entry - XNameContainer(const rtl::OUString& rName); + XNameContainer(const OUString& rName); virtual uno::Reference< uno::XInterface > init() = 0; @@ -49,7 +49,7 @@ public: virtual ~XNameContainer() {} private: - rtl::OUString maNameToRemove; + OUString maNameToRemove; }; } diff --git a/test/inc/test/container/xnamed.hxx b/test/inc/test/container/xnamed.hxx index d878c311696c..db9609441a00 100644 --- a/test/inc/test/container/xnamed.hxx +++ b/test/inc/test/container/xnamed.hxx @@ -37,7 +37,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNamed { public: - XNamed(const rtl::OUString& rName): maName(rName) {} + XNamed(const OUString& rName): maName(rName) {} virtual ~XNamed(); void testGetName(); @@ -45,7 +45,7 @@ public: virtual uno::Reference< uno::XInterface > init() = 0; private: - rtl::OUString maName; + OUString maName; }; diff --git a/test/inc/test/container/xnamereplace.hxx b/test/inc/test/container/xnamereplace.hxx index 71000c718df3..46f43d25830f 100644 --- a/test/inc/test/container/xnamereplace.hxx +++ b/test/inc/test/container/xnamereplace.hxx @@ -38,7 +38,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNameReplace { public: - XNameReplace(const rtl::OUString& rName): maName(rName) {} + XNameReplace(const OUString& rName): maName(rName) {} virtual uno::Reference< uno::XInterface > init() = 0; @@ -49,7 +49,7 @@ public: virtual ~XNameReplace() {} private: - rtl::OUString maName; + OUString maName; }; diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/test/inc/test/sheet/xdatabaserange.hxx index 0c3263821619..9bb70ea19e49 100644 --- a/test/inc/test/sheet/xdatabaserange.hxx +++ b/test/inc/test/sheet/xdatabaserange.hxx @@ -38,7 +38,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XDatabaseRange { public: - virtual uno::Reference< uno::XInterface > init(const rtl::OUString& rDBName) = 0; + virtual uno::Reference< uno::XInterface > init(const OUString& rDBName) = 0; void testDataArea(); void testGetSortDescriptor(); diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/test/inc/test/sheet/xdatapilotdescriptor.hxx index 16b4e735683e..b84ec1327974 100644 --- a/test/inc/test/sheet/xdatapilotdescriptor.hxx +++ b/test/inc/test/sheet/xdatapilotdescriptor.hxx @@ -61,7 +61,7 @@ private: void testGetDataPilotFields_Impl( uno::Reference< sheet::XDataPilotDescriptor > xDescr ); void checkName( uno::Reference< container::XIndexAccess > xIndex, sal_Int32 nIndex ); - static std::vector maFieldNames; + static std::vector maFieldNames; }; } diff --git a/test/inc/test/sheet/xnamedrange.hxx b/test/inc/test/sheet/xnamedrange.hxx index b21e0c89cf4b..97a6afdf4926 100644 --- a/test/inc/test/sheet/xnamedrange.hxx +++ b/test/inc/test/sheet/xnamedrange.hxx @@ -49,7 +49,7 @@ public: protected: ~XNamedRange() {} - virtual uno::Reference< sheet::XNamedRange> getNamedRange(const rtl::OUString&) = 0; + virtual uno::Reference< sheet::XNamedRange> getNamedRange(const OUString&) = 0; }; diff --git a/test/inc/test/sheet/xnamedranges.hxx b/test/inc/test/sheet/xnamedranges.hxx index b2a60120911f..d0d2eeedb66f 100644 --- a/test/inc/test/sheet/xnamedranges.hxx +++ b/test/inc/test/sheet/xnamedranges.hxx @@ -41,7 +41,7 @@ public: // remove default entry XNamedRanges(); // removes given entry - XNamedRanges(const rtl::OUString& rNameToRemove); + XNamedRanges(const OUString& rNameToRemove); virtual ~XNamedRanges(); @@ -57,7 +57,7 @@ protected: uno::Reference< sheet::XSpreadsheet > xSheet; private: - rtl::OUString maNameToRemove; + OUString maNameToRemove; }; } diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/test/inc/test/sheet/xspreadsheets2.hxx index dc9da86b5bed..83b9eddd15e7 100644 --- a/test/inc/test/sheet/xspreadsheets2.hxx +++ b/test/inc/test/sheet/xspreadsheets2.hxx @@ -59,24 +59,24 @@ public: virtual uno::Reference< lang::XComponent > getComponent() = 0; virtual uno::Reference< uno::XInterface > init() = 0; - virtual uno::Reference< lang::XComponent > loadFromDesktop(const rtl::OUString&) = 0; - virtual void createFileURL(const rtl::OUString&, rtl::OUString&) = 0; + virtual uno::Reference< lang::XComponent > loadFromDesktop(const OUString&) = 0; + virtual void createFileURL(const OUString&, OUString&) = 0; protected: uno::Reference< sheet::XSpreadsheetDocument> xDocument; private: - uno::Reference< sheet::XSpreadsheetDocument> getDoc(const rtl::OUString&, uno::Reference< lang::XComponent >&); + uno::Reference< sheet::XSpreadsheetDocument> getDoc(const OUString&, uno::Reference< lang::XComponent >&); uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument >); void importSheetToCopy(); - bool isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent ); + bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ); uno::Reference< sheet::XSpreadsheetDocument> xDestDoc; uno::Reference< sheet::XSpreadsheet > xDestSheet; uno::Reference< sheet::XSpreadsheet > xSrcSheet; - rtl::OUString aSrcSheetName; - rtl::OUString aSrcFileName; - rtl::OUString aDestFileBase; + OUString aSrcSheetName; + OUString aSrcFileName; + OUString aDestFileBase; }; } diff --git a/test/inc/test/unoapi_test.hxx b/test/inc/test/unoapi_test.hxx index b2ebb37f88f3..78f7f81e7a7a 100644 --- a/test/inc/test/unoapi_test.hxx +++ b/test/inc/test/unoapi_test.hxx @@ -43,7 +43,7 @@ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unot public: UnoApiTest(const OUString& path); - void createFileURL(const rtl::OUString& aFileBase, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -54,7 +54,7 @@ protected: private: uno::Reference m_xCalcComponent; - rtl::OUString m_aBaseString; + OUString m_aBaseString; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/inc/test/util/xreplaceable.hxx b/test/inc/test/util/xreplaceable.hxx index 53dc1507678f..05babaa63dad 100644 --- a/test/inc/test/util/xreplaceable.hxx +++ b/test/inc/test/util/xreplaceable.hxx @@ -37,8 +37,8 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XReplaceable { public: - XReplaceable( const rtl::OUString& rSearchString, const rtl::OUString& rReplaceString): - maSearchString(rSearchString), maReplaceString(rReplaceString) {} + XReplaceable( const OUString& rSearchString, const OUString& rReplaceString): + maSearchString(rSearchString), maReplaceString(rReplaceString) {} virtual uno::Reference< uno::XInterface > init() = 0; void testCreateReplaceDescriptor(); @@ -48,8 +48,8 @@ protected: ~XReplaceable() {} private: - rtl::OUString maSearchString; - rtl::OUString maReplaceString; + OUString maSearchString; + OUString maReplaceString; }; } diff --git a/test/inc/test/util/xsearchable.hxx b/test/inc/test/util/xsearchable.hxx index 673ce44f9b13..c894e535e5a8 100644 --- a/test/inc/test/util/xsearchable.hxx +++ b/test/inc/test/util/xsearchable.hxx @@ -36,7 +36,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XSearchable { public: - XSearchable(const rtl::OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {} + XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {} XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {} virtual ~XSearchable(); @@ -47,7 +47,7 @@ public: virtual uno::Reference< uno::XInterface > init() = 0; private: - rtl::OUString maSearchString; + OUString maSearchString; sal_Int32 mnCount; }; diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx index 387710226c9d..f7bd4e1d7849 100644 --- a/test/source/beans/xpropertyset.cxx +++ b/test/source/beans/xpropertyset.cxx @@ -108,7 +108,7 @@ void XPropertySet::testRemoveVetoableChangeListener() // TODO: implement this. } -bool XPropertySet::isPropertyValueChangeable(const rtl::OUString& rName) +bool XPropertySet::isPropertyValueChangeable(const OUString& rName) { uno::Reference xPropSet(init(), UNO_QUERY_THROW); try @@ -163,11 +163,11 @@ bool XPropertySet::isPropertyValueChangeable(const rtl::OUString& rName) double fNew = fOld + 1.3; xPropSet->setPropertyValue(rName, makeAny(fNew)); } - else if (type == getCppuType()) + else if (type == getCppuType()) { // string type - rtl::OUString aOld = any.get(); - rtl::OUString aNew = aOld + rtl::OUString("foo"); + OUString aOld = any.get(); + OUString aNew = aOld + OUString("foo"); xPropSet->setPropertyValue(rName, makeAny(aNew)); } else if (type == getCppuType()) @@ -203,7 +203,7 @@ void XPropertySet::fillPropsToTest(const uno::Reference // some properties should not be changed in a unspecific way. // TODO: Maybe we should mark these properties read-only, instead of // giving them a special treatment here? - std::set aSkip; + std::set aSkip; aSkip.insert("PrinterName"); aSkip.insert("CharRelief"); aSkip.insert("IsLayerMode"); @@ -241,7 +241,7 @@ void XPropertySet::fillPropsToTest(const uno::Reference } bool XPropertySet::getSinglePropertyValue( - const uno::Reference& xPropSet, const rtl::OUString& rName) + const uno::Reference& xPropSet, const OUString& rName) { try { diff --git a/test/source/container/xnamecontainer.cxx b/test/source/container/xnamecontainer.cxx index 17f8f0eee2c8..8786ff4c236a 100644 --- a/test/source/container/xnamecontainer.cxx +++ b/test/source/container/xnamecontainer.cxx @@ -41,7 +41,7 @@ XNameContainer::XNameContainer(): maNameToRemove(RTL_CONSTASCII_USTRINGPARAM("XN { } -XNameContainer::XNameContainer(const rtl::OUString& rNameToRemove): +XNameContainer::XNameContainer(const OUString& rNameToRemove): maNameToRemove(rNameToRemove) { } diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx index fd6eef008d4a..3b69004cb255 100644 --- a/test/source/container/xnamed.cxx +++ b/test/source/container/xnamed.cxx @@ -43,7 +43,7 @@ void XNamed::testGetName() void XNamed::testSetName() { uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); - rtl::OUString aName("NewName"); + OUString aName("NewName"); xNamed->setName(aName); CPPUNIT_ASSERT( aName == xNamed->getName() ); diff --git a/test/source/sheet/cellproperties.cxx b/test/source/sheet/cellproperties.cxx index ae569a9b908f..01cd59a3c302 100644 --- a/test/source/sheet/cellproperties.cxx +++ b/test/source/sheet/cellproperties.cxx @@ -41,7 +41,7 @@ namespace apitest { void CellProperties::testVertJustify() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aVertJustify("VertJustify"); + OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xCellRangeBase->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); @@ -59,7 +59,7 @@ void CellProperties::testVertJustify() void CellProperties::testRotateReference() { uno::Reference< beans::XPropertySet > xCellRangeBase(init(),UNO_QUERY_THROW); - rtl::OUString aRotateReference("RotateReference"); + OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xCellRangeBase->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 270ad590675d..571b7471d16d 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -53,8 +53,8 @@ void DataPilotField::testSortInfo() { uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldSortInfo aSortInfoValue; - rtl::OUString aSortInfo("SortInfo"); - aSortInfoValue.Field = rtl::OUString("Col1"); + OUString aSortInfo("SortInfo"); + aSortInfoValue.Field = OUString("Col1"); aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; uno::Any xValue; @@ -69,7 +69,7 @@ void DataPilotField::testSortInfo() //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing sal_Bool bHasSortInfo; - rtl::OUString aHasSortInfo("HasSortInfo"); + OUString aHasSortInfo("HasSortInfo"); xValue = xPropSet->getPropertyValue(aHasSortInfo); CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); CPPUNIT_ASSERT_MESSAGE("should have sort info", bHasSortInfo); @@ -87,7 +87,7 @@ void DataPilotField::testLayoutInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldLayoutInfo aLayoutInfoValue; - rtl::OUString aLayoutInfo("LayoutInfo"); + OUString aLayoutInfo("LayoutInfo"); aLayoutInfoValue.AddEmptyLines = false; aLayoutInfoValue.LayoutMode = sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM; uno::Any xValue; @@ -102,7 +102,7 @@ void DataPilotField::testLayoutInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasLayoutInfo; - rtl::OUString aHasLayoutInfo("HasLayoutInfo"); + OUString aHasLayoutInfo("HasLayoutInfo"); xValue = xPropSet->getPropertyValue(aHasLayoutInfo); CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo); @@ -120,9 +120,9 @@ void DataPilotField::testAutoShowInfo() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue; - aAutoShowInfoValue.DataField = rtl::OUString("Col1"); + aAutoShowInfoValue.DataField = OUString("Col1"); aAutoShowInfoValue.IsEnabled = true; - rtl::OUString aAutoShowInfo("AutoShowInfo"); + OUString aAutoShowInfo("AutoShowInfo"); uno::Any xValue; xValue <<= aAutoShowInfoValue; xPropSet->setPropertyValue(aAutoShowInfo, xValue); @@ -135,7 +135,7 @@ void DataPilotField::testAutoShowInfo() //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasAutoShowInfo; - rtl::OUString aHasAutoShowInfo("HasAutoShowInfo"); + OUString aHasAutoShowInfo("HasAutoShowInfo"); xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo); @@ -153,9 +153,9 @@ void DataPilotField::testReference() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); sheet::DataPilotFieldReference aReferenceValue; - aReferenceValue.ReferenceField = rtl::OUString("Col1"); + aReferenceValue.ReferenceField = OUString("Col1"); aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; - rtl::OUString aReference("Reference"); + OUString aReference("Reference"); uno::Any xValue; xValue <<= aReferenceValue; xPropSet->setPropertyValue(aReference, xValue); @@ -168,7 +168,7 @@ void DataPilotField::testReference() //setting HasReference only makes sense for false, tor true the uno implementation does nothing sal_Bool bHasReference; - rtl::OUString aHasReference("HasReference"); + OUString aHasReference("HasReference"); xValue = xPropSet->getPropertyValue(aHasReference); CPPUNIT_ASSERT( xValue >>= bHasReference ); CPPUNIT_ASSERT_MESSAGE("should have Reference information", bHasReference); @@ -186,7 +186,7 @@ void DataPilotField::testIsGroupField() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); uno::Any xValue; - rtl::OUString aIsGroupField("IsGroupField"); + OUString aIsGroupField("IsGroupField"); sal_Bool bIsGroupField; xValue = xPropSet->getPropertyValue(aIsGroupField); diff --git a/test/source/sheet/tableautoformatfield.cxx b/test/source/sheet/tableautoformatfield.cxx index 846ae009de2c..54ff2783722b 100644 --- a/test/source/sheet/tableautoformatfield.cxx +++ b/test/source/sheet/tableautoformatfield.cxx @@ -37,7 +37,7 @@ namespace apitest { uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() { - uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(rtl::OUString("com.sun.star.sheet.TableAutoFormats")), UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xAutoFormatFields( getServiceFactory()->createInstance(OUString("com.sun.star.sheet.TableAutoFormats")), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xAutoFormatFields.is()); uno::Reference< container::XIndexAccess > xIndex( xAutoFormatFields->getByIndex(0), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xIndex.is()); @@ -49,7 +49,7 @@ uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest() void TableAutoFormatField::testRotateReference() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aRotateReference("RotateReference"); + OUString aRotateReference("RotateReference"); uno::Any aOldRotateReference = xTableAutoFormatField->getPropertyValue(aRotateReference); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldRotateReference >>= aValue); @@ -67,7 +67,7 @@ void TableAutoFormatField::testRotateReference() void TableAutoFormatField::testVertJustify() { uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest(); - rtl::OUString aVertJustify("VertJustify"); + OUString aVertJustify("VertJustify"); uno::Any aOldVertJustify = xTableAutoFormatField->getPropertyValue(aVertJustify); sal_Int32 aValue = 0; CPPUNIT_ASSERT(aOldVertJustify >>= aValue); diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index cd6b0c1b548f..36b283ce3061 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -55,7 +55,7 @@ namespace apitest { */ void XDatabaseRange::testDataArea() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("DataArea")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("DataArea")), UNO_QUERY_THROW); table::CellRangeAddress aCellAddress; aCellAddress.Sheet = 0; @@ -75,67 +75,67 @@ void XDatabaseRange::testDataArea() void XDatabaseRange::testGetSubtotalDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SubtotalDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("SubtotalDescriptor")), UNO_QUERY_THROW); uno::Reference< sheet::XSubTotalDescriptor> xSubtotalDescr = xDBRange->getSubTotalDescriptor(); CPPUNIT_ASSERT(xSubtotalDescr.is()); } void XDatabaseRange::testGetSortDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange(init(rtl::OUString("SortDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange(init(OUString("SortDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xSortDescr = xDBRange->getSortDescriptor(); for (sal_Int32 i = 0; i < xSortDescr.getLength(); ++i) { beans::PropertyValue xProp = xSortDescr[i]; - //std::cout << "Prop " << i << " Name: " << rtl::OUString(xProp.Name) << std::endl; + //std::cout << "Prop " << i << " Name: " << OUString(xProp.Name) << std::endl; - if (xProp.Name == rtl::OUString("IsSortColumns")) + if (xProp.Name == OUString("IsSortColumns")) { sal_Bool bIsSortColumns = sal_True; xProp.Value >>= bIsSortColumns; CPPUNIT_ASSERT(bIsSortColumns == sal_True); } - else if (xProp.Name == rtl::OUString("ContainsHeader")) + else if (xProp.Name == OUString("ContainsHeader")) { sal_Bool bContainsHeader = sal_True; xProp.Value >>= bContainsHeader; CPPUNIT_ASSERT(bContainsHeader == sal_True); } - else if (xProp.Name == rtl::OUString("MaxFieldCount")) + else if (xProp.Name == OUString("MaxFieldCount")) { sal_Int32 nMaxFieldCount = 0; xProp.Value >>= nMaxFieldCount; std::cout << "Value: " << nMaxFieldCount << std::endl; } - else if (xProp.Name == rtl::OUString("SortFields")) + else if (xProp.Name == OUString("SortFields")) { } - else if (xProp.Name == rtl::OUString("BindFormatsToContent")) + else if (xProp.Name == OUString("BindFormatsToContent")) { sal_Bool bBindFormatsToContent = sal_False; xProp.Value >>= bBindFormatsToContent; CPPUNIT_ASSERT(bBindFormatsToContent == sal_True); } - else if (xProp.Name == rtl::OUString("CopyOutputData")) + else if (xProp.Name == OUString("CopyOutputData")) { sal_Bool bCopyOutputData = sal_True; xProp.Value >>= bCopyOutputData; CPPUNIT_ASSERT(bCopyOutputData == sal_False); } - else if (xProp.Name == rtl::OUString("OutputPosition")) + else if (xProp.Name == OUString("OutputPosition")) { } - else if (xProp.Name == rtl::OUString("IsUserListEnabled")) + else if (xProp.Name == OUString("IsUserListEnabled")) { sal_Bool bIsUserListEnabled = sal_True; xProp.Value >>= bIsUserListEnabled; CPPUNIT_ASSERT(bIsUserListEnabled == sal_False); } - else if (xProp.Name == rtl::OUString("UserListIndex")) + else if (xProp.Name == OUString("UserListIndex")) { sal_Int32 nUserListIndex = 1; xProp.Value >>= nUserListIndex; @@ -146,23 +146,23 @@ void XDatabaseRange::testGetSortDescriptor() void XDatabaseRange::testGetFilterDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("FilterDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("FilterDescriptor")), UNO_QUERY_THROW); uno::Reference< uno::XInterface > xFilterDescr( xDBRange->getFilterDescriptor(), UNO_QUERY_THROW); CPPUNIT_ASSERT(xFilterDescr.is()); } void XDatabaseRange::testGetImportDescriptor() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("ImportDescriptor")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("ImportDescriptor")), UNO_QUERY_THROW); uno::Sequence< beans::PropertyValue > xImportDescr = xDBRange->getImportDescriptor(); } void XDatabaseRange::testRefresh() { - uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("Refresh")), UNO_QUERY_THROW); + uno::Reference< sheet::XDatabaseRange > xDBRange( init(OUString("Refresh")), UNO_QUERY_THROW); const sal_Int32 nCol = 0; - rtl::OUString aHidden("IsVisible"); + OUString aHidden("IsVisible"); uno::Reference< sheet::XCellRangeReferrer > xCellRangeReferrer(xDBRange, UNO_QUERY_THROW); uno::Reference< table::XCellRange > xCellRange = xCellRangeReferrer->getReferredCells(); diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx index 5a3324eda737..f5e692dd31a7 100644 --- a/test/source/sheet/xdatapilotdescriptor.cxx +++ b/test/source/sheet/xdatapilotdescriptor.cxx @@ -41,14 +41,14 @@ using namespace com::sun::star::uno; namespace apitest { -std::vector< rtl::OUString > XDataPilotDescriptor::maFieldNames; +std::vector< OUString > XDataPilotDescriptor::maFieldNames; void XDataPilotDescriptor::testTag() { - rtl::OUString aTag("DataPilotDescriptor_Tag"); + OUString aTag("DataPilotDescriptor_Tag"); uno::Reference< sheet::XDataPilotDescriptor > xDescr(init(), UNO_QUERY_THROW); xDescr->setTag(aTag); - rtl::OUString aNewTag = xDescr->getTag(); + OUString aNewTag = xDescr->getTag(); CPPUNIT_ASSERT( aTag == aNewTag ); } @@ -99,12 +99,12 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X sal_Int32 nCount = xIndex->getCount(); - rtl::OUString aOrientation("Orientation"); + OUString aOrientation("Orientation"); for (sal_Int32 i = 0; i < nCount && i < 5; ++i) { uno::Reference< container::XNamed > xNamed( xIndex->getByIndex( i ), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamed.is()); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); maFieldNames.push_back(aName); CPPUNIT_ASSERT( aName != "Data" ); diff --git a/test/source/sheet/xdatapilotfieldgrouping.cxx b/test/source/sheet/xdatapilotfieldgrouping.cxx index 942addc2a25c..6b355aa8a136 100644 --- a/test/source/sheet/xdatapilotfieldgrouping.cxx +++ b/test/source/sheet/xdatapilotfieldgrouping.cxx @@ -44,7 +44,7 @@ void XDataPilotFieldGrouping::testCreateNameGroup() uno::Reference< container::XNameAccess > xNameAccess( xDataPilotField->getItems(), UNO_QUERY_THROW ); CPPUNIT_ASSERT(xNameAccess->hasElements()); - uno::Sequence< rtl::OUString > aElements = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElements = xNameAccess->getElementNames(); xDataPilotFieldGrouping->createNameGroup( aElements ); } diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx index 7d9e8ac97335..392df5aec7d7 100644 --- a/test/source/sheet/xdatapilottable2.cxx +++ b/test/source/sheet/xdatapilottable2.cxx @@ -185,7 +185,7 @@ void XDataPilotTable2::testInsertDrillDownSheet() checkDrillDownSheetContent(xSheet, aData); uno::Reference< container::XNamed > xNamed(xSheet, UNO_QUERY_THROW); - rtl::OUString aName = xNamed->getName(); + OUString aName = xNamed->getName(); xSheets->removeByName(aName); } else if (nNewSheetCount == nSheetCount) @@ -242,7 +242,7 @@ void XDataPilotTable2::buildDataFields( uno::Reference< sheet::XDataPilotTable2 for( sal_Int32 i = 0; i < nFieldCount; ++i) { uno::Reference< beans::XPropertySet > xPropSet(xIndex->getByIndex(i), UNO_QUERY_THROW); - Any aAny = xPropSet->getPropertyValue(rtl::OUString("Orientation")); + Any aAny = xPropSet->getPropertyValue(OUString("Orientation")); sheet::DataPilotFieldOrientation aOrientation; CPPUNIT_ASSERT( aAny >>= aOrientation ); diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index 6adeb8bb28c5..0f431dd736da 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -53,48 +53,48 @@ namespace apitest { void XNamedRange::testGetContent() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - rtl::OUString aExpectedContent("$Sheet1.$B$1"); + OUString aExpectedContent("$Sheet1.$B$1"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 on GetContent", xNamedRange->getContent().equals(aExpectedContent)); } void XNamedRange::testSetContent() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - rtl::OUString aExpectedContent; + OUString aExpectedContent; // test a cell - aExpectedContent = rtl::OUString("D1"); + aExpectedContent = OUString("D1"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cell", xNamedRange->getContent().equals(aExpectedContent)); // test a cellrange - aExpectedContent = rtl::OUString("D1:D10"); + aExpectedContent = OUString("D1:D10"); xNamedRange->setContent(aExpectedContent); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a cellrange", xNamedRange->getContent().equals(aExpectedContent)); // test a formula - aExpectedContent = rtl::OUString("=D10"); + aExpectedContent = OUString("=D10"); xNamedRange->setContent(aExpectedContent); - aExpectedContent = rtl::OUString("D10"); + aExpectedContent = OUString("D10"); CPPUNIT_ASSERT_MESSAGE("Wrong expected content for initial1 after SetContent a formula", xNamedRange->getContent().equals(aExpectedContent)); } void XNamedRange::testGetType() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); CPPUNIT_ASSERT_MESSAGE("Wrong expected Type", xNamedRange->getType() == 0); } void XNamedRange::testSetType() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); sal_Int32 nType = ::sheet::NamedRangeFlag::ROW_HEADER;; @@ -120,7 +120,7 @@ void XNamedRange::testSetType() void XNamedRange::testGetReferencePosition() { - rtl::OUString aTestedNamedRangeString("initial2"); + OUString aTestedNamedRangeString("initial2"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress xCellAddress = xNamedRange->getReferencePosition(); @@ -132,7 +132,7 @@ void XNamedRange::testGetReferencePosition() void XNamedRange::testSetReferencePosition() { - rtl::OUString aTestedNamedRangeString("initial1"); + OUString aTestedNamedRangeString("initial1"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); table::CellAddress aBaseAddress = table::CellAddress(1,2,3); diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index 33dbf2c4bc54..cf91ef5647a6 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -59,7 +59,7 @@ XNamedRanges::XNamedRanges(): } -XNamedRanges::XNamedRanges(const rtl::OUString& rNameToRemove): +XNamedRanges::XNamedRanges(const OUString& rNameToRemove): maNameToRemove(rNameToRemove) { @@ -77,32 +77,32 @@ void XNamedRanges::testAddNewByName() table::CellAddress aBaseAddress = table::CellAddress(0,0,0); sal_Int32 nType = 0; - rtl::OUString aContent1("D1"); - rtl::OUString aName1("type_0"); + OUString aContent1("D1"); + OUString aName1("type_0"); xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type 0 - Normal case", xNamedRanges->hasByName(aName1)); nType = ::sheet::NamedRangeFlag::COLUMN_HEADER; - rtl::OUString aContent2("D2"); - rtl::OUString aName2("type_COLUMN_HEADER"); + OUString aContent2("D2"); + OUString aName2("type_COLUMN_HEADER"); xNamedRanges->addNewByName(aName2, aContent2, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type COLUMN_HEADER", xNamedRanges->hasByName(aName2)); nType = ::sheet::NamedRangeFlag::FILTER_CRITERIA; - rtl::OUString aContent3("D3"); - rtl::OUString aName3("type_FILTER_CRITERIA"); + OUString aContent3("D3"); + OUString aName3("type_FILTER_CRITERIA"); xNamedRanges->addNewByName(aName3, aContent3, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type FILTER_CRITERIA", xNamedRanges->hasByName(aName3)); nType = ::sheet::NamedRangeFlag::PRINT_AREA; - rtl::OUString aContent4("D4"); - rtl::OUString aName4("type_PRINT_AREA"); + OUString aContent4("D4"); + OUString aName4("type_PRINT_AREA"); xNamedRanges->addNewByName(aName4, aContent4, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type PRINT_AREA", xNamedRanges->hasByName(aName4)); nType = ::sheet::NamedRangeFlag::ROW_HEADER; - rtl::OUString aContent5("D5"); - rtl::OUString aName5("type_ROW_HEADER"); + OUString aContent5("D5"); + OUString aName5("type_ROW_HEADER"); xNamedRanges->addNewByName(aName5, aContent5, aBaseAddress, nType); CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type ROW_HEADER", xNamedRanges->hasByName(aName5)); @@ -116,7 +116,7 @@ void XNamedRanges::testAddNewFromTitles() table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(1,0,0,3,3); - rtl::OUString aString; + OUString aString; uno::Reference< table::XCell > xCell; xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_TOP); @@ -187,7 +187,7 @@ void XNamedRanges::testRemoveByName() CPPUNIT_ASSERT_EQUAL_MESSAGE("NamedRange initial1 not removed", nNewCount, nInitialCount - 1); CPPUNIT_ASSERT_MESSAGE("Wrong NamedRange removed, initial1 still present", !xNamedRanges->hasByName(maNameToRemove)); // try to remove non existing - rtl::OUString aNr2("dummyNonExistingNamedRange"); + OUString aNr2("dummyNonExistingNamedRange"); xNamedRanges->removeByName(aNr2);// an exception should be raised here } } @@ -201,7 +201,7 @@ void XNamedRanges::testOutputList() xNamedRanges->outputList(xCellAddress); - rtl::OUString aString; + OUString aString; uno::Reference< table::XCell > xCell; for (sal_Int32 i = 0; i < nElementsCount; i++) diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx index ec7680475360..1475798558fd 100644 --- a/test/source/sheet/xsheetannotation.cxx +++ b/test/source/sheet/xsheetannotation.cxx @@ -56,14 +56,14 @@ void XSheetAnnotation::testGetPosition() void XSheetAnnotation::testGetAuthor() { uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW); - rtl::OUString aAuthor = aSheetAnnotation->getAuthor(); + OUString aAuthor = aSheetAnnotation->getAuthor(); CPPUNIT_ASSERT_MESSAGE("Wrong author", aAuthor.equals("LG")); } void XSheetAnnotation::testGetDate() { uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW); - rtl::OUString aDate = aSheetAnnotation->getDate(); + OUString aDate = aSheetAnnotation->getDate(); CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/2013")); } diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index 7f2d63862afb..637e88838220 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -68,7 +68,7 @@ void XSheetAnnotations::testInsertNew() // is the string ok ? uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aString = aTextSheetAnnotation->getString(); + OUString aString = aTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Insert Annotation - Wrong string", aString == "an inserted annotation"); @@ -107,7 +107,7 @@ void XSheetAnnotations::testRemoveByIndex() // is the string ok ? uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aLastString = aLastTextSheetAnnotation->getString(); + OUString aLastString = aLastTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aLastString == "an inserted annotation 3"); @@ -121,7 +121,7 @@ void XSheetAnnotations::testRemoveByIndex() // is the string ok ? uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW); - rtl::OUString aPreviousString = aPreviousTextSheetAnnotation->getString(); + OUString aPreviousString = aPreviousTextSheetAnnotation->getString(); CPPUNIT_ASSERT_MESSAGE("Remove Annotation - Wrong string", aPreviousString == "an inserted annotation 1"); diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index f72e7ae5c667..b4d734072119 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -90,11 +90,11 @@ void XSpreadsheets2::testImportString() uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(0,0); uno::Reference< text::XTextRange > xSrcTextRange(xSrcCell, UNO_QUERY_THROW); - rtl::OUString aSrcString = xSrcTextRange->getString(); + OUString aSrcString = xSrcTextRange->getString(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(0,0); uno::Reference< text::XTextRange > xDestTextRange(xDestCell, UNO_QUERY_THROW); - rtl::OUString aDestString = xDestTextRange->getString(); + OUString aDestString = xDestTextRange->getString(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong string imported", aDestString, aSrcString); } @@ -123,10 +123,10 @@ void XSpreadsheets2::testImportFormulaBasicMath() importSheetToCopy(); uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(2,0); - rtl::OUString aSrcFormula = xSrcCell->getFormula(); + OUString aSrcFormula = xSrcCell->getFormula(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(2,0); - rtl::OUString aDestFormula = xDestCell->getFormula(); + OUString aDestFormula = xDestCell->getFormula(); // potential problem later: formulas might be adjusted // add some tests that the formulas are correctly adjusted @@ -141,10 +141,10 @@ void XSpreadsheets2::testImportFormulaWithNamedRange() importSheetToCopy(); uno::Reference< table::XCell > xSrcCell = xSrcSheet->getCellByPosition(3,0); - rtl::OUString aSrcFormula = xSrcCell->getFormula(); + OUString aSrcFormula = xSrcCell->getFormula(); uno::Reference< table::XCell > xDestCell = xDestSheet->getCellByPosition(3,0); - rtl::OUString aDestFormula = xDestCell->getFormula(); + OUString aDestFormula = xDestCell->getFormula(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong Namedrange formula imported", aDestFormula, aSrcFormula); } @@ -160,14 +160,14 @@ void XSpreadsheets2::testImportOverExistingNamedRange() */ importSheetToCopy(); - rtl::OUString aNamedRangeString("initial1"); + OUString aNamedRangeString("initial1"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); uno::Any aNr = xDestNamedRangesNameAccess->getByName(aNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNamedRange(aNr, UNO_QUERY_THROW); - rtl::OUString aNrDestContent = xDestNamedRange->getContent(); + OUString aNrDestContent = xDestNamedRange->getContent(); - rtl::OUString aExpectedContent("$Sheet1.$B$1"); + OUString aExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : initial1 aNrDestContent " << aNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for initial1", aNrDestContent, aExpectedContent); @@ -184,14 +184,14 @@ void XSpreadsheets2::testImportNamedRangeDefinedInSource() importSheetToCopy(); // New range name defined in imported sheet $SheetToCopy.$A$7 - rtl::OUString aNewInSheetNamedRangeString("InSheetRangeName"); + OUString aNewInSheetNamedRangeString("InSheetRangeName"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("InSheetRangeName", xDestNamedRangesNameAccess->hasByName(aNewInSheetNamedRangeString)); uno::Any aNewInSheetNr = xDestNamedRangesNameAccess->getByName(aNewInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNewInSheetNamedRange(aNewInSheetNr, UNO_QUERY_THROW); - rtl::OUString aNewInSheetNrDestContent = xDestNewInSheetNamedRange->getContent(); - rtl::OUString aNewInSheetExpectedContent("$SheetToCopy.$A$7"); + OUString aNewInSheetNrDestContent = xDestNewInSheetNamedRange->getContent(); + OUString aNewInSheetExpectedContent("$SheetToCopy.$A$7"); std::cout << "testImportSheet : InSheetRangeName content " << aNewInSheetNrDestContent << std::endl; std::cout << "testImportSheet : InSheetRangeName expected " << aNewInSheetExpectedContent << std::endl; @@ -208,14 +208,14 @@ void XSpreadsheets2::testImportNamedRangeRedefinedInSource() importSheetToCopy(); // the source file redefines an existing named range in the imported sheet --> the target should not be changed - rtl::OUString aRedefinedInSheetNamedRangeString("initial2"); + OUString aRedefinedInSheetNamedRangeString("initial2"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("aRedefinedInSheetNamedRangeString", xDestNamedRangesNameAccess->hasByName(aRedefinedInSheetNamedRangeString)); uno::Any aRedefinedInSheetNr = xDestNamedRangesNameAccess->getByName(aRedefinedInSheetNamedRangeString); uno::Reference< sheet::XNamedRange > xDestRedefinedInSheetNamedRange(aRedefinedInSheetNr, UNO_QUERY_THROW); - rtl::OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent(); - rtl::OUString aRedefinedInSheetExpectedContent("$Sheet1.$B$2"); + OUString aRedefinedInSheetNrDestContent = xDestRedefinedInSheetNamedRange->getContent(); + OUString aRedefinedInSheetExpectedContent("$Sheet1.$B$2"); std::cout << "testImportSheet : initial2 content " << aRedefinedInSheetNrDestContent << std::endl; CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong address for Redefined InSheet named range", aRedefinedInSheetNrDestContent, aRedefinedInSheetExpectedContent); } @@ -230,7 +230,7 @@ void XSpreadsheets2::testImportNewNamedRange() importSheetToCopy(); //formula with a non-existant named range in dest - new_rangename - rtl::OUString aNewNamedRangeString("new_rangename"); + OUString aNewNamedRangeString("new_rangename"); uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("New NamedRange not created", xDestNamedRangesNameAccess->hasByName(aNewNamedRangeString)); @@ -238,9 +238,9 @@ void XSpreadsheets2::testImportNewNamedRange() uno::Any aNewNr = xDestNamedRangesNameAccess->getByName(aNewNamedRangeString); uno::Reference< sheet::XNamedRange > xDestNewNamedRange(aNewNr, UNO_QUERY_THROW); - rtl::OUString aNewNrDestContent = xDestNewNamedRange->getContent(); + OUString aNewNrDestContent = xDestNewNamedRange->getContent(); - rtl::OUString aNewExpectedContent("$Sheet1.$B$1"); + OUString aNewExpectedContent("$Sheet1.$B$1"); std::cout << "testImportSheet : new_rangename aNewExpectedContent " << aNewExpectedContent << std::endl; std::cout << "testImportSheet : new_rangename aNewNrDestContent " << aNewNrDestContent << std::endl; @@ -263,19 +263,19 @@ void XSpreadsheets2::testImportCellStyle() //new style created in dest uno::Reference< beans::XPropertySet > xSrcCellPropSet (xSrcCell, UNO_QUERY_THROW); - const rtl::OUString aCellProperty("CellStyle"); - rtl::OUString aSrcStyleName; + const OUString aCellProperty("CellStyle"); + OUString aSrcStyleName; CPPUNIT_ASSERT(xSrcCellPropSet->getPropertyValue(aCellProperty) >>= aSrcStyleName); uno::Reference< beans::XPropertySet > xDestCellPropSet (xSrcCell, UNO_QUERY_THROW); - rtl::OUString aDestStyleName; + OUString aDestStyleName; CPPUNIT_ASSERT(xDestCellPropSet->getPropertyValue(aCellProperty) >>= aDestStyleName); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong imported Cell Style", aDestStyleName, aSrcStyleName); uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW); - rtl::OUString aCellFamilyName("CellStyles"); + OUString aCellFamilyName("CellStyles"); uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName); uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW); @@ -283,16 +283,16 @@ void XSpreadsheets2::testImportCellStyle() uno::Any aCellStyle = xCellStylesFamilyNameAccess->getByName(aDestStyleName); uno::Reference< beans::XPropertySet > xCellStyleProp (aCellStyle, UNO_QUERY_THROW); - rtl::OUString aProperty("VertJustify"); + OUString aProperty("VertJustify"); sal_Int32 aVertJustify = 0; CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify); CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", aVertJustify == table::CellVertJustify_CENTER); } -uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::OUString& aFileBase, uno::Reference< lang::XComponent >& xComp) +uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const OUString& aFileBase, uno::Reference< lang::XComponent >& xComp) { - rtl::OUString aFileURL; + OUString aFileURL; createFileURL(aFileBase, aFileURL); if (!xComp.is()) @@ -308,7 +308,7 @@ uno::Reference< sheet::XSpreadsheetDocument> XSpreadsheets2::getDoc(const rtl::O uno::Reference< sheet::XNamedRanges> XSpreadsheets2::getNamedRanges(uno::Reference< sheet::XSpreadsheetDocument> xDoc) { uno::Reference< beans::XPropertySet > xPropSet (xDoc, UNO_QUERY_THROW); - rtl::OUString NamedRangesPropertyString("NamedRanges"); + OUString NamedRangesPropertyString("NamedRanges"); uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(NamedRangesPropertyString), UNO_QUERY_THROW); CPPUNIT_ASSERT(xNamedRanges.is()); @@ -341,10 +341,10 @@ void XSpreadsheets2::importSheetToCopy() xDestSheet = uno::Reference< sheet::XSpreadsheet > ( xDestSheetNameAccess->getByName(aSrcSheetName), UNO_QUERY_THROW); } -bool XSpreadsheets2::isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent ) +bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ) { - rtl::OUString aStart("'file://"); - const sal_Char* sSrcContent = rtl::OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr(); + OUString aStart("'file://"); + const sal_Char* sSrcContent = OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr(); return (aDestContent.endsWithIgnoreAsciiCaseAsciiL(sSrcContent, aSrcContent.getLength()) // same cell address && aDestContent.indexOf(aStart)==0 // starts with 'file:// diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx index f13080aac3d9..5ccb1dad1cf5 100644 --- a/test/source/text/xtextfield.cxx +++ b/test/source/text/xtextfield.cxx @@ -39,7 +39,7 @@ namespace apitest void XTextField::testGetPresentation() { uno::Reference< text::XTextField > xTextField(init(), UNO_QUERY_THROW); - rtl::OUString aString = xTextField->getPresentation(true); + OUString aString = xTextField->getPresentation(true); CPPUNIT_ASSERT(!aString.isEmpty()); aString = xTextField->getPresentation(false); CPPUNIT_ASSERT(!aString.isEmpty()); diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index 702cc1f8122c..77ff4bc310a9 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -44,7 +44,7 @@ void UnoApiTest::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("com.sun.star.comp.Calc.SpreadsheetDocument")); + getMultiServiceFactory()->createInstance(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()) ); } @@ -55,7 +55,7 @@ void UnoApiTest::tearDown() test::BootstrapFixture::tearDown(); } -void UnoApiTest::createFileURL(const rtl::OUString& aFileBase, rtl::OUString& rFilePath) +void UnoApiTest::createFileURL(const OUString& aFileBase, OUString& rFilePath) { rFilePath = getSrcRootURL() + m_aBaseString + "/" + aFileBase; } -- cgit