diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-03 23:21:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 06:54:23 +0200 |
| commit | 0bfa6a180850898ec5038ad70e09a2ff7baafa1a (patch) | |
| tree | 616bad3d3714b562da478768455cdb3797da63ba /sfx2/qa/cppunit | |
| parent | b34f6f3b5ae6b889fbfd84719ee255282cb45e0e (diff) | |
Just use Any ctor instead of makeAny in sfx2
Change-Id: Ie707881d6f4cd4a2f92f4f5a89aa9e0b051db8a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133783
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/qa/cppunit')
| -rw-r--r-- | sfx2/qa/cppunit/test_classification.cxx | 12 | ||||
| -rw-r--r-- | sfx2/qa/cppunit/test_misc.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/qa/cppunit/test_classification.cxx b/sfx2/qa/cppunit/test_classification.cxx index c086d2e973cb..45d2947882f3 100644 --- a/sfx2/qa/cppunit/test_classification.cxx +++ b/sfx2/qa/cppunit/test_classification.cxx @@ -62,8 +62,8 @@ void ClassificationTest::testClassification() { uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Non-Business"))}, - {"Type", uno::makeAny(OUString("urn:bails:ExportControl:"))}, + {"Name", uno::Any(OUString("Non-Business"))}, + {"Type", uno::Any(OUString("urn:bails:ExportControl:"))}, })); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); @@ -76,8 +76,8 @@ void ClassificationTest::testClassification() aPropertyValues = comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Confidential"))}, - {"Type", uno::makeAny(OUString("urn:bails:NationalSecurity:"))}, + {"Name", uno::Any(OUString("Confidential"))}, + {"Type", uno::Any(OUString("urn:bails:NationalSecurity:"))}, }); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); aAny = xPropertySet->getPropertyValue("urn:bails:NationalSecurity:BusinessAuthorizationCategory:Identifier"); @@ -85,8 +85,8 @@ void ClassificationTest::testClassification() aPropertyValues = comphelper::InitPropertySequence( { - {"Name", uno::makeAny(OUString("Internal Only"))}, - {"Type", uno::makeAny(OUString("urn:bails:IntellectualProperty:"))}, + {"Name", uno::Any(OUString("Internal Only"))}, + {"Type", uno::Any(OUString("urn:bails:IntellectualProperty:"))}, }); dispatchCommand(mxComponent, ".uno:ClassificationApply", aPropertyValues); aAny = xPropertySet->getPropertyValue("urn:bails:IntellectualProperty:BusinessAuthorizationCategory:Identifier"); diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index bbf137a5a09d..95ab7e927b09 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -114,7 +114,7 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testNoThumbnail) utl::TempFile aTempFile; aTempFile.EnableKillingFile(); uno::Sequence<beans::PropertyValue> aProperties( - comphelper::InitPropertySequence({ { "NoThumbnail", uno::makeAny(true) } })); + comphelper::InitPropertySequence({ { "NoThumbnail", uno::Any(true) } })); osl::File::remove(aTempFile.GetURL()); xStorable->storeToURL(aTempFile.GetURL(), aProperties); uno::Reference<packages::zip::XZipFileAccess2> xZipFile @@ -206,13 +206,13 @@ CPPUNIT_TEST_FIXTURE(MiscTest, testOverwrite) // explicitly overwrite the file using the Overwrite option CPPUNIT_ASSERT_NO_THROW(xStorable->storeToURL( aTempFile.GetURL(), - comphelper::InitPropertySequence({ { "Overwrite", uno::makeAny(true) } }))); + comphelper::InitPropertySequence({ { "Overwrite", uno::Any(true) } }))); try { // overwrite an existing file with the Overwrite flag set to false xStorable->storeToURL(aTempFile.GetURL(), comphelper::InitPropertySequence( - { { "Overwrite", uno::makeAny(false) } })); + { { "Overwrite", uno::Any(false) } })); CPPUNIT_ASSERT_MESSAGE("We expect an exception on overwriting an existing file", false); } catch (const css::uno::Exception&) |