diff options
-rw-r--r-- | include/test/container/xnamed.hxx | 4 | ||||
-rw-r--r-- | include/test/container/xnamereplace.hxx | 4 | ||||
-rw-r--r-- | test/source/container/xnamed.cxx | 12 | ||||
-rw-r--r-- | test/source/container/xnamereplace.cxx | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/test/container/xnamed.hxx b/include/test/container/xnamed.hxx index 5c79cc1410aa..e32880685438 100644 --- a/include/test/container/xnamed.hxx +++ b/include/test/container/xnamed.hxx @@ -19,7 +19,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNamed { public: - XNamed(const OUString& rName): maName(rName) {} + XNamed(const OUString& rName): maTestName(rName) {} virtual ~XNamed(); void testGetName(); @@ -27,7 +27,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > init() = 0; private: - OUString maName; + OUString maTestName; }; diff --git a/include/test/container/xnamereplace.hxx b/include/test/container/xnamereplace.hxx index c6a2d7f03d9b..9ce6dfd7192a 100644 --- a/include/test/container/xnamereplace.hxx +++ b/include/test/container/xnamereplace.hxx @@ -20,7 +20,7 @@ namespace apitest { class OOO_DLLPUBLIC_TEST XNameReplace { public: - XNameReplace(const OUString& rName): maName(rName) {} + XNameReplace(const OUString& rName): maTestReplacementName(rName) {} virtual css::uno::Reference< css::uno::XInterface > init() = 0; @@ -31,7 +31,7 @@ public: virtual ~XNameReplace() {} private: - OUString maName; + OUString maTestReplacementName; }; diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx index 6b28bf4d3af6..a3344026bf16 100644 --- a/test/source/container/xnamed.cxx +++ b/test/source/container/xnamed.cxx @@ -19,20 +19,20 @@ namespace apitest { void XNamed::testGetName() { uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); - CPPUNIT_ASSERT( maName == xNamed->getName() ); + CPPUNIT_ASSERT( maTestName == xNamed->getName() ); } void XNamed::testSetName() { uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW); - OUString aName("NewName"); + OUString aTestName("NewName"); - xNamed->setName(aName); - CPPUNIT_ASSERT( aName == xNamed->getName() ); + xNamed->setName(aTestName); + CPPUNIT_ASSERT( aTestName == xNamed->getName() ); // restore old name - xNamed->setName(maName); - CPPUNIT_ASSERT(maName == xNamed->getName()); + xNamed->setName(maTestName); + CPPUNIT_ASSERT(maTestName == xNamed->getName()); } XNamed::~XNamed() diff --git a/test/source/container/xnamereplace.cxx b/test/source/container/xnamereplace.cxx index 8af5e7cce45c..159efcaa1251 100644 --- a/test/source/container/xnamereplace.cxx +++ b/test/source/container/xnamereplace.cxx @@ -19,8 +19,8 @@ namespace apitest { void XNameReplace::testReplaceByName() { uno::Reference< container::XNameReplace > xNameReplace(init(), UNO_QUERY_THROW); - xNameReplace->replaceByName(maName, getAnyElementForNameReplace()); - Any aAny = xNameReplace->getByName( maName ); + xNameReplace->replaceByName(maTestReplacementName, getAnyElementForNameReplace()); + Any aAny = xNameReplace->getByName( maTestReplacementName ); uno::Reference< uno::XInterface > xElement(aAny, UNO_QUERY_THROW); CPPUNIT_ASSERT(xElement.is()); } |