sw/qa/api/SwXTextField.cxx | 6
sw/qa/core/crsr/crsr.cxx | 8 -
sw/qa/core/doc/doc.cxx | 4
sw/qa/core/fields/fields.cxx | 2
sw/qa/core/frmedt/frmedt.cxx | 10 -
sw/qa/core/layout/layout.cxx | 14 +-
sw/qa/core/macros-test.cxx | 22 +--
sw/qa/core/objectpositioning/objectpositioning.cxx | 50 +++----
sw/qa/core/text/text.cxx | 18 +-
sw/qa/core/tox/tox.cxx | 10 -
sw/qa/core/unocore/unocore.cxx | 35 ++---
sw/qa/extras/globalfilter/globalfilter.cxx | 30 ++--
sw/qa/extras/htmlexport/htmlexport.cxx | 31 ++--
sw/qa/extras/layout/layout.cxx | 12 -
sw/qa/extras/mailmerge/mailmerge.cxx | 8 -
sw/qa/extras/odfexport/odfexport.cxx | 72 +++++------
sw/qa/extras/odfimport/odfimport.cxx | 32 ++--
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 10 -
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 4
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 14 +-
sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 10 -
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 12 -
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 6
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 3
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/qa/extras/rtfexport/rtfexport.cxx | 2
sw/qa/extras/rtfexport/rtfexport3.cxx | 5
sw/qa/extras/rtfexport/rtfexport5.cxx | 2
sw/qa/extras/rtfimport/rtfimport.cxx | 2
sw/qa/extras/txtexport/txtexport.cxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 6
sw/qa/extras/uiwriter/uiwriter2.cxx | 24 +--
sw/qa/extras/uiwriter/uiwriter3.cxx | 60 ++++-----
sw/qa/extras/uiwriter/uiwriter4.cxx | 32 ++--
sw/qa/extras/uiwriter/uiwriter5.cxx | 36 ++---
sw/qa/extras/uiwriter/uiwriter6.cxx | 39 ++----
sw/qa/extras/uiwriter/uiwriter7.cxx | 116 ++++++++----------
sw/qa/extras/unowriter/unowriter.cxx | 26 ++--
sw/qa/extras/ww8export/ww8export3.cxx | 4
sw/qa/uibase/fldui/fldui.cxx | 4
sw/qa/uibase/frmdlg/frmdlg.cxx | 3
sw/qa/uibase/shells/shells.cxx | 4
sw/qa/uibase/wrtsh/wrtsh.cxx | 10 -
sw/qa/unit/swmodeltestbase.cxx | 4
sw/source/core/access/accpara.cxx | 2
sw/source/core/doc/docxforms.cxx | 4
sw/source/core/doc/textboxhelper.cxx | 54 +++-----
sw/source/core/edit/edfcol.cxx | 70 +++++-----
sw/source/core/edit/edlingu.cxx | 4
sw/source/core/layout/anchoreddrawobject.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/unocore/swunohelper.cxx | 2
sw/source/core/unocore/unobkm.cxx | 2
sw/source/core/unocore/unocoll.cxx | 12 -
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unodraw.cxx | 4
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoflatpara.cxx | 4
sw/source/core/unocore/unostyle.cxx | 60 ++++-----
sw/source/core/unocore/unotbl.cxx | 32 ++--
sw/source/core/unocore/unotext.cxx | 4
sw/source/filter/html/SwAppletImpl.cxx | 14 +-
sw/source/filter/html/htmlform.cxx | 10 -
sw/source/filter/html/htmlplug.cxx | 32 ++--
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 6
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 12 -
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 6
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/filter/ww8/ww8toolbar.cxx | 8 -
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 2
sw/source/filter/xml/swxml.cxx | 28 ++--
sw/source/filter/xml/wrtxml.cxx | 18 +-
sw/source/filter/xml/xmlfmt.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 50 +++----
sw/source/filter/xml/xmltexte.cxx | 6
sw/source/filter/xml/xmltexti.cxx | 24 +--
sw/source/ui/dbui/addresslistdialog.cxx | 8 -
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/fldui/fldedt.cxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 2
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 2
sw/source/ui/index/cntex.cxx | 4
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 2
sw/source/ui/vba/vbaapplication.cxx | 18 +-
sw/source/ui/vba/vbaautotextentry.cxx | 2
sw/source/ui/vba/vbabookmark.cxx | 4
sw/source/ui/vba/vbabookmarks.cxx | 6
sw/source/ui/vba/vbaborders.cxx | 6
sw/source/ui/vba/vbacell.cxx | 2
sw/source/ui/vba/vbacells.cxx | 2
sw/source/ui/vba/vbacolumn.cxx | 2
sw/source/ui/vba/vbacolumns.cxx | 4
sw/source/ui/vba/vbadocument.cxx | 38 ++---
sw/source/ui/vba/vbadocumentproperties.cxx | 34 ++---
sw/source/ui/vba/vbafield.cxx | 6
sw/source/ui/vba/vbafind.cxx | 20 +--
sw/source/ui/vba/vbafont.cxx | 6
sw/source/ui/vba/vbaframe.cxx | 2
sw/source/ui/vba/vbaframes.cxx | 4
sw/source/ui/vba/vbaheaderfooter.cxx | 2
sw/source/ui/vba/vbaheadersfooters.cxx | 6
sw/source/ui/vba/vbalistformat.cxx | 6
sw/source/ui/vba/vbalistgalleries.cxx | 4
sw/source/ui/vba/vbalistgallery.cxx | 2
sw/source/ui/vba/vbalisthelper.cxx | 76 +++++------
sw/source/ui/vba/vbalistlevel.cxx | 16 +-
sw/source/ui/vba/vbalistlevels.cxx | 4
sw/source/ui/vba/vbalisttemplate.cxx | 4
sw/source/ui/vba/vbalisttemplates.cxx | 4
sw/source/ui/vba/vbaoptions.cxx | 6
sw/source/ui/vba/vbapagesetup.cxx | 36 ++---
sw/source/ui/vba/vbapalette.cxx | 2
sw/source/ui/vba/vbapane.cxx | 2
sw/source/ui/vba/vbapanes.cxx | 2
sw/source/ui/vba/vbaparagraph.cxx | 4
sw/source/ui/vba/vbaparagraphformat.cxx | 44 +++---
sw/source/ui/vba/vbarange.cxx | 12 -
sw/source/ui/vba/vbarevisions.cxx | 8 -
sw/source/ui/vba/vbarow.cxx | 12 -
sw/source/ui/vba/vbarows.cxx | 28 ++--
sw/source/ui/vba/vbasection.cxx | 6
sw/source/ui/vba/vbasections.cxx | 6
sw/source/ui/vba/vbaselection.cxx | 18 +-
sw/source/ui/vba/vbastyle.cxx | 16 +-
sw/source/ui/vba/vbastyles.cxx | 8 -
sw/source/ui/vba/vbasystem.cxx | 4
sw/source/ui/vba/vbatable.cxx | 8 -
sw/source/ui/vba/vbatableofcontents.cxx | 6
sw/source/ui/vba/vbatables.cxx | 6
sw/source/ui/vba/vbatablesofcontents.cxx | 4
sw/source/ui/vba/vbatabstops.cxx | 4
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/vba/vbavariables.cxx | 2
sw/source/ui/vba/vbaview.cxx | 10 -
sw/source/ui/vba/vbawindow.cxx | 10 -
sw/source/ui/vba/vbawrapformat.cxx | 8 -
sw/source/ui/vba/wordvbahelper.cxx | 2
sw/source/uibase/app/apphdl.cxx | 16 +-
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/app/swmodul1.cxx | 2
sw/source/uibase/config/StoredChapterNumbering.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 30 ++--
sw/source/uibase/dbui/mmconfigitem.cxx | 20 +--
sw/source/uibase/dialog/watermarkdialog.cxx | 10 -
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/lingu/olmenu.cxx | 2
sw/source/uibase/shells/textsh.cxx | 14 +-
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 4
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/table/tablemgr.cxx | 8 -
sw/source/uibase/uiview/view0.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 4
sw/source/uibase/uno/unodispatch.cxx | 2
sw/source/uibase/uno/unomailmerge.cxx | 18 +-
sw/source/uibase/utlui/unotools.cxx | 4
sw/source/uibase/wrtsh/wrtsh1.cxx | 8 -
163 files changed, 1009 insertions(+), 1029 deletions(-)
New commits:
commit ca734f7cfa55814a85d5940e5f64d7c53638f6a7
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 16:22:03 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 21:38:56 2022 +0200
Just use Any ctor instead of makeAny in sw
Change-Id: I2c9023ba8d07314d23ae7a65e670e8748c5e9322
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133766
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/qa/api/SwXTextField.cxx b/sw/qa/api/SwXTextField.cxx
index 27a6eb40891c..5c8464233131 100644
--- a/sw/qa/api/SwXTextField.cxx
+++ b/sw/qa/api/SwXTextField.cxx
@@ -78,9 +78,9 @@ Reference<XInterface> SwXTextField::init()
Reference<XPropertySet> xFieldMaster(
xMSF->createInstance("com.sun.star.text.FieldMaster.Database"),
UNO_QUERY_THROW);
- xFieldMaster->setPropertyValue("DataBaseName", makeAny(OUString("Address
Book File")));
- xFieldMaster->setPropertyValue("DataTableName",
makeAny(OUString("address")));
- xFieldMaster->setPropertyValue("DataColumnName",
makeAny(OUString("FIRSTNAME")));
+ xFieldMaster->setPropertyValue("DataBaseName", Any(OUString("Address Book
File")));
+ xFieldMaster->setPropertyValue("DataTableName", Any(OUString("address")));
+ xFieldMaster->setPropertyValue("DataColumnName",
Any(OUString("FIRSTNAME")));
Reference<text::XDependentTextField> xField(
xMSF->createInstance("com.sun.star.text.TextField.Database"),
UNO_QUERY_THROW);
diff --git a/sw/qa/core/crsr/crsr.cxx b/sw/qa/core/crsr/crsr.cxx
index 0b93fcc43522..e95d0d541c12 100644
--- a/sw/qa/core/crsr/crsr.cxx
+++ b/sw/qa/core/crsr/crsr.cxx
@@ -52,14 +52,14 @@ CPPUNIT_TEST_FIXTURE(SwCoreCrsrTest, testFindReplace)
xViewCursor->goLeft(/*nCount=*/6, /*bExpand=*/false);
xViewCursor->goLeft(/*nCount=*/1, /*bExpand=*/true);
uno::Reference<beans::XPropertySet> xViewCursorProps(xViewCursor,
uno::UNO_QUERY);
- xViewCursorProps->setPropertyValue("CharWeight",
uno::makeAny(awt::FontWeight::BOLD));
+ xViewCursorProps->setPropertyValue("CharWeight",
uno::Any(awt::FontWeight::BOLD));
xViewCursor->gotoStart(/*bExpand=*/false);
// When: doing search & replace 3 times.
uno::Sequence<beans::PropertyValue>
aArgs(comphelper::InitPropertySequence({
- { "SearchItem.SearchString", uno::makeAny(OUString("foo")) },
- { "SearchItem.ReplaceString", uno::makeAny(OUString("bar")) },
- { "SearchItem.Command",
uno::makeAny(static_cast<sal_Int16>(SvxSearchCmd::REPLACE)) },
+ { "SearchItem.SearchString", uno::Any(OUString("foo")) },
+ { "SearchItem.ReplaceString", uno::Any(OUString("bar")) },
+ { "SearchItem.Command",
uno::Any(static_cast<sal_Int16>(SvxSearchCmd::REPLACE)) },
}));
// Find the first foo.
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index 43894afa03dc..d370d89baefc 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -210,10 +210,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest,
testImageHyperlinkStyle)
xText->insertTextContent(xCursor, xImage, /*bAbsorb=*/false);
uno::Reference<beans::XPropertySet> xImageProps(xImage, uno::UNO_QUERY);
OUString aExpected = "http://www.example.com";;
- xImageProps->setPropertyValue("HyperLinkURL", uno::makeAny(aExpected));
+ xImageProps->setPropertyValue("HyperLinkURL", uno::Any(aExpected));
// When applying a frame style on it:
- xImageProps->setPropertyValue("FrameStyleName",
uno::makeAny(OUString("Frame")));
+ xImageProps->setPropertyValue("FrameStyleName",
uno::Any(OUString("Frame")));
// Then make sure that the hyperlink is not lost:
auto aActual = getProperty<OUString>(xImageProps, "HyperLinkURL");
diff --git a/sw/qa/core/fields/fields.cxx b/sw/qa/core/fields/fields.cxx
index a0c5a2c86c7e..9df1baf12b2d 100644
--- a/sw/qa/core/fields/fields.cxx
+++ b/sw/qa/core/fields/fields.cxx
@@ -43,7 +43,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTooltip)
comphelper::makePropertyValue("Title", OUString("mytitle")),
comphelper::makePropertyValue("Year", OUString("2020")),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
diff --git a/sw/qa/core/frmedt/frmedt.cxx b/sw/qa/core/frmedt/frmedt.cxx
index 5742f230c1c4..850dcc65571f 100644
--- a/sw/qa/core/frmedt/frmedt.cxx
+++ b/sw/qa/core/frmedt/frmedt.cxx
@@ -71,13 +71,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreFrmedtTest,
testVertPosFromBottomBoundingBox)
xFactory->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProps->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::NONE));
+ xShapeProps->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProps->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::NONE));
xShapeProps->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
- xShapeProps->setPropertyValue("VertOrientPosition",
-
uno::makeAny(static_cast<sal_Int32>(-11000)));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+ xShapeProps->setPropertyValue("VertOrientPosition",
uno::Any(static_cast<sal_Int32>(-11000)));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 61a8614b4ac2..11a1df0d7be9 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -294,7 +294,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testGutterMargin)
// Set the gutter margin to 2cm.
sal_Int32 nGutterMm100 = 2000;
- xStandard->setPropertyValue("GutterMargin", uno::makeAny(nGutterMm100));
+ xStandard->setPropertyValue("GutterMargin", uno::Any(nGutterMm100));
// Verify that the new left edge is larger.
tools::Long nNewLeft = pPage->getFramePrintArea().Left();
@@ -314,7 +314,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testGutterTopMargin)
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xSettings(
xFactory->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
- xSettings->setPropertyValue("GutterAtTop", uno::makeAny(true));
+ xSettings->setPropertyValue("GutterAtTop", uno::Any(true));
uno::Reference<beans::XPropertySet>
xStandard(getStyles("PageStyles")->getByName("Standard"),
uno::UNO_QUERY);
SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
@@ -323,7 +323,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testGutterTopMargin)
// Set the gutter margin to 2cm.
sal_Int32 nGutterMm100 = 2000;
- xStandard->setPropertyValue("GutterMargin", uno::makeAny(nGutterMm100));
+ xStandard->setPropertyValue("GutterMargin", uno::Any(nGutterMm100));
// Verify that the new top edge is larger.
tools::Long nNewTop = pPage->getFramePrintArea().Top();
@@ -349,9 +349,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testGutterMirrorMargin)
uno::Reference<beans::XPropertySet>
xStandard(getStyles("PageStyles")->getByName("Standard"),
uno::UNO_QUERY);
- xStandard->setPropertyValue("PageStyleLayout",
uno::makeAny(style::PageStyleLayout_MIRRORED));
+ xStandard->setPropertyValue("PageStyleLayout",
uno::Any(style::PageStyleLayout_MIRRORED));
sal_Int32 nGutterMm100 = 2000;
- xStandard->setPropertyValue("GutterMargin", uno::makeAny(nGutterMm100));
+ xStandard->setPropertyValue("GutterMargin", uno::Any(nGutterMm100));
tools::Long nNewLeft = pPage->getFramePrintArea().Left();
tools::Long nGutterTwips = o3tl::toTwips(nGutterMm100,
o3tl::Length::mm100);
@@ -375,9 +375,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testRtlGutterMargin)
tools::Long nOldRight = pPage->getFramePrintArea().Right();
// When setting enable RTL gutter mode and setting a gutter margin:
- xStandard->setPropertyValue("RtlGutter", uno::makeAny(true));
+ xStandard->setPropertyValue("RtlGutter", uno::Any(true));
sal_Int32 nGutterMm100 = 2000;
- xStandard->setPropertyValue("GutterMargin", uno::makeAny(nGutterMm100));
+ xStandard->setPropertyValue("GutterMargin", uno::Any(nGutterMm100));
// Then make sure the new right edge of the print area is decreased:
tools::Long nNewRight = pPage->getFramePrintArea().Right();
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 91c7a928a46a..6840a6884a05 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -239,7 +239,7 @@ void SwMacrosTest::testControlShapeGrouping()
UNO_QUERY);
xDateShape->setControl(xDateControlModel);
uno::Reference<beans::XPropertySet> xDateShapeProps(xDateShape, UNO_QUERY);
- xDateShapeProps->setPropertyValue("AnchorType",
makeAny(text::TextContentAnchorType_AT_PARAGRAPH));
+ xDateShapeProps->setPropertyValue("AnchorType",
Any(text::TextContentAnchorType_AT_PARAGRAPH));
uno::Reference<drawing::XControlShape> const xTimeShape(
xFactory->createInstance("com.sun.star.drawing.ControlShape"),
@@ -249,11 +249,11 @@ void SwMacrosTest::testControlShapeGrouping()
UNO_QUERY);
xTimeShape->setControl(xTimeControlModel);
uno::Reference<beans::XPropertySet> xTimeShapeProps(xTimeShape, UNO_QUERY);
- xTimeShapeProps->setPropertyValue("AnchorType",
makeAny(text::TextContentAnchorType_AT_PARAGRAPH));
+ xTimeShapeProps->setPropertyValue("AnchorType",
Any(text::TextContentAnchorType_AT_PARAGRAPH));
- xFormNC->insertByName("aDateCntrl", makeAny(xDateControlModel));
+ xFormNC->insertByName("aDateCntrl", Any(xDateControlModel));
xDPShapes->add(xDateShape);
- xFormNC->insertByName("aTimeCntrl", makeAny(xTimeControlModel));
+ xFormNC->insertByName("aTimeCntrl", Any(xTimeControlModel));
xDPShapes->add(xTimeShape);
xShapes->add(xDateShape);
@@ -323,16 +323,16 @@ void SwMacrosTest::testFdo55289()
createInstance("com.sun.star.drawing.GraphicObjectShape"),
UNO_QUERY);
xShape->setPropertyValue("AnchorType",
- makeAny(text::TextContentAnchorType_AT_PAGE));
+ Any(text::TextContentAnchorType_AT_PAGE));
xShapes->add(uno::Reference<drawing::XShape>(xShape, UNO_QUERY));
xShape->setPropertyValue("AnchorType",
- makeAny(text::TextContentAnchorType_AT_CHARACTER));
+ Any(text::TextContentAnchorType_AT_CHARACTER));
xShape->setPropertyValue("AnchorType",
- makeAny(text::TextContentAnchorType_AS_CHARACTER));
+ Any(text::TextContentAnchorType_AS_CHARACTER));
xShape->setPropertyValue("AnchorType",
- makeAny(text::TextContentAnchorType_AT_CHARACTER));
+ Any(text::TextContentAnchorType_AT_CHARACTER));
xShape->setPropertyValue("AnchorType",
- makeAny(text::TextContentAnchorType_AS_CHARACTER));
+ Any(text::TextContentAnchorType_AS_CHARACTER));
uno::Reference<text::XTextRange> const xEnd =
uno::Reference<text::XTextDocument>(xModel,
UNO_QUERY_THROW)->getText()->getEnd();
uno::Reference<text::XTextContent> const xShapeContent(xShape, UNO_QUERY);
@@ -395,7 +395,7 @@ void SwMacrosTest::testFdo87530()
Reference<script::XLibraryContainerPassword> xBasLibPwd(xStorBasLib,
UNO_QUERY_THROW);
Reference<container::XNameContainer>
xLibrary(xBasLib->createLibrary("BarLibrary"));
xLibrary->insertByName("BarModule",
- uno::makeAny(OUString("Sub Main\nEnd Sub\n")));
+ uno::Any(OUString("Sub Main\nEnd Sub\n")));
xBasLibPwd->changeLibraryPassword("BarLibrary", "", "foo");
Reference<frame::XStorable> xDocStorable(xComponent, UNO_QUERY_THROW);
@@ -424,7 +424,7 @@ void SwMacrosTest::testFdo87530()
// add a second module now - tdf#87530 happened here
Reference<container::XNameContainer>
xFooLib(xBasLib->createLibrary("FooLibrary"));
xFooLib->insertByName("FooModule",
- uno::makeAny(OUString("Sub Main\nEnd Sub\n")));
+ uno::Any(OUString("Sub Main\nEnd Sub\n")));
xBasLibPwd->changeLibraryPassword("FooLibrary", "", "foo");
// store again
diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx
b/sw/qa/core/objectpositioning/objectpositioning.cxx
index 7c91bc797512..e3aace4ffc87 100644
--- a/sw/qa/core/objectpositioning/objectpositioning.cxx
+++ b/sw/qa/core/objectpositioning/objectpositioning.cxx
@@ -30,9 +30,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testOverlapCrash)
// Change their anchor type to to-char.
uno::Reference<beans::XPropertySet> xShape1(getShape(1), uno::UNO_QUERY);
- xShape1->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+ xShape1->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
uno::Reference<beans::XPropertySet> xShape2(getShape(1), uno::UNO_QUERY);
- xShape2->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+ xShape2->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
// Insert a new paragraph at the start.
SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
@@ -51,13 +51,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertPosFromBottom)
xFactory->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProps->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::NONE));
+ xShapeProps->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProps->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::NONE));
xShapeProps->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
- xShapeProps->setPropertyValue("VertOrientPosition",
-
uno::makeAny(static_cast<sal_Int32>(-11000)));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+ xShapeProps->setPropertyValue("VertOrientPosition",
uno::Any(static_cast<sal_Int32>(-11000)));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
@@ -87,10 +85,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMargin)
xShapeBottom->setSize(awt::Size(500, 500));
uno::Reference<beans::XPropertySet> xShapePropsBottom(xShapeBottom,
uno::UNO_QUERY);
xShapePropsBottom->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsBottom->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::BOTTOM));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsBottom->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::BOTTOM));
xShapePropsBottom->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierBottom(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierBottom->getDrawPage()->add(xShapeBottom);
@@ -100,10 +98,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMargin)
xShapeCenter->setSize(awt::Size(500, 500));
uno::Reference<beans::XPropertySet> xShapePropsCenter(xShapeCenter,
uno::UNO_QUERY);
xShapePropsCenter->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsCenter->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::CENTER));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsCenter->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::CENTER));
xShapePropsCenter->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierCenter(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierCenter->getDrawPage()->add(xShapeCenter);
@@ -113,10 +111,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMargin)
xShapeTop->setSize(awt::Size(500, 500));
uno::Reference<beans::XPropertySet> xShapePropsTop(xShapeTop,
uno::UNO_QUERY);
xShapePropsTop->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsTop->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::TOP));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsTop->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::TOP));
xShapePropsTop->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierTop(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierTop->getDrawPage()->add(xShapeTop);
@@ -159,10 +157,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMarginWithF
xShapeBottom->setSize(awt::Size(1000, 1000));
uno::Reference<beans::XPropertySet> xShapePropsBottom(xShapeBottom,
uno::UNO_QUERY);
xShapePropsBottom->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsBottom->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::BOTTOM));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsBottom->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::BOTTOM));
xShapePropsBottom->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierBottom(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierBottom->getDrawPage()->add(xShapeBottom);
@@ -172,10 +170,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMarginWithF
xShapeCenter->setSize(awt::Size(1000, 1000));
uno::Reference<beans::XPropertySet> xShapePropsCenter(xShapeCenter,
uno::UNO_QUERY);
xShapePropsCenter->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsCenter->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::CENTER));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsCenter->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::CENTER));
xShapePropsCenter->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierCenter(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierCenter->getDrawPage()->add(xShapeCenter);
@@ -185,10 +183,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest,
testVertAlignBottomMarginWithF
xShapeTop->setSize(awt::Size(1000, 1000));
uno::Reference<beans::XPropertySet> xShapePropsTop(xShapeTop,
uno::UNO_QUERY);
xShapePropsTop->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapePropsTop->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::TOP));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapePropsTop->setPropertyValue("VertOrient",
uno::Any(text::VertOrientation::TOP));
xShapePropsTop->setPropertyValue("VertOrientRelation",
-
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
+
uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplierTop(mxComponent, uno::UNO_QUERY);
xDrawPageSupplierTop->getDrawPage()->add(xShapeTop);
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index f6c4023af944..2db4d6dab348 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -67,7 +67,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testSemiTransparentText)
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xParagraph.is());
sal_Int16 nTransparence = 50;
- xParagraph->setPropertyValue("CharTransparence",
uno::makeAny(nTransparence));
+ xParagraph->setPropertyValue("CharTransparence", uno::Any(nTransparence));
uno::Reference<text::XTextRange> xTextRange(xParagraph, uno::UNO_QUERY);
CPPUNIT_ASSERT(xTextRange.is());
xTextRange->setString("x");
@@ -106,7 +106,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testBibliographyUrlPdfExport)
comphelper::makePropertyValue("Title", OUString("Title")),
comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -273,7 +273,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testClearingLineBreak)
xFactory->createInstance("com.sun.star.text.LineBreak"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::ALL);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
// When laying out that document:
@@ -303,7 +303,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testClearingLineBreakAtStart)
xFactory->createInstance("com.sun.star.text.LineBreak"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::ALL);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
// When laying out that document:
@@ -333,7 +333,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testClearingLineBreakLeft)
xShape->setSize(awt::Size(5000, 5000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape,
uno::UNO_QUERY);
xShapeProps->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
uno::Reference<text::XTextContent> xShapeContent(xShape,
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xShapeContent, /*bAbsorb=*/false);
}
@@ -343,8 +343,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testClearingLineBreakLeft)
xShape->setSize(awt::Size(5000, 7500));
uno::Reference<beans::XPropertySet> xShapeProps(xShape,
uno::UNO_QUERY);
xShapeProps->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProps->setPropertyValue("HoriOrientPosition",
uno::makeAny(sal_Int32(10000)));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProps->setPropertyValue("HoriOrientPosition",
uno::Any(sal_Int32(10000)));
uno::Reference<text::XTextContent> xShapeContent2(xShape,
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xShapeContent2, /*bAbsorb=*/false);
}
@@ -352,7 +352,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testClearingLineBreakLeft)
xFactory->createInstance("com.sun.star.text.LineBreak"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::LEFT);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
xText->insertString(xCursor, "foo", /*bAbsorb=*/false);
xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
xText->insertString(xCursor, "bar", /*bAbsorb=*/false);
@@ -395,7 +395,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testAsCharImageDocModelFromViewPoint)
xFactory->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
// Only set the anchor type, the actual bitmap content is not interesting.
xTextGraphic->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AS_CHARACTER));
+
uno::Any(text::TextContentAnchorType_AS_CHARACTER));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xBodyText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor(xBodyText->createTextCursor());
diff --git a/sw/qa/core/tox/tox.cxx b/sw/qa/core/tox/tox.cxx
index 1ac8764a0574..a5667a6947c0 100644
--- a/sw/qa/core/tox/tox.cxx
+++ b/sw/qa/core/tox/tox.cxx
@@ -43,7 +43,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityLinkClick)
comphelper::makePropertyValue("Year", OUString("2020")),
comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf";)),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -84,7 +84,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTableEntryURL)
comphelper::makePropertyValue("Title", OUString("Title")),
comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -129,7 +129,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTableEntryClick)
comphelper::makePropertyValue("Title", OUString("Title")),
comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf#page=1";)),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -177,7 +177,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAuthorityTableEntryRelClick)
comphelper::makePropertyValue("Title", OUString("Title")),
comphelper::makePropertyValue("URL", OUString("test.pdf#page=1")),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -223,7 +223,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testAuthorityTableURLDeduplication)
comphelper::makePropertyValue("Title", OUString("Title")),
comphelper::makePropertyValue("URL", OUString(rURL)),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextContent> xContent(xField, uno::UNO_QUERY);
xText->insertTextContent(xCursor, xContent, /*bAbsorb=*/false);
}
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index f941c60c4aaf..567db1d1fd52 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -79,8 +79,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, flyAtParaAnchor)
uno::Reference<text::XTextFrame> const xTextFrame(
xMSF->createInstance("com.sun.star.text.TextFrame"),
uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> const xFrameProps(xTextFrame,
uno::UNO_QUERY_THROW);
- xFrameProps->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_PARAGRAPH));
+ xFrameProps->setPropertyValue("AnchorType",
uno::Any(text::TextContentAnchorType_AT_PARAGRAPH));
auto const xText = xTD->getText();
auto const xTextCursor = xText->createTextCursor();
CPPUNIT_ASSERT(xTextCursor.is());
@@ -101,7 +100,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testRtlGutter)
// - Unknown property: RtlGutter
auto bRtlGutter = getProperty<bool>(xPageStyle, "RtlGutter");
CPPUNIT_ASSERT(!bRtlGutter);
- xPageStyle->setPropertyValue("RtlGutter", uno::makeAny(true));
+ xPageStyle->setPropertyValue("RtlGutter", uno::Any(true));
bRtlGutter = getProperty<bool>(xPageStyle, "RtlGutter");
CPPUNIT_ASSERT(bRtlGutter);
}
@@ -124,7 +123,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testBiblioLocalCopy)
comphelper::makePropertyValue("URL",
OUString("http://www.example.com/test.pdf";)),
comphelper::makePropertyValue("LocalURL",
OUString("file:///home/me/test.pdf")),
};
- xField->setPropertyValue("Fields", uno::makeAny(aFields));
+ xField->setPropertyValue("Fields", uno::Any(aFields));
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
@@ -150,7 +149,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testLinkedStyles)
uno::Reference<beans::XPropertySet>
xParaStyle(xParaStyles->getByName("Caption"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(xParaStyle,
"LinkStyle"));
- xParaStyle->setPropertyValue("LinkStyle",
uno::makeAny(OUString("Emphasis")));
+ xParaStyle->setPropertyValue("LinkStyle", uno::Any(OUString("Emphasis")));
// Then make sure we get the linked char style back:
CPPUNIT_ASSERT_EQUAL(OUString("Emphasis"),
getProperty<OUString>(xParaStyle, "LinkStyle"));
@@ -159,7 +158,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testLinkedStyles)
uno::Reference<beans::XPropertySet>
xCharStyle(xCharStyles->getByName("Emphasis"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(xCharStyle,
"LinkStyle"));
- xCharStyle->setPropertyValue("LinkStyle",
uno::makeAny(OUString("Caption")));
+ xCharStyle->setPropertyValue("LinkStyle", uno::Any(OUString("Caption")));
// Then make sure we get the linked para style back:
CPPUNIT_ASSERT_EQUAL(OUString("Caption"),
getProperty<OUString>(xCharStyle, "LinkStyle"));
}
@@ -230,7 +229,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testLineBreakInsert)
xMSF->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::ALL);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
@@ -261,7 +260,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testLineBreakTextPortionEnum)
xMSF->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::ALL);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false);
@@ -291,9 +290,9 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserFieldTooltip)
xFactory->createInstance("com.sun.star.text.TextField.User"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xMaster(
xFactory->createInstance("com.sun.star.text.FieldMaster.User"),
uno::UNO_QUERY);
- xMaster->setPropertyValue("Name", uno::makeAny(OUString("a_user_field")));
+ xMaster->setPropertyValue("Name", uno::Any(OUString("a_user_field")));
xField->attachTextFieldMaster(xMaster);
- xField->getTextFieldMaster()->setPropertyValue("Content",
uno::makeAny(OUString("42")));
+ xField->getTextFieldMaster()->setPropertyValue("Content",
uno::Any(OUString("42")));
uno::Reference<text::XTextDocument> xDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<text::XText> xText = xDocument->getText();
xText->insertTextContent(xText->createTextCursor(), xField,
/*bAbsorb=*/false);
@@ -301,7 +300,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserFieldTooltip)
// When setting a tooltip on the field:
OUString aExpected("first line\nsecond line");
- xFieldProps->setPropertyValue("Title", uno::makeAny(aExpected));
+ xFieldProps->setPropertyValue("Title", uno::Any(aExpected));
// Then make sure that the tooltip we read back matches the one previously
specified:
// Without the accompanying fix in place, this test would have failed with:
@@ -327,7 +326,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlInsert)
xMSF->createInstance("com.sun.star.text.ContentControl"),
uno::UNO_QUERY);
// Set a custom property on the content control:
uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl,
uno::UNO_QUERY);
- xContentControlProps->setPropertyValue("ShowingPlaceHolder",
uno::makeAny(true));
+ xContentControlProps->setPropertyValue("ShowingPlaceHolder",
uno::Any(true));
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
// Then make sure that the text attribute is inserted:
@@ -358,11 +357,11 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testImageTooltip)
xFactory->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
xText->insertTextContent(xCursor, xImage, /*bAbsorb=*/false);
uno::Reference<beans::XPropertySet> xImageProps(xImage, uno::UNO_QUERY);
- xImageProps->setPropertyValue("HyperLinkURL",
uno::makeAny(OUString("http://www.example.com";)));
+ xImageProps->setPropertyValue("HyperLinkURL",
uno::Any(OUString("http://www.example.com";)));
// When setting a tooltip on the image:
OUString aExpected("first line\nsecond line");
- xImageProps->setPropertyValue("Tooltip", uno::makeAny(aExpected));
+ xImageProps->setPropertyValue("Tooltip", uno::Any(aExpected));
// Then make sure that the tooltip we read back matches the one previously
specified:
// Without the accompanying fix in place, this test would have failed with:
@@ -436,10 +435,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest,
testContentControlCheckbox)
uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl,
uno::UNO_QUERY);
// Without the accompanying fix in place, this test would have failed with:
// An uncaught exception of type
com.sun.star.beans.UnknownPropertyException
- xContentControlProps->setPropertyValue("Checkbox", uno::makeAny(true));
- xContentControlProps->setPropertyValue("Checked", uno::makeAny(true));
- xContentControlProps->setPropertyValue("CheckedState",
uno::makeAny(OUString(u"☒")));
- xContentControlProps->setPropertyValue("UncheckedState",
uno::makeAny(OUString(u"☐")));
+ xContentControlProps->setPropertyValue("Checkbox", uno::Any(true));
+ xContentControlProps->setPropertyValue("Checked", uno::Any(true));
+ xContentControlProps->setPropertyValue("CheckedState",
uno::Any(OUString(u"☒")));
+ xContentControlProps->setPropertyValue("UncheckedState",
uno::Any(OUString(u"☐")));
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
// Then make sure that the specified properties are set:
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index d330384ae4ac..ae720f503f56 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -646,27 +646,27 @@ void Test::testCharHighlightODF()
switch (i)
{
case 1: // non-transparent highlight
- xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
- xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast<sal_Int32>(64)));
+ xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue("CharBackTransparent", uno::Any(true));
+ xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(64)));
break;
case 2: // transparent backcolor
- xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true));
- xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast<sal_Int32>(COL_TRANSPARENT)));
+ xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue("CharBackTransparent", uno::Any(true));
+ xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
break;
case 3: // non-transparent backcolor
- xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
- xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast<sal_Int32>(COL_TRANSPARENT)));
+ xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue("CharBackTransparent", uno::Any(false));
+ xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(COL_TRANSPARENT)));
break;
case 4: // non-transparent highlight again
- xRun->setPropertyValue("CharBackColor",
uno::makeAny(static_cast<sal_Int32>(128)));
- xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false));
- xRun->setPropertyValue("CharHighlight",
uno::makeAny(static_cast<sal_Int32>(64)));
+ xRun->setPropertyValue("CharBackColor",
uno::Any(static_cast<sal_Int32>(128)));
+ xRun->setPropertyValue("CharBackTransparent", uno::Any(false));
+ xRun->setPropertyValue("CharHighlight",
uno::Any(static_cast<sal_Int32>(64)));
break;
}
}
@@ -765,9 +765,9 @@ void Test::testMSCharBackgroundEditing()
case 3: nBackColor = COL_LIGHTGREEN; break; //green 0x00ff00
case 4: nBackColor = COL_LIGHTMAGENTA; break; //magenta
0xff00ff
}
- xRun->setPropertyValue("CharBackColor", uno::makeAny(nBackColor));
+ xRun->setPropertyValue("CharBackColor", uno::Any(nBackColor));
// Remove highlighting
- xRun->setPropertyValue("CharHighlight",
uno::makeAny(COL_TRANSPARENT));
+ xRun->setPropertyValue("CharHighlight", uno::Any(COL_TRANSPARENT));
// Remove shading marker
uno::Sequence<beans::PropertyValue> aGrabBag =
getProperty<uno::Sequence<beans::PropertyValue> >(xRun,"CharInteropGrabBag");
for (beans::PropertyValue& rProp : asNonConstRange(aGrabBag))
@@ -778,7 +778,7 @@ void Test::testMSCharBackgroundEditing()
rProp.Value <<= false;
}
}
- xRun->setPropertyValue("CharInteropGrabBag",
uno::makeAny(aGrabBag));
+ xRun->setPropertyValue("CharInteropGrabBag", uno::Any(aGrabBag));
}
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8695a164b3fb..ff9d6504bb72 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -834,7 +834,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqIfTableHeight)
uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xRow(xTable->getRows()->getByIndex(0),
uno::UNO_QUERY);
- xRow->setPropertyValue("Height",
uno::makeAny(static_cast<sal_Int32>(1000)));
+ xRow->setPropertyValue("Height", uno::Any(static_cast<sal_Int32>(1000)));
// When exporting to reqif-xhtml:
ExportToReqif();
@@ -1073,7 +1073,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testBlockQuoteReqIf)
// Build a document model that uses the Quotations paragraph style.
loadURL("private:factory/swriter", nullptr);
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("ParaStyleName",
uno::makeAny(OUString("Quotations")));
+ xParagraph->setPropertyValue("ParaStyleName",
uno::Any(OUString("Quotations")));
// Export it.
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
@@ -1143,8 +1143,8 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifComment)
// Create a document with a comment in it.
loadURL("private:factory/swriter", nullptr);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Text", uno::makeAny(OUString("some text")) },
- { "Author", uno::makeAny(OUString("me")) },
+ { "Text", uno::Any(OUString("some text")) },
+ { "Author", uno::Any(OUString("me")) },
});
dispatchCommand(mxComponent, ".uno:InsertAnnotation", aPropertyValues);
@@ -1164,11 +1164,11 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifFontNameSize)
// Create a document with a custom font name and size in it.
loadURL("private:factory/swriter", nullptr);
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("CharFontName",
uno::makeAny(OUString("Liberation Serif")));
+ xParagraph->setPropertyValue("CharFontName", uno::Any(OUString("Liberation
Serif")));
float fCharHeight = 14.0;
- xParagraph->setPropertyValue("CharHeight", uno::makeAny(fCharHeight));
+ xParagraph->setPropertyValue("CharHeight", uno::Any(fCharHeight));
sal_Int32 nCharColor = 0xff0000;
- xParagraph->setPropertyValue("CharColor", uno::makeAny(nCharColor));
+ xParagraph->setPropertyValue("CharColor", uno::Any(nCharColor));
uno::Reference<text::XTextRange> xTextRange(xParagraph, uno::UNO_QUERY);
xTextRange->setString("x");
@@ -1192,8 +1192,8 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifParagraphAlignment)
// Create a document with an explicitly aligned paragraph.
loadURL("private:factory/swriter", nullptr);
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue(
- "ParaAdjust",
uno::makeAny(static_cast<sal_Int16>(style::ParagraphAdjust_RIGHT)));
+ xParagraph->setPropertyValue("ParaAdjust",
+
uno::Any(static_cast<sal_Int16>(style::ParagraphAdjust_RIGHT)));
// Export it.
ExportToReqif();
@@ -1362,8 +1362,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testUnderlineNone)
uno::Reference<text::XText> xText = xTextDocument->getText();
xText->insertString(xText->getEnd(), "x", /*bAbsorb=*/false);
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("CharUnderline",
-
uno::makeAny(sal_Int16(awt::FontUnderline::NONE)));
+ xParagraph->setPropertyValue("CharUnderline",
uno::Any(sal_Int16(awt::FontUnderline::NONE)));
// Export to reqif-xhtml.
ExportToReqif();
@@ -1540,9 +1539,9 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testBlockQuoteNoMargin)
xText->insertString(xText->getEnd(), "string", /*bAbsorb=*/false);
uno::Reference<beans::XPropertySet> xQuotations(
getStyles("ParagraphStyles")->getByName("Quotations"), uno::UNO_QUERY);
- xQuotations->setPropertyValue("ParaBottomMargin",
uno::makeAny(static_cast<sal_Int32>(0)));
+ xQuotations->setPropertyValue("ParaBottomMargin",
uno::Any(static_cast<sal_Int32>(0)));
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("ParaStyleName",
uno::makeAny(OUString("Quotations")));
+ xParagraph->setPropertyValue("ParaStyleName",
uno::Any(OUString("Quotations")));
// When exporting to XHTML:
ExportToReqif();
@@ -1677,7 +1676,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifEmbedPNGShapeDirectly)
xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"),
uno::UNO_QUERY);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("GraphicURL", uno::makeAny(aImageURL));
+ xShapeProps->setPropertyValue("GraphicURL", uno::Any(aImageURL));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
@@ -1710,7 +1709,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifEmbedJPGShapeDirectly)
xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"),
uno::UNO_QUERY);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("GraphicURL", uno::makeAny(aImageURL));
+ xShapeProps->setPropertyValue("GraphicURL", uno::Any(aImageURL));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
@@ -1746,7 +1745,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifEmbedPNGShapeAsOLE)
xFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"),
uno::UNO_QUERY);
xShape->setSize(awt::Size(10000, 10000));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("GraphicURL", uno::makeAny(aImageURL));
+ xShapeProps->setPropertyValue("GraphicURL", uno::Any(aImageURL));
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
xDrawPageSupplier->getDrawPage()->add(xShape);
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index c543a89076e5..a55b6ce0bc92 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3657,10 +3657,10 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testShapeAllowOverlapWrap)
xShape->setSize(aSize);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xDocument,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShapeProperties(xShape,
uno::UNO_QUERY);
- xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+ xShapeProperties->setPropertyValue("AllowOverlap", uno::Any(false));
xShapeProperties->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProperties->setPropertyValue("Surround",
uno::makeAny(text::WrapTextMode_THROUGH));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProperties->setPropertyValue("Surround",
uno::Any(text::WrapTextMode_THROUGH));
xDrawPageSupplier->getDrawPage()->add(xShape);
aPoint = awt::Point(2000, 2000);
@@ -3668,10 +3668,10 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testShapeAllowOverlapWrap)
xShape->setPosition(aPoint);
xShape->setSize(aSize);
xShapeProperties.set(xShape, uno::UNO_QUERY);
- xShapeProperties->setPropertyValue("AllowOverlap", uno::makeAny(false));
+ xShapeProperties->setPropertyValue("AllowOverlap", uno::Any(false));
xShapeProperties->setPropertyValue("AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
- xShapeProperties->setPropertyValue("Surround",
uno::makeAny(text::WrapTextMode_THROUGH));
+
uno::Any(text::TextContentAnchorType_AT_CHARACTER));
+ xShapeProperties->setPropertyValue("Surround",
uno::Any(text::WrapTextMode_THROUGH));
xDrawPageSupplier->getDrawPage()->add(xShape);
// Now verify that the rectangle of the anchored objects do overlap.
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index c797b03dd859..53678a1caf94 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -123,9 +123,9 @@ public:
assert( xRowSetPropSet.is() && "failed to get XPropertySet interface
from RowSet" );
if (xRowSetPropSet.is())
{
- xRowSetPropSet->setPropertyValue( "DataSourceName",
uno::makeAny( aDBName ) );
- xRowSetPropSet->setPropertyValue( "Command",
uno::makeAny( OUString::createFromAscii(tablename) ) );
- xRowSetPropSet->setPropertyValue( "CommandType",
uno::makeAny( sdb::CommandType::TABLE ) );
+ xRowSetPropSet->setPropertyValue( "DataSourceName", uno::Any(
aDBName ) );
+ xRowSetPropSet->setPropertyValue( "Command", uno::Any(
OUString::createFromAscii(tablename) ) );
+ xRowSetPropSet->setPropertyValue( "CommandType", uno::Any(
sdb::CommandType::TABLE ) );
uno::Reference< sdbc::XRowSet > xRowSet( xInstance, uno::UNO_QUERY
);
if (xRowSet.is())
@@ -219,7 +219,7 @@ public:
}
else
{
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(true), res);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(true), res);
if( !bMMFilenameFromColumn && !bDontLoadResult )
loadMailMergeDocument( 0 );
}
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 8db40efda7bf..bd11c7406a68 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -739,8 +739,8 @@ DECLARE_ODFEXPORT_TEST(testFdo79358, "fdo79358.odt")
getProperty< uno::Reference<container::XIndexReplace> >(xTOCProps,
"LevelParagraphStyles"));
uno::Sequence<OUString> seq { "Heading" };
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(seq), xLevels->getByIndex(1));
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(uno::Sequence<OUString>()),
xLevels->getByIndex(2));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(seq), xLevels->getByIndex(1));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(uno::Sequence<OUString>()),
xLevels->getByIndex(2));
}
DECLARE_ODFEXPORT_TEST(testFirstHeaderFooter, "first-header-footer.odt")
@@ -1240,61 +1240,61 @@ DECLARE_ODFEXPORT_TEST(testTdf103091, "tdf103091.fodt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(28), conditions.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("TableHeader"), conditions[0].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Addressee")),
conditions[0].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Addressee")), conditions[0].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Table"), conditions[1].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Bibliography 1")),
conditions[1].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Bibliography 1")),
conditions[1].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Frame"), conditions[2].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Bibliography Heading")),
conditions[2].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Bibliography Heading")),
conditions[2].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Section"), conditions[3].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Caption")),
conditions[3].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Caption")), conditions[3].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Footnote"), conditions[4].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Salutation")),
conditions[4].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Salutation")),
conditions[4].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Endnote"), conditions[5].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 1")),
conditions[5].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 1")),
conditions[5].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Header"), conditions[6].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 2")),
conditions[6].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 2")),
conditions[6].Value);
CPPUNIT_ASSERT_EQUAL(OUString("Footer"), conditions[7].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 3")),
conditions[7].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 3")),
conditions[7].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel1"), conditions[8].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 4")),
conditions[8].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 4")),
conditions[8].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel2"), conditions[9].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 5")),
conditions[9].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 5")),
conditions[9].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel3"), conditions[10].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 6")),
conditions[10].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 6")),
conditions[10].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel4"), conditions[11].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 7")),
conditions[11].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 7")),
conditions[11].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel5"), conditions[12].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 8")),
conditions[12].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 8")),
conditions[12].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel6"), conditions[13].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 9")),
conditions[13].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 9")),
conditions[13].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel7"), conditions[14].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents 10")),
conditions[14].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents 10")),
conditions[14].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel8"), conditions[15].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Contents Heading")),
conditions[15].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Contents Heading")),
conditions[15].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel9"), conditions[16].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Standard")),
conditions[16].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Standard")), conditions[16].Value);
CPPUNIT_ASSERT_EQUAL(OUString("OutlineLevel10"), conditions[17].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Drawing")),
conditions[17].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Drawing")), conditions[17].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel1"), conditions[18].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Endnote")),
conditions[18].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Endnote")), conditions[18].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel2"), conditions[19].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("First line indent")),
conditions[19].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("First line indent")),
conditions[19].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel3"), conditions[20].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Footer")),
conditions[20].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Footer")), conditions[20].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel4"), conditions[21].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Footer left")),
conditions[21].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Footer left")),
conditions[21].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel5"), conditions[22].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Footer right")),
conditions[22].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Footer right")),
conditions[22].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel6"), conditions[23].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Footnote")),
conditions[23].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Footnote")), conditions[23].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel7"), conditions[24].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Frame contents")),
conditions[24].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Frame contents")),
conditions[24].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel8"), conditions[25].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Hanging indent")),
conditions[25].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Hanging indent")),
conditions[25].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel9"), conditions[26].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Header")),
conditions[26].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Header")), conditions[26].Value);
CPPUNIT_ASSERT_EQUAL(OUString("NumberingLevel10"), conditions[27].Name);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Header left")),
conditions[27].Value);
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Header left")),
conditions[27].Value);
}
DECLARE_ODFEXPORT_TEST(testTextframeTransparentShadow,
"textframe-transparent-shadow.odt")
@@ -1814,7 +1814,7 @@ DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
return;
// Make sure that btlr -> tbrl transition clears the "BT" flag.
- xTextFrame->setPropertyValue("WritingMode",
uno::makeAny(text::WritingMode2::TB_LR));
+ xTextFrame->setPropertyValue("WritingMode",
uno::Any(text::WritingMode2::TB_LR));
pFlyFrame = dynamic_cast<SwFlyFrame*>(rAnchored[0]);
CPPUNIT_ASSERT(pFlyFrame);
CPPUNIT_ASSERT(!pFlyFrame->IsVertLRBT());
@@ -2291,9 +2291,9 @@ DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr,
"userdefattr-tablecell.odt")
uno::Reference<table::XCell> const xCellA1(xTable->getCellByName("A1"),
uno::UNO_SET_THROW);
uno::Reference<table::XCell> const xCellB1(xTable->getCellByName("B1"),
uno::UNO_SET_THROW);
uno::Reference<table::XCell> const xCellC1(xTable->getCellByName("C1"),
uno::UNO_SET_THROW);
- getUserDefineAttribute(uno::makeAny(xCellA1), "proName", "v1");
- getUserDefineAttribute(uno::makeAny(xCellB1), "proName", "v2");
- getUserDefineAttribute(uno::makeAny(xCellC1), "proName", "v3");
+ getUserDefineAttribute(uno::Any(xCellA1), "proName", "v1");
+ getUserDefineAttribute(uno::Any(xCellB1), "proName", "v2");
+ getUserDefineAttribute(uno::Any(xCellC1), "proName", "v3");
}
DECLARE_ODFEXPORT_TEST(testEmbeddedPdf, "embedded-pdf.odt")
@@ -2800,8 +2800,8 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage,
"referencelanguage.odt")
uno::Reference<container::XEnumerationAccess>
xFieldsAccess(xTextFieldsSupplier->getTextFields());
uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
- uno::Any aHu = uno::makeAny(OUString("Hu"));
- uno::Any ahu = uno::makeAny(OUString("hu"));
+ uno::Any aHu(OUString("Hu"));
+ uno::Any ahu(OUString("hu"));
for (size_t i = 0; i < SAL_N_ELEMENTS(aFieldTexts); i++)
{
uno::Any aField = xFields->nextElement();
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index e79ce4df1da1..d0235dfbd88d 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -80,7 +80,7 @@ CPPUNIT_TEST_FIXTURE(Test, testHideAllSections)
uno::Reference<container::XNameAccess> xMasters =
xTextFieldsSupplier->getTextFieldMasters();
// Set _CS_Allgemein to 0
uno::Reference<beans::XPropertySet>
xMaster(xMasters->getByName("com.sun.star.text.fieldmaster.User._CS_Allgemein"),
uno::UNO_QUERY);
- xMaster->setPropertyValue("Content", uno::makeAny(OUString("0")));
+ xMaster->setPropertyValue("Content", uno::Any(OUString("0")));
// This used to crash
uno::Reference<util::XRefreshable>(xTextFieldsSupplier->getTextFields(),
uno::UNO_QUERY_THROW)->refresh();
}
@@ -461,16 +461,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf74524)
uno::Reference<lang::XServiceInfo> xServiceInfo1(aField1, uno::UNO_QUERY);
CPPUNIT_ASSERT(xServiceInfo1->supportsService("com.sun.star.text.textfield.PageNumber"));
uno::Reference<beans::XPropertySet> xPropertySet(aField1, uno::UNO_QUERY);
-
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_Int16(style::NumberingType::PAGE_DESCRIPTOR)),
xPropertySet->getPropertyValue("NumberingType"));
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_Int16(0)),
xPropertySet->getPropertyValue("Offset"));
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(text::PageNumberType_CURRENT),
xPropertySet->getPropertyValue("SubType"));
+
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(style::NumberingType::PAGE_DESCRIPTOR)),
xPropertySet->getPropertyValue("NumberingType"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int16(0)),
xPropertySet->getPropertyValue("Offset"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(text::PageNumberType_CURRENT),
xPropertySet->getPropertyValue("SubType"));
uno::Reference<text::XTextContent> xField1(aField1, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("1"), xField1->getAnchor()->getString());
uno::Any aField2 = xFields->nextElement();
uno::Reference<lang::XServiceInfo> xServiceInfo2(aField2, uno::UNO_QUERY);
CPPUNIT_ASSERT(xServiceInfo2->supportsService("com.sun.star.text.textfield.Annotation"));
uno::Reference<beans::XPropertySet> xPropertySet2(aField2, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(OUString("Comment 1")),
xPropertySet2->getPropertyValue("Content"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Comment 1")),
xPropertySet2->getPropertyValue("Content"));
uno::Reference<text::XTextContent> xField2(aField2, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Hello 1World"),
xField2->getAnchor()->getString());
CPPUNIT_ASSERT(!xFields->hasMoreElements());
@@ -481,17 +481,17 @@ CPPUNIT_TEST_FIXTURE(Test, testPageStyleLayoutRight)
load(mpTestDocumentPath, "hello.odt");
uno::Reference<beans::XPropertySet>
xPropertySet(getStyles("PageStyles")->getByName("Default Page Style"),
uno::UNO_QUERY);
// This caused a crash.
- xPropertySet->setPropertyValue("PageStyleLayout",
uno::makeAny(style::PageStyleLayout_RIGHT));
+ xPropertySet->setPropertyValue("PageStyleLayout",
uno::Any(style::PageStyleLayout_RIGHT));
}
CPPUNIT_TEST_FIXTURE(Test, testFdo61952)
{
load(mpTestDocumentPath, "hello.odt");
uno::Reference<beans::XPropertySet> xPara(getParagraph(1), uno::UNO_QUERY);
- xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Left
Page")));
- xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Right
Page")));
- xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Left
Page")));
- xPara->setPropertyValue("PageDescName", uno::makeAny(OUString("Right
Page")));
+ xPara->setPropertyValue("PageDescName", uno::Any(OUString("Left Page")));
+ xPara->setPropertyValue("PageDescName", uno::Any(OUString("Right Page")));
+ xPara->setPropertyValue("PageDescName", uno::Any(OUString("Left Page")));
+ xPara->setPropertyValue("PageDescName", uno::Any(OUString("Right Page")));
}
CPPUNIT_TEST_FIXTURE(Test, testFdo60842)
@@ -624,7 +624,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo55814)
uno::Reference<container::XEnumerationAccess>
xFieldsAccess(xTextFieldsSupplier->getTextFields());
uno::Reference<container::XEnumeration>
xFields(xFieldsAccess->createEnumeration());
uno::Reference<beans::XPropertySet> xField(xFields->nextElement(),
uno::UNO_QUERY);
- xField->setPropertyValue("Content", uno::makeAny(OUString("Yes")));
+ xField->setPropertyValue("Content", uno::Any(OUString("Yes")));
uno::Reference<util::XRefreshable>(xTextFieldsSupplier->getTextFields(),
uno::UNO_QUERY_THROW)->refresh();
uno::Reference<text::XTextSectionsSupplier>
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess>
xSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
@@ -1163,9 +1163,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134971)
// _not_ touch pool defaults
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
{
- {"Name", uno::makeAny(
+ {"Name", uno::Any(
m_directories.getURLFromSrc(mpTestDocumentPath) +
"tdf134971b.odt")},
- {"Filter", uno::makeAny(OUString("writer8"))},
+ {"Filter", uno::Any(OUString("writer8"))},
});
dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
@@ -1186,9 +1186,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf138879)
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
{
- {"Name", uno::makeAny(
+ {"Name", uno::Any(
m_directories.getURLFromSrc(mpTestDocumentPath) +
"tdf138879.odt")},
- {"Filter", uno::makeAny(OUString("writer8"))},
+ {"Filter", uno::Any(OUString("writer8"))},
});
dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
@@ -1207,7 +1207,7 @@ CPPUNIT_TEST_FIXTURE(Test, testPasteFirstParaDirectFormat)
// Set some direct formatting on the first paragraph, but leave
paragraph adjust at its
// default (left).
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("PageNumberOffset",
uno::makeAny(static_cast<sal_Int16>(0)));
+ xParagraph->setPropertyValue("PageNumberOffset",
uno::Any(static_cast<sal_Int16>(0)));
}
// Paste from ODT.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index a6fac38a0bbb..0fc4462e32b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -77,9 +77,9 @@ protected:
uno::Reference<io::XStream> xStream(new
utl::OStreamWrapper(std::move(pStream)));
uno::Sequence<beans::PropertyValue>
aDescriptor(comphelper::InitPropertySequence(
{
- {"InputStream", uno::makeAny(xStream)},
- {"InputMode", uno::makeAny(true)},
- {"TextInsertModeRange", uno::makeAny(xTextRange)},
+ {"InputStream", uno::Any(xStream)},
+ {"InputMode", uno::Any(true)},
+ {"TextInsertModeRange", uno::Any(xTextRange)},
}));
return xFilter->filter(aDescriptor);
}
@@ -1342,7 +1342,7 @@ DECLARE_OOXMLEXPORT_TEST( testTablePosition14,
"table-position-14.docx")
// Verify X coord
uno::Reference< view::XSelectionSupplier > xCtrl(
xModel->getCurrentController(), uno::UNO_QUERY );
- xCtrl->select( uno::makeAny( xTable1 ) );
+ xCtrl->select( uno::Any( xTable1 ) );
uno::Reference< text::XTextViewCursorSupplier >
xTextViewCursorSupplier( xCtrl, uno::UNO_QUERY );
uno::Reference< text::XTextViewCursor > xCursor =
xTextViewCursorSupplier->getViewCursor();
awt::Point pos = xCursor->getPosition();
@@ -1367,7 +1367,7 @@ DECLARE_OOXMLEXPORT_TEST( testTablePosition15,
"table-position-15.docx" )
// Verify X coord
uno::Reference< view::XSelectionSupplier > xCtrl(
xModel->getCurrentController(), uno::UNO_QUERY );
- xCtrl->select( uno::makeAny( xTable1 ) );
+ xCtrl->select( uno::Any( xTable1 ) );
uno::Reference< text::XTextViewCursorSupplier >
xTextViewCursorSupplier( xCtrl, uno::UNO_QUERY );
uno::Reference< text::XTextViewCursor > xCursor =
xTextViewCursorSupplier->getViewCursor();
awt::Point pos = xCursor->getPosition();
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 48f65a6a0793..ceece00a23f5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -742,9 +742,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTextInput)
sContent = "content without hint";
break;
}
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(sContent),
xPropertySet->getPropertyValue("Content"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(sContent),
xPropertySet->getPropertyValue("Content"));
CPPUNIT_ASSERT_EQUAL(sContent, xText->getAnchor()->getString());
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(sHint),
xPropertySet->getPropertyValue("Hint"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(sHint),
xPropertySet->getPropertyValue("Hint"));
nElements++;
}
while (xFields->hasMoreElements());
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index e808abfc3f97..c6c545b24e54 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -419,7 +419,7 @@ CPPUNIT_TEST_FIXTURE(Test, testArabicZeroNumberingFootnote)
uno::Reference<beans::XPropertySet> xFootnoteSettings
= xFootnotesSupplier->getFootnoteSettings();
sal_uInt16 nNumberingType = style::NumberingType::ARABIC_ZERO;
- xFootnoteSettings->setPropertyValue("NumberingType",
uno::makeAny(nNumberingType));
+ xFootnoteSettings->setPropertyValue("NumberingType",
uno::Any(nNumberingType));
// Insert a footnote.
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
@@ -447,7 +447,7 @@ CPPUNIT_TEST_FIXTURE(Test, testChicagoNumberingFootnote)
uno::Reference<beans::XPropertySet> xFootnoteSettings
= xFootnotesSupplier->getFootnoteSettings();
sal_uInt16 nNumberingType = style::NumberingType::SYMBOL_CHICAGO;
- xFootnoteSettings->setPropertyValue("NumberingType",
uno::makeAny(nNumberingType));
+ xFootnoteSettings->setPropertyValue("NumberingType",
uno::Any(nNumberingType));
// Insert a footnote.
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
@@ -798,7 +798,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testZeroLineSpacing)
style::LineSpacing aSpacing;
aSpacing.Mode = style::LineSpacingMode::MINIMUM;
aSpacing.Height = 0;
- xParagraph->setPropertyValue("ParaLineSpacing", uno::makeAny(aSpacing));
+ xParagraph->setPropertyValue("ParaLineSpacing", uno::Any(aSpacing));
// Export to docx.
save("Office Open XML Text", maTempFile);
@@ -823,7 +823,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testSemiTransparentText)
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xParagraph.is());
sal_Int16 nTransparence = 75;
- xParagraph->setPropertyValue("CharTransparence",
uno::makeAny(nTransparence));
+ xParagraph->setPropertyValue("CharTransparence", uno::Any(nTransparence));
uno::Reference<text::XTextRange> xTextRange(xParagraph, uno::UNO_QUERY);
CPPUNIT_ASSERT(xTextRange.is());
xTextRange->setString("x");
@@ -860,9 +860,9 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserField)
xFactory->createInstance("com.sun.star.text.TextField.User"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xMaster(
xFactory->createInstance("com.sun.star.text.FieldMaster.User"),
uno::UNO_QUERY);
- xMaster->setPropertyValue("Name", uno::makeAny(OUString("foo")));
+ xMaster->setPropertyValue("Name", uno::Any(OUString("foo")));
xField->attachTextFieldMaster(xMaster);
- xField->getTextFieldMaster()->setPropertyValue("Content",
uno::makeAny(OUString("bar")));
+ xField->getTextFieldMaster()->setPropertyValue("Content",
uno::Any(OUString("bar")));
uno::Reference<text::XTextDocument> xDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<text::XText> xText = xDocument->getText();
xText->insertTextContent(xText->createTextCursor(), xField,
/*bAbsorb=*/false);
@@ -919,7 +919,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testHighlightEdit_numbering)
aMap["CharInteropGrabBag"] <<= aGrabBag;
aMap >> aListAutoFormat;
- properties->setPropertyValue("ListAutoFormat",
uno::makeAny(aListAutoFormat));
+ properties->setPropertyValue("ListAutoFormat", uno::Any(aListAutoFormat));
// Export to docx.
save("Office Open XML Text", maTempFile);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index bbbc8e7cfb73..c7bdf83550f6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -225,7 +225,7 @@ CPPUNIT_TEST_FIXTURE(Test, testContentControlExport)
uno::Reference<text::XTextContent> xContentControl(
xMSF->createInstance("com.sun.star.text.ContentControl"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl,
uno::UNO_QUERY);
- xContentControlProps->setPropertyValue("ShowingPlaceHolder",
uno::makeAny(true));
+ xContentControlProps->setPropertyValue("ShowingPlaceHolder",
uno::Any(true));
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
// When exporting to DOCX:
@@ -257,10 +257,10 @@ CPPUNIT_TEST_FIXTURE(Test,
testCheckboxContentControlExport)
uno::Reference<text::XTextContent> xContentControl(
xMSF->createInstance("com.sun.star.text.ContentControl"),
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl,
uno::UNO_QUERY);
- xContentControlProps->setPropertyValue("Checkbox", uno::makeAny(true));
- xContentControlProps->setPropertyValue("Checked", uno::makeAny(true));
- xContentControlProps->setPropertyValue("CheckedState",
uno::makeAny(OUString(u"☒")));
- xContentControlProps->setPropertyValue("UncheckedState",
uno::makeAny(OUString(u"☐")));
+ xContentControlProps->setPropertyValue("Checkbox", uno::Any(true));
+ xContentControlProps->setPropertyValue("Checked", uno::Any(true));
+ xContentControlProps->setPropertyValue("CheckedState",
uno::Any(OUString(u"☒")));
+ xContentControlProps->setPropertyValue("UncheckedState",
uno::Any(OUString(u"☐")));
xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
// When exporting to DOCX:
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 2cf70462cbe9..cd405b196cba 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -156,7 +156,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120852_readOnlyUnProtected,
"tdf120852_readOnlyU
{
CPPUNIT_ASSERT_MESSAGE("Section is not protected",
!getProperty<bool>(xSect, "IsProtected"));
// Enable section protection. The round-trip should have forms
protection enabled.
- xSect->setPropertyValue("IsProtected", uno::makeAny(true));
+ xSect->setPropertyValue("IsProtected", uno::Any(true));
}
else
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 2a54797ef8c4..043b15a99673 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -801,27 +801,27 @@ DECLARE_OOXMLEXPORT_TEST(testBnc519228OddBreaks,
"bnc519228_odd-breaksB.docx")
{
// Check that all the normal styles are not set as right-only, those
should be only those used after odd page breaks.
uno::Reference<beans::XPropertySet>
defaultStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
defaultStyle->getPropertyValue("PageStyleLayout"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(style::PageStyleLayout_ALL),
defaultStyle->getPropertyValue("PageStyleLayout"));
uno::Reference<beans::XPropertySet> firstPage(
getStyles("PageStyles")->getByName("First Page"), uno::UNO_QUERY );
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
firstPage->getPropertyValue("PageStyleLayout"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(style::PageStyleLayout_ALL),
firstPage->getPropertyValue("PageStyleLayout"));
OUString page1StyleName = getProperty<OUString>( getParagraph( 1, "This is
the first page." ), "PageDescName");
uno::Reference<beans::XPropertySet>
page1Style(getStyles("PageStyles")->getByName(page1StyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_RIGHT),
page1Style->getPropertyValue("PageStyleLayout"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(style::PageStyleLayout_RIGHT),
page1Style->getPropertyValue("PageStyleLayout"));
getParagraphOfText( 1, getProperty< uno::Reference<text::XText>
>(page1Style, "HeaderText"), "This is the header for odd pages");
// Page2 comes from follow of style for page 1 and should be a normal
page. Also check the two page style have the same properties,
// since page style for page1 was created from page style for page 2.
OUString page2StyleName = getProperty<OUString>( page1Style, "FollowStyle"
);
uno::Reference<beans::XPropertySet>
page2Style(getStyles("PageStyles")->getByName(page2StyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
page2Style->getPropertyValue("PageStyleLayout"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(style::PageStyleLayout_ALL),
page2Style->getPropertyValue("PageStyleLayout"));
getParagraphOfText( 1, getProperty< uno::Reference<text::XText>
>(page2Style, "HeaderTextLeft"), "This is the even header");
getParagraphOfText( 1, getProperty< uno::Reference<text::XText>
>(page2Style, "HeaderTextRight"), "This is the header for odd pages");
CPPUNIT_ASSERT_EQUAL(getProperty<sal_Int32>(page1Style, "TopMargin"),
getProperty<sal_Int32>(page2Style, "TopMargin"));
OUString page5StyleName = getProperty<OUString>( getParagraph( 4, "Then an
odd break after an odd page, should lead us to page #5." ), "PageDescName");
uno::Reference<beans::XPropertySet>
page5Style(getStyles("PageStyles")->getByName(page5StyleName), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_RIGHT),
page5Style->getPropertyValue("PageStyleLayout"));
+ CPPUNIT_ASSERT_EQUAL(uno::Any(style::PageStyleLayout_RIGHT),
page5Style->getPropertyValue("PageStyleLayout"));
getParagraphOfText( 1, getProperty< uno::Reference<text::XText>
>(page5Style, "HeaderText"), "This is the header for odd pages");
}
@@ -1494,7 +1494,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90789, "tdf90789.docx")
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY_THROW);
uno::Reference<view::XSelectionSupplier>
xCtrl(xModel->getCurrentController(), uno::UNO_QUERY_THROW);
- xCtrl->select(uno::makeAny(xShape->getAnchor()));
+ xCtrl->select(uno::Any(xShape->getAnchor()));
uno::Reference<text::XTextViewCursorSupplier>
xTextViewCursorSupplier(xCtrl, uno::UNO_QUERY_THROW);
uno::Reference<text::XTextViewCursor>
xTextCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_SET_THROW);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index b3f45fd9ce95..a630c00d1b71 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -820,7 +820,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf104823)
// Check field value (it should be value from data source) and set new
CPPUNIT_ASSERT_EQUAL(OUString("True Core Property Value"),
xField1->getPresentation(false));
uno::Reference<beans::XPropertySet> xField1Props(xField1, uno::UNO_QUERY);
- xField1Props->setPropertyValue("Content", uno::makeAny(OUString("New Core
Property Value")));
+ xField1Props->setPropertyValue("Content", uno::Any(OUString("New Core
Property Value")));
// Third field: content from custom properties
uno::Reference<text::XTextField> xField2(xFields->nextElement(),
uno::UNO_QUERY);
@@ -828,7 +828,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf104823)
// Check field value (it should be value from data source) and set new
CPPUNIT_ASSERT_EQUAL(OUString("True Custom XML Value"),
xField2->getPresentation(false));
uno::Reference<beans::XPropertySet> xField2Props(xField2, uno::UNO_QUERY);
- xField2Props->setPropertyValue("Content", uno::makeAny(OUString("New
Custom XML Value")));
+ xField2Props->setPropertyValue("Content", uno::Any(OUString("New Custom
XML Value")));
// Second field: content from extended properties
uno::Reference<text::XTextField> xField3(xFields->nextElement(),
uno::UNO_QUERY);
@@ -836,7 +836,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf104823)
// Check field value (it should be value from data source) and set new
CPPUNIT_ASSERT_EQUAL(OUString("True Extended Property Value"),
xField3->getPresentation(false));
uno::Reference<beans::XPropertySet> xField3Props(xField3, uno::UNO_QUERY);
- xField3Props->setPropertyValue("Content", uno::makeAny(OUString("New
Extended Property Value")));
+ xField3Props->setPropertyValue("Content", uno::Any(OUString("New Extended
Property Value")));
// Save and check saved data
save("Office Open XML Text", maTempFile);
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index 03e53c0e5c81..eac63c3bcf40 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -50,8 +50,7 @@
/* Create & apply new URL */
\
OUString sOriginalFileInTempDir = sTempDir + sFileName;
\
uno::Reference<beans::XPropertySet> xPropertySet(xText,
css::uno::UNO_QUERY); \
- xPropertySet->setPropertyValue("HyperLinkURL",
\
-
css::uno::makeAny(sOriginalFileInTempDir)); \
+ xPropertySet->setPropertyValue("HyperLinkURL",
css::uno::Any(sOriginalFileInTempDir)); \
}
\
\
public:
\
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8473e44270c1..6e22f8b9cb65 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1359,7 +1359,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo87488)
{
uno::Reference<beans::XPropertySet> props(group->getByIndex(1),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(props->getPropertyValue("RotateAngle"),
- uno::makeAny<sal_Int32>(270 * 100));
+ uno::Any(sal_Int32(270 * 100)));
comphelper::SequenceAsHashMap
geom(props->getPropertyValue("CustomShapeGeometry"));
CPPUNIT_ASSERT_EQUAL(sal_Int32(90),
geom["TextPreRotateAngle"].get<sal_Int32>());
}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 692fa45cbe1c..941b112bbdf0 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1020,7 +1020,7 @@ CPPUNIT_TEST_FIXTURE(Test, testHyperlinkWithoutURL)
load(mpTestDocumentPath, "tdf90421.fodt");
// Change the hyperlink, so its URL is empty.
uno::Reference<beans::XPropertySet> xRun(getRun(getParagraph(1), 2),
uno::UNO_QUERY);
- xRun->setPropertyValue("HyperLinkURL", uno::makeAny(OUString()));
+ xRun->setPropertyValue("HyperLinkURL", uno::Any(OUString()));
reload(mpFilter, "gutter-left.rtf");
SvMemoryStream aMemoryStream;
SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 040b75a96b6e..665682c7532c 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -287,15 +287,14 @@ CPPUNIT_TEST_FIXTURE(Test, testNestedHyperlink)
xCursor->gotoStart(/*bExpand=*/false);
xCursor->gotoEnd(/*bExpand=*/true);
uno::Reference<beans::XPropertySet> xCursorProps(xCursor,
uno::UNO_QUERY);
- xCursorProps->setPropertyValue("HyperLinkURL",
uno::makeAny(OUString("http://body.com/";)));
+ xCursorProps->setPropertyValue("HyperLinkURL",
uno::Any(OUString("http://body.com/";)));
uno::Reference<text::XText> xFootnoteText(xFootnote, uno::UNO_QUERY);
xCursor = xFootnoteText->createTextCursor();
xFootnoteText->insertString(xCursor, "x", /*bAbsorb=*/false);
xCursor->gotoStart(/*bExpand=*/false);
xCursor->gotoEnd(/*bExpand=*/true);
xCursorProps.set(xCursor, uno::UNO_QUERY);
- xCursorProps->setPropertyValue("HyperLinkURL",
-
uno::makeAny(OUString("http://footnote.com/";)));
+ xCursorProps->setPropertyValue("HyperLinkURL",
uno::Any(OUString("http://footnote.com/";)));
}
// When exporting to RTF:
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 39bcf7135ddf..b51ce896c21f 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1094,7 +1094,7 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testChicagoNumberingFootnote)
uno::Reference<beans::XPropertySet> xFootnoteSettings
= xFootnotesSupplier->getFootnoteSettings();
sal_uInt16 nNumberingType = style::NumberingType::SYMBOL_CHICAGO;
- xFootnoteSettings->setPropertyValue("NumberingType",
uno::makeAny(nNumberingType));
+ xFootnoteSettings->setPropertyValue("NumberingType",
uno::Any(nNumberingType));
// Insert a footnote.
uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 9e1e71003b4a..9047d0b87f3a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1022,7 +1022,7 @@ CPPUNIT_TEST_FIXTURE(Test, testPasteFirstParaDirectFormat)
// Set some direct formatting on the first paragraph, but leave
paragraph adjust at its
// default (left).
uno::Reference<beans::XPropertySet> xParagraph(getParagraph(1),
uno::UNO_QUERY);
- xParagraph->setPropertyValue("PageNumberOffset",
uno::makeAny(static_cast<sal_Int16>(0)));
+ xParagraph->setPropertyValue("PageNumberOffset",
uno::Any(static_cast<sal_Int16>(0)));
}
// Paste from RTF.
diff --git a/sw/qa/extras/txtexport/txtexport.cxx
b/sw/qa/extras/txtexport/txtexport.cxx
index b9b0e95e2875..99315fe44deb 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -116,7 +116,7 @@ CPPUNIT_TEST_FIXTURE(TxtExportTest, testClearingBreakExport)
xMSF->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xLineBreakProps(xLineBreak,
uno::UNO_QUERY);
auto eClear = static_cast<sal_Int16>(SwLineBreakClear::ALL);
- xLineBreakProps->setPropertyValue("Clear", uno::makeAny(eClear));
+ xLineBreakProps->setPropertyValue("Clear", uno::Any(eClear));
uno::Reference<text::XText> xText = xTextDocument->getText();
uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor();
xText->insertString(xCursor, "foo", /*bAbsorb=*/false);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 104d9a6b213b..3e93508ed057 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1332,8 +1332,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testFdo87448)
SvMemoryStream aStream;
uno::Reference<io::XOutputStream> xOutputStream(new
utl::OStreamWrapper(aStream));
uno::Sequence<beans::PropertyValue> aDescriptor(
comphelper::InitPropertySequence({
- { "OutputStream", uno::makeAny(xOutputStream) },
- { "FilterName", uno::makeAny(OUString("SVM")) }
+ { "OutputStream", uno::Any(xOutputStream) },
+ { "FilterName", uno::Any(OUString("SVM")) }
}));
xGraphicExporter->filter(aDescriptor);
aStream.Seek(STREAM_SEEK_TO_BEGIN);
@@ -1366,7 +1366,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest,
testTextCursorInvalidation)
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
uno::Reference<beans::XPropertySet>
xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPageStyle.is());
- xPageStyle->setPropertyValue("HeaderIsOn", uno::makeAny(true));
+ xPageStyle->setPropertyValue("HeaderIsOn", uno::Any(true));
uno::Reference<text::XText>
xHeader(getProperty<uno::Reference<text::XText>>(xPageStyle, "HeaderText"));
CPPUNIT_ASSERT(xHeader.is());
// create cursor inside the header text
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index f1a841542380..8e844e424578 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1924,8 +1924,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf105413)
pWrtShell->EndPara(/*bSelect=*/false);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 1")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 1")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
@@ -1962,8 +1962,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf76817)
pWrtShell->Down(/*bSelect=*/false);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 1")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 1")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
@@ -1993,8 +1993,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf76817)
CPPUNIT_ASSERT_EQUAL(OUString("3"), getProperty<OUString>(getParagraph(3),
"ListLabelString"));
uno::Sequence<beans::PropertyValue> aPropertyValues2 =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 2")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 2")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues2);
@@ -2045,8 +2045,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf76817_round_trip)
pWrtShell->Down(/*bSelect=*/false);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 1")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 1")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
@@ -2076,8 +2076,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf76817_round_trip)
CPPUNIT_ASSERT_EQUAL(OUString("3"), getProperty<OUString>(getParagraph(3),
"ListLabelString"));
uno::Sequence<beans::PropertyValue> aPropertyValues2 =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 2")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 2")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues2);
@@ -2128,8 +2128,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf76817_custom_outline)
pWrtShell->Down(/*bSelect=*/false);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 1")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 1")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 341237f75aaa..69818b1cff11 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -830,7 +830,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132597)
// Paste special as RTF
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
- { { "SelectedFormat",
uno::makeAny(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
+ { { "SelectedFormat",
uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
@@ -857,7 +857,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139737)
// Paste special as RTF
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
- { { "SelectedFormat",
uno::makeAny(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
+ { { "SelectedFormat",
uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
@@ -901,8 +901,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147206)
// set one to heading so there will be an entry in the tox
pWrtShell->Up(false, 1);
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence({
- { "Style", uno::makeAny(OUString("Heading 1")) },
- { "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+ { "Style", uno::Any(OUString("Heading 1")) },
+ { "FamilyName", uno::Any(OUString("ParagraphStyles")) },
});
dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
@@ -977,7 +977,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf144840)
// Paste special as RTF
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
- { { "SelectedFormat",
uno::makeAny(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
+ { { "SelectedFormat",
uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
@@ -1011,7 +1011,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963)
// Paste special as RTF
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
- { { "SelectedFormat",
uno::makeAny(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
+ { { "SelectedFormat",
uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
Scheduler::ProcessEventsToIdle();
@@ -1036,7 +1036,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132596)
// Paste special as RTF
uno::Sequence<beans::PropertyValue> aPropertyValues =
comphelper::InitPropertySequence(
- { { "SelectedFormat",
uno::makeAny(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
+ { { "SelectedFormat",
uno::Any(static_cast<sal_uInt32>(SotClipboardFormatId::RTF)) } });
... etc. - the rest is truncated
