summaryrefslogtreecommitdiff
path: root/test/source
diff options
context:
space:
mode:
Diffstat (limited to 'test/source')
-rw-r--r--test/source/container/xnamed.cxx2
-rw-r--r--test/source/sheet/cellproperties.cxx4
-rw-r--r--test/source/sheet/datapilotfield.cxx18
-rw-r--r--test/source/sheet/tableautoformatfield.cxx4
-rw-r--r--test/source/sheet/xdatabaserange.cxx2
-rw-r--r--test/source/sheet/xdatapilotdescriptor.cxx4
-rw-r--r--test/source/sheet/xnamedrange.cxx14
-rw-r--r--test/source/sheet/xnamedranges.cxx22
-rw-r--r--test/source/sheet/xspreadsheets2.cxx26
9 files changed, 48 insertions, 48 deletions
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index 32ee7b886a6e..fd6eef008d4a 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(RTL_CONSTASCII_USTRINGPARAM("NewName"));
+ rtl::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 d9d5fc00891b..ae569a9b908f 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(RTL_CONSTASCII_USTRINGPARAM("VertJustify"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("RotateReference"));
+ rtl::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 c922b9899280..270ad590675d 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -53,7 +53,7 @@ void DataPilotField::testSortInfo()
{
uno::Reference< beans::XPropertySet> xPropSet(init(),UNO_QUERY_THROW);
sheet::DataPilotFieldSortInfo aSortInfoValue;
- rtl::OUString aSortInfo(RTL_CONSTASCII_USTRINGPARAM("SortInfo"));
+ rtl::OUString aSortInfo("SortInfo");
aSortInfoValue.Field = rtl::OUString("Col1");
aSortInfoValue.IsAscending = false;
aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL;
@@ -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(RTL_CONSTASCII_USTRINGPARAM("HasSortInfo"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("LayoutInfo"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("HasLayoutInfo"));
+ rtl::OUString aHasLayoutInfo("HasLayoutInfo");
xValue = xPropSet->getPropertyValue(aHasLayoutInfo);
CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo );
CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo);
@@ -122,7 +122,7 @@ void DataPilotField::testAutoShowInfo()
sheet::DataPilotFieldAutoShowInfo aAutoShowInfoValue;
aAutoShowInfoValue.DataField = rtl::OUString("Col1");
aAutoShowInfoValue.IsEnabled = true;
- rtl::OUString aAutoShowInfo(RTL_CONSTASCII_USTRINGPARAM("AutoShowInfo"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("HasAutoShowInfo"));
+ rtl::OUString aHasAutoShowInfo("HasAutoShowInfo");
xValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo );
CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo);
@@ -155,7 +155,7 @@ void DataPilotField::testReference()
sheet::DataPilotFieldReference aReferenceValue;
aReferenceValue.ReferenceField = rtl::OUString("Col1");
aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED;
- rtl::OUString aReference(RTL_CONSTASCII_USTRINGPARAM("Reference"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("HasReference"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("IsGroupField"));
+ rtl::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 540dcd7a1d6a..846ae009de2c 100644
--- a/test/source/sheet/tableautoformatfield.cxx
+++ b/test/source/sheet/tableautoformatfield.cxx
@@ -49,7 +49,7 @@ uno::Reference< beans::XPropertySet > TableAutoFormatField::initTest()
void TableAutoFormatField::testRotateReference()
{
uno::Reference< beans::XPropertySet > xTableAutoFormatField = initTest();
- rtl::OUString aRotateReference(RTL_CONSTASCII_USTRINGPARAM("RotateReference"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("VertJustify"));
+ rtl::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 68634b1ff4a7..cd6b0c1b548f 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -162,7 +162,7 @@ void XDatabaseRange::testRefresh()
uno::Reference< sheet::XDatabaseRange > xDBRange( init(rtl::OUString("Refresh")), UNO_QUERY_THROW);
const sal_Int32 nCol = 0;
- rtl::OUString aHidden(RTL_CONSTASCII_USTRINGPARAM("IsVisible"));
+ rtl::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 d6bb683511a3..5a3324eda737 100644
--- a/test/source/sheet/xdatapilotdescriptor.cxx
+++ b/test/source/sheet/xdatapilotdescriptor.cxx
@@ -45,7 +45,7 @@ std::vector< rtl::OUString > XDataPilotDescriptor::maFieldNames;
void XDataPilotDescriptor::testTag()
{
- rtl::OUString aTag(RTL_CONSTASCII_USTRINGPARAM("DataPilotDescriptor_Tag"));
+ rtl::OUString aTag("DataPilotDescriptor_Tag");
uno::Reference< sheet::XDataPilotDescriptor > xDescr(init(), UNO_QUERY_THROW);
xDescr->setTag(aTag);
rtl::OUString aNewTag = xDescr->getTag();
@@ -99,7 +99,7 @@ void XDataPilotDescriptor::testGetDataPilotFields_Impl( uno::Reference< sheet::X
sal_Int32 nCount = xIndex->getCount();
- rtl::OUString aOrientation(RTL_CONSTASCII_USTRINGPARAM("Orientation"));
+ rtl::OUString aOrientation("Orientation");
for (sal_Int32 i = 0; i < nCount && i < 5; ++i)
{
uno::Reference< container::XNamed > xNamed( xIndex->getByIndex( i ), UNO_QUERY_THROW);
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx
index bd4615018494..6adeb8bb28c5 100644
--- a/test/source/sheet/xnamedrange.cxx
+++ b/test/source/sheet/xnamedrange.cxx
@@ -53,16 +53,16 @@ namespace apitest {
void XNamedRange::testGetContent()
{
- rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::OUString aTestedNamedRangeString("initial1");
uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString);
- rtl::OUString aExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::OUString aTestedNamedRangeString("initial1");
uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString);
rtl::OUString aExpectedContent;
@@ -87,14 +87,14 @@ void XNamedRange::testSetContent()
void XNamedRange::testGetType()
{
- rtl::OUString aTestedNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("initial2"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::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 4fd7e9f124b8..33dbf2c4bc54 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -77,32 +77,32 @@ void XNamedRanges::testAddNewByName()
table::CellAddress aBaseAddress = table::CellAddress(0,0,0);
sal_Int32 nType = 0;
- rtl::OUString aContent1(RTL_CONSTASCII_USTRINGPARAM("D1"));
- rtl::OUString aName1(RTL_CONSTASCII_USTRINGPARAM("type_0"));
+ rtl::OUString aContent1("D1");
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("D2"));
- rtl::OUString aName2(RTL_CONSTASCII_USTRINGPARAM("type_COLUMN_HEADER"));
+ rtl::OUString aContent2("D2");
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("D3"));
- rtl::OUString aName3(RTL_CONSTASCII_USTRINGPARAM("type_FILTER_CRITERIA"));
+ rtl::OUString aContent3("D3");
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("D4"));
- rtl::OUString aName4(RTL_CONSTASCII_USTRINGPARAM("type_PRINT_AREA"));
+ rtl::OUString aContent4("D4");
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("D5"));
- rtl::OUString aName5(RTL_CONSTASCII_USTRINGPARAM("type_ROW_HEADER"));
+ rtl::OUString aContent5("D5");
+ rtl::OUString aName5("type_ROW_HEADER");
xNamedRanges->addNewByName(aName5, aContent5, aBaseAddress, nType);
CPPUNIT_ASSERT_MESSAGE("Failed to create Namedrange Type ROW_HEADER", xNamedRanges->hasByName(aName5));
@@ -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(RTL_CONSTASCII_USTRINGPARAM("dummyNonExistingNamedRange"));
+ rtl::OUString aNr2("dummyNonExistingNamedRange");
xNamedRanges->removeByName(aNr2);// an exception should be raised here
}
}
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 181c7e0af42e..f72e7ae5c667 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -160,14 +160,14 @@ void XSpreadsheets2::testImportOverExistingNamedRange()
*/
importSheetToCopy();
- rtl::OUString aNamedRangeString(RTL_CONSTASCII_USTRINGPARAM("initial1"));
+ rtl::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();
- rtl::OUString aExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("InSheetRangeName"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("$SheetToCopy.$A$7"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("initial2"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$2"));
+ rtl::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(RTL_CONSTASCII_USTRINGPARAM("new_rangename"));
+ rtl::OUString aNewNamedRangeString("new_rangename");
uno::Reference< container::XNameAccess > xDestNamedRangesNameAccess(getNamedRanges(xDestDoc), UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("New NamedRange not created", xDestNamedRangesNameAccess->hasByName(aNewNamedRangeString));
@@ -240,7 +240,7 @@ void XSpreadsheets2::testImportNewNamedRange()
uno::Reference< sheet::XNamedRange > xDestNewNamedRange(aNewNr, UNO_QUERY_THROW);
rtl::OUString aNewNrDestContent = xDestNewNamedRange->getContent();
- rtl::OUString aNewExpectedContent(RTL_CONSTASCII_USTRINGPARAM("$Sheet1.$B$1"));
+ rtl::OUString aNewExpectedContent("$Sheet1.$B$1");
std::cout << "testImportSheet : new_rangename aNewExpectedContent " << aNewExpectedContent << std::endl;
std::cout << "testImportSheet : new_rangename aNewNrDestContent " << aNewNrDestContent << std::endl;
@@ -263,7 +263,7 @@ void XSpreadsheets2::testImportCellStyle()
//new style created in dest
uno::Reference< beans::XPropertySet > xSrcCellPropSet (xSrcCell, UNO_QUERY_THROW);
- const rtl::OUString aCellProperty(RTL_CONSTASCII_USTRINGPARAM("CellStyle"));
+ const rtl::OUString aCellProperty("CellStyle");
rtl::OUString aSrcStyleName;
CPPUNIT_ASSERT(xSrcCellPropSet->getPropertyValue(aCellProperty) >>= aSrcStyleName);
@@ -275,7 +275,7 @@ void XSpreadsheets2::testImportCellStyle()
uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW);
uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW);
- rtl::OUString aCellFamilyName(RTL_CONSTASCII_USTRINGPARAM("CellStyles"));
+ rtl::OUString aCellFamilyName("CellStyles");
uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName);
uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW);
@@ -283,7 +283,7 @@ void XSpreadsheets2::testImportCellStyle()
uno::Any aCellStyle = xCellStylesFamilyNameAccess->getByName(aDestStyleName);
uno::Reference< beans::XPropertySet > xCellStyleProp (aCellStyle, UNO_QUERY_THROW);
- rtl::OUString aProperty(RTL_CONSTASCII_USTRINGPARAM("VertJustify"));
+ rtl::OUString aProperty("VertJustify");
sal_Int32 aVertJustify = 0;
CPPUNIT_ASSERT(xCellStyleProp->getPropertyValue(aProperty) >>= aVertJustify);
@@ -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(RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
+ rtl::OUString NamedRangesPropertyString("NamedRanges");
uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(NamedRangesPropertyString), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xNamedRanges.is());
@@ -343,7 +343,7 @@ void XSpreadsheets2::importSheetToCopy()
bool XSpreadsheets2::isExternalReference(const rtl::OUString& aDestContent, const rtl::OUString& aSrcContent )
{
- rtl::OUString aStart(RTL_CONSTASCII_USTRINGPARAM("'file://"));
+ rtl::OUString aStart("'file://");
const sal_Char* sSrcContent = rtl::OUStringToOString( aSrcContent, RTL_TEXTENCODING_UTF8 ).getStr();
return (aDestContent.endsWithIgnoreAsciiCaseAsciiL(sSrcContent, aSrcContent.getLength()) // same cell address