diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 11:14:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 10:44:01 +0000 |
| commit | 8a16f665b1172ed505bf17f9b30ffde8abc3b861 (patch) | |
| tree | 07b07bf01aaf014c32d9635b448a3cfae40d8063 /configmgr/qa | |
| parent | remove unused text property of spinbuttons (diff) | |
| download | core-8a16f665b1172ed505bf17f9b30ffde8abc3b861.tar.gz core-8a16f665b1172ed505bf17f9b30ffde8abc3b861.zip | |
makeAny->Any in canvas..configmgr
Change-Id: Id06812595f373cd0da8b421dbac34a60a266ae6e
Reviewed-on: https://gerrit.libreoffice.org/33869
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'configmgr/qa')
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 682f99f3b75d..d5de3e732a26 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -198,7 +198,7 @@ void SimpleRecursiveTest::step() const "/org.openoffice.Office.UI.GenericCommands/UserInterface/Commands/" ".uno:WebHtml", "Label", - css::uno::makeAny(OUString("step"))); + css::uno::Any(OUString("step"))); } void Test::setUp() @@ -222,7 +222,7 @@ void Test::testKeySet() setKey( "/org.openoffice.System/L10N", "Locale", - css::uno::makeAny(OUString("com.sun.star.configuration.backend.LocaleBackend UILocale"))); + css::uno::Any(OUString("com.sun.star.configuration.backend.LocaleBackend UILocale"))); OUString s; CPPUNIT_ASSERT( getKey( @@ -292,21 +292,21 @@ void Test::testInsertSetMember() { css::uno::Reference<css::lang::XSingleServiceFactory>( access, css::uno::UNO_QUERY_THROW)->createInstance()); CPPUNIT_ASSERT(member.is()); - access->insertByName("A", css::uno::makeAny(member)); + access->insertByName("A", css::uno::Any(member)); member.set( css::uno::Reference<css::lang::XSingleServiceFactory>( access, css::uno::UNO_QUERY_THROW)->createInstance()); CPPUNIT_ASSERT(member.is()); try { - access->insertByName("", css::uno::makeAny(member)); + access->insertByName("", css::uno::Any(member)); CPPUNIT_FAIL("expected IllegalArgumentException"); } catch (css::lang::IllegalArgumentException &) {} try { - access->insertByName("\x01", css::uno::makeAny(member)); + access->insertByName("\x01", css::uno::Any(member)); CPPUNIT_FAIL("expected IllegalArgumentException"); } catch (css::lang::IllegalArgumentException &) {} try { - access->insertByName("a/b", css::uno::makeAny(member)); + access->insertByName("a/b", css::uno::Any(member)); } catch (css::lang::IllegalArgumentException &) { CPPUNIT_FAIL("unexpected IllegalArgumentException"); } @@ -448,10 +448,9 @@ css::uno::Reference< css::uno::XInterface > Test::createViewAccess( OUString const & path) const { css::uno::Any arg( - css::uno::makeAny( css::beans::NamedValue( "nodepath", - css::uno::makeAny(path)))); + css::uno::Any(path))); return provider_->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", css::uno::Sequence< css::uno::Any >(&arg, 1)); @@ -461,10 +460,9 @@ css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess( OUString const & path) const { css::uno::Any arg( - css::uno::makeAny( css::beans::NamedValue( "nodepath", - css::uno::makeAny(path)))); + css::uno::Any(path))); return provider_->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", css::uno::Sequence< css::uno::Any >(&arg, 1)); @@ -585,7 +583,7 @@ bool WriterThread::iteration() { OUString("kippers"), OUString("bloaters") }; - test_.setKey(path_, name_, css::uno::makeAny(options[index_])); + test_.setKey(path_, name_, css::uno::Any(options[index_])); index_ = (index_ + 1) % (sizeof options / sizeof (OUString)); return true; } |