diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 10:24:14 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 09:17:34 +0000 |
commit | 48e83f7be240cd0af5b9f1ee5b87c4d9376c102e (patch) | |
tree | 15ccd05d11aca0461309670987ae71316a6232ca /cppuhelper/qa | |
parent | Notebookbar: Better resize support (diff) | |
download | core-48e83f7be240cd0af5b9f1ee5b87c4d9376c102e.tar.gz core-48e83f7be240cd0af5b9f1ee5b87c4d9376c102e.zip |
makeAny->Any in cppuhelper..cui
Change-Id: Ia54e6e9b71df68bd04c304a0bb02da8ebac74420
Reviewed-on: https://gerrit.libreoffice.org/34603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper/qa')
-rw-r--r-- | cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index ab9412928c07..5fa8cd1794ce 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -426,14 +426,14 @@ void Test::testFull( !info->hasPropertyByName( rtl::OUString("first"))); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(0)), + css::uno::Any(static_cast< sal_Int32 >(0)), fullp->getPropertyValue( rtl::OUString("First"))); fullp->setPropertyValue( rtl::OUString("First"), - css::uno::makeAny(static_cast< sal_Int32 >(-100))); + css::uno::Any(static_cast< sal_Int32 >(-100))); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(-100)), + css::uno::Any(static_cast< sal_Int32 >(-100)), fullp->getPropertyValue( rtl::OUString("First"))); css::uno::Any voidAny; @@ -443,9 +443,9 @@ void Test::testFull( rtl::OUString("Second"))); fullp->setPropertyValue( rtl::OUString("Second"), - css::uno::makeAny(static_cast< sal_Int32 >(100))); + css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(100)), + css::uno::Any(static_cast< sal_Int32 >(100)), fullp->getPropertyValue( rtl::OUString("Second"))); CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent); @@ -466,7 +466,7 @@ void Test::testFull( try { fullp->setPropertyValue( rtl::OUString("Third"), - css::uno::makeAny(static_cast< sal_Int32 >(100))); + css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { @@ -477,7 +477,7 @@ void Test::testFull( try { fullp->setPropertyValue( rtl::OUString("Fourth"), - css::uno::makeAny(static_cast< sal_Int32 >(100))); + css::uno::Any(static_cast< sal_Int32 >(100))); CPPUNIT_FAIL("exception expected"); } catch (css::beans::UnknownPropertyException &) {} try { @@ -500,12 +500,12 @@ void Test::testFull( full, css::uno::UNO_QUERY); CPPUNIT_ASSERT(fullf.is()); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(-100)), + css::uno::Any(static_cast< sal_Int32 >(-100)), fullf->getFastPropertyValue(0)); fullf->setFastPropertyValue( - 0, css::uno::makeAny(static_cast< sal_Int32 >(0))); + 0, css::uno::Any(static_cast< sal_Int32 >(0))); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(0)), + css::uno::Any(static_cast< sal_Int32 >(0)), fullf->getFastPropertyValue(0)); try { fullf->getFastPropertyValue(-1); @@ -523,7 +523,7 @@ void Test::testFull( rtl::OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), vs[0].Handle); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(0)), vs[0].Value); + css::uno::Any(static_cast< sal_Int32 >(0)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( rtl::OUString("Second"), vs[1].Name); @@ -539,12 +539,12 @@ void Test::testFull( CPPUNIT_ASSERT_EQUAL( rtl::OUString("First"), vs[0].Name); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(-100)), vs[0].Value); + css::uno::Any(static_cast< sal_Int32 >(-100)), vs[0].Value); CPPUNIT_ASSERT_EQUAL(css::beans::PropertyState_DIRECT_VALUE, vs[0].State); CPPUNIT_ASSERT_EQUAL( rtl::OUString("Second"), vs[1].Name); CPPUNIT_ASSERT_EQUAL( - css::uno::makeAny(static_cast< sal_Int32 >(100)), vs[1].Value); + css::uno::Any(static_cast< sal_Int32 >(100)), vs[1].Value); CPPUNIT_ASSERT_EQUAL( css::beans::PropertyState_AMBIGUOUS_VALUE, vs[1].State); CPPUNIT_ASSERT(full->getSecond().Value.Value.IsPresent); |