summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-24 11:22:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-28 10:17:47 +0000
commit198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch)
tree041d55126e9770b81f68fadfaaa69e82313786b3
parentd3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff)
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89 Reviewed-on: https://gerrit.libreoffice.org/34714 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--accessibility/source/extended/textwindowaccessibility.cxx14
-rw-r--r--accessibility/source/standard/vclxaccessibleedit.cxx4
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx6
-rw-r--r--basic/source/uno/namecont.cxx4
-rw-r--r--canvas/source/cairo/cairo_canvasbitmap.cxx4
-rw-r--r--canvas/source/factory/cf_service.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx6
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx4
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx2
-rw-r--r--chart2/source/model/main/Diagram.cxx4
-rw-r--r--comphelper/source/misc/sequenceashashmap.cxx4
-rw-r--r--compilerplugins/clang/test/unoany.cxx27
-rw-r--r--compilerplugins/clang/unoany.cxx74
-rw-r--r--connectivity/source/cpool/ZPoolCollection.cxx5
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx2
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.cxx6
-rw-r--r--connectivity/source/drivers/postgresql/pq_databasemetadata.cxx12
-rw-r--r--connectivity/source/drivers/postgresql/pq_preparedstatement.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_resultset.cxx9
-rw-r--r--connectivity/source/drivers/postgresql/pq_statement.cxx18
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.hxx11
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx2
-rw-r--r--cppuhelper/source/typemanager.cxx2
-rw-r--r--cpputools/source/unoexe/unoexe.cxx2
-rw-r--r--cui/source/customize/cfg.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx10
-rw-r--r--cui/source/options/optinet2.cxx4
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx2
-rw-r--r--desktop/source/app/desktopcontext.cxx2
-rw-r--r--desktop/source/app/opencl.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx8
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx2
-rw-r--r--desktop/source/migration/migration.cxx12
-rw-r--r--editeng/source/items/frmitems.cxx40
-rw-r--r--editeng/source/items/paraitem.cxx2
-rw-r--r--editeng/source/items/textitem.cxx18
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/bibliography/framectr.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx4
-rw-r--r--extensions/source/update/feed/updatefeed.cxx6
-rw-r--r--filter/source/config/cache/filtercache.cxx9
-rw-r--r--filter/source/msfilter/mstoolbar.cxx14
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/errorbroadcaster.cxx4
-rw-r--r--forms/source/component/formcontrolfont.cxx6
-rw-r--r--forms/source/component/navigationbar.cxx4
-rw-r--r--fpicker/source/office/fpsmartcontent.cxx2
-rw-r--r--framework/source/dispatch/loaddispatcher.cxx2
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx2
-rw-r--r--framework/source/layoutmanager/helpers.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx10
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx12
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/tabwin/tabwinfactory.cxx4
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx8
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx48
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx12
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx8
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx36
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx2
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx4
-rw-r--r--framework/source/uielement/statusbarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx6
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx6
-rw-r--r--linguistic/source/gciterator.cxx2
-rw-r--r--oox/source/docprop/docprophandler.cxx4
-rw-r--r--oox/source/drawingml/color.cxx2
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx28
-rw-r--r--oox/source/drawingml/customshapepresetdata.cxx22
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx4
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx2
-rw-r--r--oox/source/drawingml/effectproperties.cxx2
-rw-r--r--oox/source/drawingml/effectpropertiescontext.cxx32
-rw-r--r--oox/source/drawingml/fillproperties.cxx8
-rw-r--r--oox/source/drawingml/misccontexts.cxx2
-rw-r--r--oox/source/drawingml/shape.cxx39
-rw-r--r--oox/source/drawingml/shape3dproperties.cxx52
-rw-r--r--oox/source/drawingml/texteffectscontext.cxx2
-rw-r--r--oox/source/export/drawingml.cxx6
-rw-r--r--oox/source/helper/grabbagstack.cxx2
-rw-r--r--oox/source/ole/oleobjecthelper.cxx4
-rw-r--r--oox/source/ppt/animationspersist.cxx4
-rw-r--r--oox/source/ppt/animvariantcontext.cxx10
-rw-r--r--oox/source/ppt/commonbehaviorcontext.cxx2
-rw-r--r--oox/source/ppt/commontimenodecontext.cxx10
-rw-r--r--oox/source/ppt/conditioncontext.cxx4
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx2
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx26
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx8
-rw-r--r--oox/source/shape/WpsContext.cxx4
-rw-r--r--oox/source/vml/vmlshape.cxx20
-rw-r--r--oox/source/vml/vmltextbox.cxx10
-rw-r--r--pyuno/source/module/pyuno_runtime.cxx4
-rw-r--r--sc/qa/extras/sccellrangeobj.cxx2
-rw-r--r--sc/qa/extras/sccondformats.cxx8
-rw-r--r--sc/source/core/data/dpoutput.cxx6
-rw-r--r--sc/source/core/data/validat.cxx6
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx2
-rw-r--r--sc/source/filter/xml/xmlsorti.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx14
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx8
-rw-r--r--sc/source/ui/unoobj/docuno.cxx2
-rw-r--r--sc/source/ui/unoobj/servuno.cxx8
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx12
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx2
-rw-r--r--sc/source/ui/vba/vbaformat.cxx80
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx6
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx8
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx20
-rw-r--r--sc/source/ui/view/cellsh1.cxx4
-rw-r--r--scripting/source/protocolhandler/scripthandler.cxx2
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx2
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx2
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx4
-rw-r--r--sd/source/filter/sdpptwrp.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx8
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx10
-rw-r--r--sd/source/ui/func/fuhhconv.cxx4
-rw-r--r--sd/source/ui/presenter/PresenterHelper.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx12
-rw-r--r--sd/source/ui/tools/ConfigurationAccess.cxx12
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx2
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx68
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx4
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx12
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx6
-rw-r--r--sfx2/source/control/emojicontrol.cxx4
-rw-r--r--sfx2/source/control/recentdocsviewitem.cxx4
-rw-r--r--sfx2/source/control/unoctitm.cxx8
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx16
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx2
-rw-r--r--sfx2/source/dialog/mailmodel.cxx16
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
-rw-r--r--sfx2/source/doc/doctemplates.cxx26
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx8
-rw-r--r--sfx2/source/inet/inettbc.cxx8
-rw-r--r--sfx2/source/notify/globalevents.cxx2
-rw-r--r--sfx2/source/sidebar/Theme.cxx2
-rw-r--r--sfx2/source/view/viewprn.cxx4
-rw-r--r--sfx2/source/view/viewsh.cxx2
-rw-r--r--shell/source/cmdmail/cmdmailsuppl.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx8
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx6
-rw-r--r--solenv/CompilerTest_compilerplugins_clang.mk13
-rw-r--r--sot/source/sdstor/ucbstorage.cxx2
-rw-r--r--starmath/source/unomodel.cxx2
-rw-r--r--stoc/source/security/access_controller.cxx2
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.cxx8
-rw-r--r--svl/source/items/grabbagitem.cxx2
-rw-r--r--svl/source/items/imageitm.cxx10
-rw-r--r--svl/source/items/slstitm.cxx2
-rw-r--r--svl/source/misc/ownlist.cxx2
-rw-r--r--svtools/source/java/javacontext.cxx2
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx10
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/gallery2/galmisc.cxx2
-rw-r--r--svx/source/items/customshapeitem.cxx2
-rw-r--r--svx/source/items/drawitem.cxx2
-rw-r--r--svx/source/items/pageitem.cxx3
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx2
-rw-r--r--svx/source/tbxctrls/PaletteManager.cxx2
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/layctrl.cxx8
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx10
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/unogallery/unogaltheme.cxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx18
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx6
-rw-r--r--sw/qa/core/uwriter.cxx4
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx2
-rw-r--r--sw/source/core/access/accdoc.cxx6
-rw-r--r--sw/source/core/access/accpara.cxx2
-rw-r--r--sw/source/core/attr/format.cxx2
-rw-r--r--sw/source/core/crsr/bookmrk.cxx2
-rw-r--r--sw/source/core/doc/number.cxx2
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
-rw-r--r--sw/source/core/unocore/unocoll.cxx4
-rw-r--r--sw/source/core/unocore/unodraw.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx8
-rw-r--r--sw/source/core/unocore/unotbl.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx14
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx4
-rw-r--r--sw/source/ui/vba/vbaselection.cxx13
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx4
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/table/chartins.cxx8
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx5
-rw-r--r--ucb/source/core/FileAccess.cxx4
-rw-r--r--ucb/source/core/ucbcmds.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx6
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx10
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx21
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.cxx6
-rw-r--r--unotools/source/config/lingucfg.cxx12
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx4
-rw-r--r--vbahelper/source/msforms/vbalistbox.cxx2
-rw-r--r--vbahelper/source/msforms/vbalistcontrolhelper.cxx2
-rw-r--r--vbahelper/source/msforms/vbauserform.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbashape.cxx4
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/filter/FilterConfigCache.cxx2
-rw-r--r--vcl/source/filter/FilterConfigItem.cxx6
-rw-r--r--vcl/source/gdi/oldprintadaptor.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx42
-rw-r--r--vcl/source/uitest/uno/uiobject_uno.cxx2
-rw-r--r--vcl/source/window/mouse.cxx8
-rw-r--r--vcl/source/window/window.cxx10
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx26
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/CellMarginHandler.cxx14
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx10
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx32
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx14
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx20
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/MeasureHandler.cxx12
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx2
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx28
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/TablePropertiesHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.cxx4
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx16
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx12
-rw-r--r--writerfilter/source/rtftok/rtfdispatchvalue.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx10
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx2
-rw-r--r--xmlhelp/source/treeview/tvread.cxx2
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx2
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx2
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx6
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx6
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx2
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx8
-rw-r--r--xmlsecurity/qa/unit/signing/signing.cxx4
-rw-r--r--xmlsecurity/source/helper/xsecctl.cxx2
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx10
-rw-r--r--xmlsecurity/source/helper/xsecverify.cxx10
285 files changed, 1122 insertions, 1049 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 198fd2a84fef..0a61a1a84991 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -951,21 +951,21 @@ Document::retrieveCharacterAttributes(
//character font name
aAttribs[i].Name = "CharFontName";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( aFont.GetFamilyName() );
+ aAttribs[i].Value <<= aFont.GetFamilyName();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
//character height
aAttribs[i].Name = "CharHeight";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetFontHeight() );
+ aAttribs[i].Value <<= (sal_Int16)aFont.GetFontHeight();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
//character posture
aAttribs[i].Name = "CharPosture";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetItalic() );
+ aAttribs[i].Value <<= (sal_Int16)aFont.GetItalic();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
@@ -981,28 +981,28 @@ Document::retrieveCharacterAttributes(
//character strikeout
aAttribs[i].Name = "CharStrikeout";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetStrikeout() );
+ aAttribs[i].Value <<= (sal_Int16)aFont.GetStrikeout();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
//character underline
aAttribs[i].Name = "CharUnderline";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetUnderline() );
+ aAttribs[i].Value <<= (sal_Int16)aFont.GetUnderline();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
//character weight
aAttribs[i].Name = "CharWeight";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (float)aFont.GetWeight() );
+ aAttribs[i].Value <<= (float)aFont.GetWeight();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
//character alignment
aAttribs[i].Name = "ParaAdjust";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::Any( (sal_Int16)m_rEngine.GetTextAlign() );
+ aAttribs[i].Value <<= (sal_Int16)m_rEngine.GetTextAlign();
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 363b03dda67d..dce74975018e 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -325,7 +325,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32
{
if (aValue.Name == "CharColor")
{
- aValue.Value = css::uno::Any(static_cast< sal_Int32 >(COLORDATA_RGB(pFontColor->GetColor().GetColor())));
+ aValue.Value <<= static_cast< sal_Int32 >(COLORDATA_RGB(pFontColor->GetColor().GetColor()));
break;
}
}
@@ -342,7 +342,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32
OutputDevice* pDev = Application::GetDefaultDevice();
if ( pDev )
{
- aValue.Value = css::uno::Any(static_cast< sal_Int32 >(pDev->GetSettings().GetStyleSettings().GetFieldTextColor().GetColor()));
+ aValue.Value <<= static_cast< sal_Int32 >(pDev->GetSettings().GetStyleSettings().GetFieldTextColor().GetColor());
}
}
break;
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9e92dddf3d64..584c2b20ad8d 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -465,9 +465,9 @@ void MediaWindowImpl::onURLChanged()
const Point aPoint;
const Size aSize(mpChildWindow->GetSizePixel());
- aArgs[0] = uno::Any(mpChildWindow->GetParentWindowHandle());
- aArgs[1] = uno::Any(awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height()));
- aArgs[2] = uno::Any(reinterpret_cast<sal_IntPtr>(mpChildWindow.get()));
+ aArgs[0] <<= mpChildWindow->GetParentWindowHandle();
+ aArgs[1] <<= awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height());
+ aArgs[2] <<= reinterpret_cast<sal_IntPtr>(mpChildWindow.get());
try
{
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 221c2d30fcd4..15d27b713cb2 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2993,14 +2993,14 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
{
Any aRet;
- aRet = Any(
+ aRet =
::cppu::queryInterface(
rType,
static_cast< XContainer * >( this ),
static_cast< XNameContainer * >( this ),
static_cast< XNameAccess * >( this ),
static_cast< XElementAccess * >( this ),
- static_cast< XChangesNotifier * >( this ) ) );
+ static_cast< XChangesNotifier * >( this ) );
if( !aRet.hasValue() )
{
aRet = OComponentHelper::queryInterface( rType );
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 932dd33ed692..d3cdef800e9f 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -114,7 +114,7 @@ namespace cairocanvas
{
case 0:
{
- aRV = uno::Any( reinterpret_cast<sal_Int64>( nullptr ) );
+ aRV <<= reinterpret_cast<sal_Int64>( nullptr );
if ( !mbHasAlpha )
break;
@@ -188,7 +188,7 @@ namespace cairocanvas
cairo_destroy( pCairo );
cairo_surface_destroy( pPixels );
- aRV = uno::Any( reinterpret_cast<sal_Int64>( pBitmapEx ) );
+ aRV <<= reinterpret_cast<sal_Int64>( pBitmapEx );
break;
}
case 1:
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 28b6df740b1a..e0fc9e9448f5 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -141,11 +141,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
Sequence<Any>( &propValue, 1 ) ),
UNO_QUERY_THROW );
- propValue = Any(
+ propValue <<=
beans::PropertyValue(
"nodepath", -1,
Any( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
- beans::PropertyState_DIRECT_VALUE ) );
+ beans::PropertyState_DIRECT_VALUE );
Reference<container::XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 4eac71ec5864..371249471359 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -433,7 +433,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
{
m_aOuterValue = rOuterValue;
- aNewValue = uno::Any(drawing::LineStyle_NONE);
+ aNewValue <<= drawing::LineStyle_NONE;
}
WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet );
}
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 1d67914e2431..96f4f01360fa 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1526,7 +1526,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
}
}
if(bHasDetectableInnerValue)
- rInnerValue = uno::Any(nNumberOfLines);
+ rInnerValue <<= nNumberOfLines;
return bHasDetectableInnerValue;
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 36878f863fc3..9b20ac825035 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -79,7 +79,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend;
if(!bShowLegend)
{
- aRet = uno::Any( css::chart::ChartLegendPosition_NONE );
+ aRet <<= css::chart::ChartLegendPosition_NONE;
}
else
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 63f8860f1f72..6884f4e8e7c5 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -404,7 +404,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
{
sal_Int32 nIntervalCount = 0;
rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount;
- aRet = uno::Any( double(nIntervalCount) );
+ aRet <<= double(nIntervalCount);
bNeedToCalculateExplicitValues = false;
}
}
@@ -442,7 +442,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( rSubIncrements.getLength() > 0 )
{
sal_Int32 nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
- aRet = uno::Any( double(nIntervalCount) );
+ aRet <<= double(nIntervalCount);
}
}
else
@@ -476,7 +476,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( !aExplicitIncrement.SubIncrements.empty() )
nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
}
- aRet = uno::Any( nIntervalCount );
+ aRet <<= nIntervalCount;
break;
}
case SCALE_PROP_AUTO_MAX:
@@ -531,13 +531,13 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( !aScaleData.AutoDateAxis )
nType = css::chart::ChartAxisType::CATEGORY;
}
- aRet = uno::Any( nType );
+ aRet <<= nType;
break;
}
case SCALE_PROP_DATE_INCREMENT:
{
if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
- aRet = uno::Any( aScaleData.TimeIncrement );
+ aRet <<= aScaleData.TimeIncrement;
break;
}
case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
@@ -548,15 +548,15 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( aExplicitScale.AxisType == AxisType::DATE )
{
TimeIncrement aTimeIncrement;
- aTimeIncrement.MajorTimeInterval = uno::Any( aExplicitIncrement.MajorTimeInterval );
- aTimeIncrement.MinorTimeInterval = uno::Any( aExplicitIncrement.MinorTimeInterval );
- aTimeIncrement.TimeResolution = uno::Any( aExplicitScale.TimeResolution );
- aRet = uno::Any(aTimeIncrement);
+ aTimeIncrement.MajorTimeInterval <<= aExplicitIncrement.MajorTimeInterval;
+ aTimeIncrement.MinorTimeInterval <<= aExplicitIncrement.MinorTimeInterval;
+ aTimeIncrement.TimeResolution <<= aExplicitScale.TimeResolution;
+ aRet <<= aTimeIncrement;
}
}
if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
- aRet = uno::Any( aScaleData.TimeIncrement );
+ aRet <<= aScaleData.TimeIncrement;
break;
}
case SCALE_PROP_LOGARITHMIC:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 72d2ca86dd45..16070e58d628 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -240,7 +240,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::Any( aNewValue );
+ m_aOuterValue <<= aNewValue;
if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "NegativeError", m_aOuterValue );
@@ -290,7 +290,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::Any( aNewValue );
+ m_aOuterValue <<= aNewValue;
if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -473,7 +473,7 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::Any( aNewValue );
+ m_aOuterValue <<= aNewValue;
if( css::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -523,7 +523,7 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::Any( aNewValue );
+ m_aOuterValue <<= aNewValue;
if( css::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 31b458abea71..f8bbbffda161 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -248,14 +248,14 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper
{
if(bHasAmbiguousValue)
{
- m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
+ m_aOuterValue <<= css::chart::ChartSymbolType::AUTO;
}
else
{
if( css::chart::ChartSymbolType::NONE == aValue )
- m_aOuterValue = uno::Any( css::chart::ChartSymbolType::NONE );
+ m_aOuterValue <<= css::chart::ChartSymbolType::NONE;
else
- m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
+ m_aOuterValue <<= css::chart::ChartSymbolType::AUTO;
}
}
return m_aOuterValue;
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 909760b3e932..a41830d2063f 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -313,7 +313,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
{
Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Point aPoint(aRect.Left(),aRect.Top());
- aRet = uno::Any( aPoint );
+ aRet <<= aPoint;
}
}
else if( rPropertyName == "Size" )
@@ -326,12 +326,12 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
{
Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Size aSize(aRect.GetWidth(),aRect.GetHeight());
- aRet = uno::Any( aSize );
+ aRet <<= aSize;
}
}
else if( rPropertyName == "UnlockControllersOnExecute" )
{
- aRet = uno::Any( m_bUnlockControllersOnExecute );
+ aRet <<= m_bUnlockControllersOnExecute;
}
else
throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , nullptr );
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index e22dc881dd61..1bbb029ef294 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -809,7 +809,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( xCrossingMainAxis.is() )
{
ScaleData aCrossingScale( xCrossingMainAxis->getScaleData() );
- aCrossingScale.Origin = uno::Any(fValue);
+ aCrossingScale.Origin <<= fValue;
xCrossingMainAxis->setScaleData(aCrossingScale);
}
}
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 40e42a608ca2..cda6691c67a6 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -106,7 +106,7 @@ bool numberFormatFromItemToPropertySet(
sal_Int32 nFmt = static_cast<sal_Int32>(
static_cast<const SfxUInt32Item&>(
rItemSet.Get(nWhichId)).GetValue());
- aValue = uno::Any(nFmt);
+ aValue <<= nFmt;
}
else
return bChanged;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 5aa588971400..f32e0c25fab1 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1601,12 +1601,12 @@ uno::Any SAL_CALL ChartController::getSelection()
OUString aCID( m_aSelection.getSelectedCID() );
if ( !aCID.isEmpty() )
{
- aReturn = uno::Any( aCID );
+ aReturn <<= aCID;
}
else
{
// #i12587# support for shapes in chart
- aReturn = uno::Any( m_aSelection.getSelectedAdditionalShape() );
+ aReturn <<= m_aSelection.getSelectedAdditionalShape();
}
}
return aReturn;
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index fcff9a60aad1..38694dcdf0e2 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -149,7 +149,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
m_aOrigin.realloc( m_nDimensionCount );
for( sal_Int32 i = 0; i < m_nDimensionCount; ++i )
- m_aOrigin[ i ] = uno::Any( double( 0.0 ) );
+ m_aOrigin[ i ] <<= double( 0.0 );
setFastPropertyValue_NoBroadcast( PROP_COORDINATESYSTEM_SWAPXANDYAXIS, uno::Any( false ));
}
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 06ce4ac9cab6..b55c8e690017 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -680,7 +680,7 @@ void SAL_CALL Diagram::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) co
{
sal_Int32 nPerspective = ::basegfx::fround( ThreeDHelper::CameraDistanceToPerspective(
ThreeDHelper::getCameraDistance( const_cast< Diagram* >( this ) ) ) );
- rValue = uno::Any(nPerspective);
+ rValue <<= nPerspective;
}
else if( PROP_DIAGRAM_ROTATION_HORIZONTAL == nHandle
|| PROP_DIAGRAM_ROTATION_VERTICAL == nHandle )
@@ -692,7 +692,7 @@ void SAL_CALL Diagram::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) co
nAngleDegree = nHorizontal;
else
nAngleDegree = nVertical;
- rValue = uno::Any(nAngleDegree);
+ rValue <<= nAngleDegree;
}
else
::property::OPropertySet::getFastPropertyValue( rValue,nHandle );
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index b1d70c675fb7..9c51ad19bf69 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -183,9 +183,9 @@ const css::uno::Any SequenceAsHashMap::getAsConstAny(bool bAsPropertyValueList)
{
css::uno::Any aDestination;
if (bAsPropertyValueList)
- aDestination = css::uno::Any(getAsConstPropertyValueList());
+ aDestination <<= getAsConstPropertyValueList();
else
- aDestination = css::uno::Any(getAsConstNamedValueList());
+ aDestination <<= getAsConstNamedValueList();
return aDestination;
}
diff --git a/compilerplugins/clang/test/unoany.cxx b/compilerplugins/clang/test/unoany.cxx
new file mode 100644
index 000000000000..8c7ba7e90179
--- /dev/null
+++ b/compilerplugins/clang/test/unoany.cxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+
+css::uno::Any getAny() { return css::uno::Any(true); }
+
+int main()
+{
+ css::uno::Any a;
+ css::uno::Any b;
+ a = b;
+ a = getAny();
+ a = css::uno::makeAny(true); // expected-error {{unnecessary copy, rather use <<= operator [loplugin:unoany]}}
+ a = css::uno::Any(true); // expected-error {{unnecessary copy, rather use <<= operator [loplugin:unoany]}}
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unoany.cxx b/compilerplugins/clang/unoany.cxx
new file mode 100644
index 000000000000..6fdf3b45d94f
--- /dev/null
+++ b/compilerplugins/clang/unoany.cxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "check.hxx"
+#include "plugin.hxx"
+
+
+class UnoAny:
+ public RecursiveASTVisitor<UnoAny>, public loplugin::Plugin
+{
+public:
+ explicit UnoAny(InstantiationData const & data): Plugin(data) {}
+
+ void run() override {
+ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+ }
+ bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr);
+};
+
+bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const * expr)
+{
+ if (ignoreLocation(expr)) {
+ return true;
+ }
+ StringRef aFileName = compiler.getSourceManager().getFilename(compiler.getSourceManager().getSpellingLoc(expr->getLocStart()));
+ if (aFileName == SRCDIR "/include/com/sun/star/uno/Any.hxx") {
+ return true;
+ }
+ if (expr->getOperator() != OO_Equal) {
+ return true;
+ }
+ if (!loplugin::TypeCheck(expr->getArg(0)->getType()).Class("Any").
+ Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace())
+ {
+ return true;
+ }
+ if (auto expr2 = dyn_cast<MaterializeTemporaryExpr>(expr->getArg(1))) {
+ if (auto expr3 = dyn_cast<CXXBindTemporaryExpr>(expr2->GetTemporaryExpr())) {
+ if (auto expr4 = dyn_cast<CallExpr>(expr3->getSubExpr())) {
+ if (loplugin::DeclCheck(expr4->getDirectCallee()).Function("makeAny").
+ Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace()) {
+ report(
+ DiagnosticsEngine::Warning,
+ "unnecessary copy, rather use <<= operator",
+ expr->getOperatorLoc())
+ << expr->getSourceRange();
+ return true;
+ }
+ }
+ }
+ if (isa<CXXFunctionalCastExpr>(expr2->GetTemporaryExpr())) {
+ //expr->getArg(1)->dump();
+ report(
+ DiagnosticsEngine::Warning,
+ "unnecessary copy, rather use <<= operator",
+ expr->getOperatorLoc())
+ << expr->getSourceRange();
+ return true;
+ }
+ }
+ //expr->getArg(1)->dump();
+ return true;
+}
+
+loplugin::Plugin::Registration<UnoAny> X("unoany");
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 1f30e6ba419c..22ac35d02d9f 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -319,10 +319,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
{
OSL_ASSERT(_rxConfProvider.is());
Sequence< Any > args(1);
- args[0] = makeAny(
- NamedValue(
- "nodepath",
- makeAny(_rPath)));
+ args[0] <<= NamedValue( "nodepath", makeAny(_rPath));
Reference< XInterface > xInterface(
_rxConfProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 5dffd4141b76..167ff3ccf3db 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2347,7 +2347,7 @@ namespace
Sequence< PropertyValue > aProps( 1 );
aProps[0].Name = "Title";
aProps[0].Handle = -1; // n/a
- aProps[0].Value = makeAny( sNewName );
+ aProps[0].Value <<= sNewName;
Sequence< Any > aValues;
aContent.executeCommand( "setPropertyValues",makeAny(aProps) ) >>= aValues;
if(aValues.getLength() && aValues[0].hasValue())
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 8878a6a60b58..f7e2b978114a 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1483,7 +1483,7 @@ void OResultSet::getFastPropertyValue(
switch(nHandle)
{
case PROPERTY_ID_ISBOOKMARKABLE:
- rValue = css::uno::makeAny(isBookmarkable());
+ rValue <<= isBookmarkable();
break;
case PROPERTY_ID_CURSORNAME:
rValue <<= getCursorName();
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index d3df89ab25df..3d96f771e346 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -568,7 +568,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
{
OUString val;
bRet = ( rValue >>= val );
- m_props[nHandle] = makeAny( val );
+ m_props[nHandle] <<= val;
break;
}
case BASERESULTSET_ESCAPE_PROCESSING:
@@ -576,7 +576,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
{
bool val(false);
bRet = ( rValue >>= val );
- m_props[nHandle] = makeAny( val );
+ m_props[nHandle] <<= val;
break;
}
case BASERESULTSET_FETCH_DIRECTION:
@@ -586,7 +586,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
{
sal_Int32 val;
bRet = ( rValue >>= val );
- m_props[nHandle] = makeAny( val );
+ m_props[nHandle] <<= val;
break;
}
default:
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index db26ab3abb9f..43693302452d 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -2471,14 +2471,14 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo(
if( findIt != columns.end() && ( ! isNonUnique || ! unique ) )
{
std::vector< Any > result( 13 );
- result[R_TABLE_SCHEM] = makeAny(currentSchema);
- result[R_TABLE_NAME] = makeAny(currentTable);
- result[R_INDEX_NAME] = makeAny(currentIndexName);
+ result[R_TABLE_SCHEM] <<= currentSchema;
+ result[R_TABLE_NAME] <<= currentTable;
+ result[R_INDEX_NAME] <<= currentIndexName;
result[R_NON_UNIQUE] <<= isNonUnique;
- result[R_TYPE] = makeAny( indexType );
- result[R_COLUMN_NAME] = makeAny( rowColumn->getString(2) );
+ result[R_TYPE] <<= indexType;
+ result[R_COLUMN_NAME] <<= rowColumn->getString(2);
sal_Int32 nPos = (sal_Int32)(findIt - columns.begin() +1); // MSVC++ nonsense
- result[R_ORDINAL_POSITION] = makeAny( nPos );
+ result[R_ORDINAL_POSITION] <<= nPos;
vec.push_back( result );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index f9d74ae3aa74..8bcc770d7927 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -172,12 +172,12 @@ PreparedStatement::PreparedStatement(
, m_multipleResultUpdateCount(0)
, m_lastOidInserted( InvalidOid )
{
- m_props[PREPARED_STATEMENT_QUERY_TIME_OUT] = makeAny( (sal_Int32)0 );
- m_props[PREPARED_STATEMENT_MAX_ROWS] = makeAny( (sal_Int32)0 );
- m_props[PREPARED_STATEMENT_RESULT_SET_CONCURRENCY] = makeAny(
- css::sdbc::ResultSetConcurrency::READ_ONLY );
- m_props[PREPARED_STATEMENT_RESULT_SET_TYPE] = makeAny(
- css::sdbc::ResultSetType::SCROLL_INSENSITIVE );
+ m_props[PREPARED_STATEMENT_QUERY_TIME_OUT] <<= (sal_Int32)0;
+ m_props[PREPARED_STATEMENT_MAX_ROWS] <<= (sal_Int32)0;
+ m_props[PREPARED_STATEMENT_RESULT_SET_CONCURRENCY] <<=
+ css::sdbc::ResultSetConcurrency::READ_ONLY;
+ m_props[PREPARED_STATEMENT_RESULT_SET_TYPE] <<=
+ css::sdbc::ResultSetType::SCROLL_INSENSITIVE;
splitSQL( m_stmt, m_splittedStatement );
int elements = 0;
@@ -703,14 +703,14 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
{
OUString val;
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
case PREPARED_STATEMENT_ESCAPE_PROCESSING:
{
bool val(false);
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
case PREPARED_STATEMENT_FETCH_DIRECTION:
@@ -723,7 +723,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
{
sal_Int32 val;
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
default:
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx
index dafe25bd04f7..51b7989c613b 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx
@@ -94,16 +94,13 @@ ResultSet::ResultSet( const ::rtl::Reference< RefCountedMutex > & refMutex,
// Positioned update/delete not supported, so no cursor name
// Fetch direction and size are cursor-specific things, so not used now.
// Fetch size not set
- m_props[ BASERESULTSET_FETCH_DIRECTION ] = makeAny(
- css::sdbc::FetchDirection::UNKNOWN);
+ m_props[ BASERESULTSET_FETCH_DIRECTION ] <<= css::sdbc::FetchDirection::UNKNOWN;
// No escape processing for now
m_props[ BASERESULTSET_ESCAPE_PROCESSING ] <<= false;
// Bookmarks not implemented for now
m_props[ BASERESULTSET_IS_BOOKMARKABLE ] <<= false;
- m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = makeAny(
- css::sdbc::ResultSetConcurrency::READ_ONLY );
- m_props[ BASERESULTSET_RESULT_SET_TYPE ] = makeAny(
- css::sdbc::ResultSetType::SCROLL_INSENSITIVE );
+ m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] <<= css::sdbc::ResultSetConcurrency::READ_ONLY;
+ m_props[ BASERESULTSET_RESULT_SET_TYPE ] <<= css::sdbc::ResultSetType::SCROLL_INSENSITIVE;
}
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 4dc51f926029..d4351d333ff4 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -164,12 +164,12 @@ Statement::Statement( const ::rtl::Reference< RefCountedMutex > & refMutex,
, m_multipleResultUpdateCount(0)
, m_lastOidInserted(InvalidOid)
{
- m_props[STATEMENT_QUERY_TIME_OUT] = makeAny( (sal_Int32)0 );
- m_props[STATEMENT_MAX_ROWS] = makeAny( (sal_Int32)0 );
- m_props[STATEMENT_RESULT_SET_CONCURRENCY] = makeAny(
- css::sdbc::ResultSetConcurrency::READ_ONLY );
- m_props[STATEMENT_RESULT_SET_TYPE] = makeAny(
- css::sdbc::ResultSetType::SCROLL_INSENSITIVE );
+ m_props[STATEMENT_QUERY_TIME_OUT] <<= (sal_Int32)0;
+ m_props[STATEMENT_MAX_ROWS] <<= (sal_Int32)0;
+ m_props[STATEMENT_RESULT_SET_CONCURRENCY] <<=
+ css::sdbc::ResultSetConcurrency::READ_ONLY;
+ m_props[STATEMENT_RESULT_SET_TYPE] <<=
+ css::sdbc::ResultSetType::SCROLL_INSENSITIVE;
}
Statement::~Statement()
@@ -891,14 +891,14 @@ sal_Bool Statement::convertFastPropertyValue(
{
OUString val;
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
case STATEMENT_ESCAPE_PROCESSING:
{
bool val(false);
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
case STATEMENT_FETCH_DIRECTION:
@@ -911,7 +911,7 @@ sal_Bool Statement::convertFastPropertyValue(
{
sal_Int32 val;
bRet = ( rValue >>= val );
- rConvertedValue = makeAny( val );
+ rConvertedValue <<= val;
break;
}
default:
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index c6f0b9a4e4b6..12c525f68f01 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -113,8 +113,8 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe
{
char * val = PQgetvalue( result, row, col );
- aRow[col] = makeAny(
- OUString( val, strlen( val ), ConnectionSettings::encoding ) );
+ aRow[col] <<=
+ OUString( val, strlen( val ), ConnectionSettings::encoding );
}
}
data[row] = aRow;
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index 2d0e55823f6f..9c21521d81cd 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -97,16 +97,15 @@ protected:
// Positioned update/delete not supported, so no cursor name
// Fetch direction and size are cursor-specific things, so not used now.
// Fetch size not set
- m_props[ BASERESULTSET_FETCH_DIRECTION ] = css::uno::makeAny(
- css::sdbc::FetchDirection::UNKNOWN);
+ m_props[ BASERESULTSET_FETCH_DIRECTION ] <<= css::sdbc::FetchDirection::UNKNOWN;
// No escape processing for now
m_props[ BASERESULTSET_ESCAPE_PROCESSING ] <<= false;
// Bookmarks not implemented for now
m_props[ BASERESULTSET_IS_BOOKMARKABLE ] <<= false;
- m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = css::uno::makeAny(
- css::sdbc::ResultSetConcurrency::UPDATABLE );
- m_props[ BASERESULTSET_RESULT_SET_TYPE ] = css::uno::makeAny(
- css::sdbc::ResultSetType::SCROLL_INSENSITIVE );
+ m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] <<=
+ css::sdbc::ResultSetConcurrency::UPDATABLE;
+ m_props[ BASERESULTSET_RESULT_SET_TYPE ] <<=
+ css::sdbc::ResultSetType::SCROLL_INSENSITIVE;
}
OUString buildWhereClause();
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 16759606fc86..638bf731d346 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -141,7 +141,7 @@ void IndexColumns::refresh()
pIndexColumn->setPropertyValue_NoBroadcast_public(
st.IS_ASCENDING , makeAny( false ) );
- m_values[ index ] = makeAny( prop );
+ m_values[ index ] <<= prop;
m_name2index[ columnName ] = index;
}
}
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 44bf14eab1b7..ed811f03c44f 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -75,7 +75,7 @@ css::uno::Any resolveTypedefs(css::uno::Any const & type) {
if (!ind.is() || ind->getTypeClass() != css::uno::TypeClass_TYPEDEF) {
return t;
}
- t = css::uno::makeAny(ind->getReferencedType());
+ t <<= ind->getReferencedType();
}
}
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 3320b3bcc4e6..32a2fcb97e41 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -450,7 +450,7 @@ SAL_IMPLEMENT_MAIN()
Any * pInitParams = aInitParams.getArray();
for ( sal_Int32 i = aParams.getLength(); i--; )
{
- pInitParams[i] = Any( p[i] );
+ pInitParams[i] <<= p[i];
}
// instance provider
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 561ba07c7e5a..e2067c3f72c6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3758,7 +3758,7 @@ void ToolbarSaveInData::SetSystemStyle(
{
if ( aProps[ i ].Name == ITEM_DESCRIPTOR_STYLE )
{
- aProps[ i ].Value = uno::Any( nStyle );
+ aProps[ i ].Value <<= nStyle;
break;
}
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1d68fa9c39c9..88ff6ec40669 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -478,10 +478,10 @@ CanvasSettings::CanvasSettings() :
Sequence<Any>( &propValue, 1 ) ),
UNO_QUERY_THROW );
- propValue = Any(
+ propValue <<=
NamedValue(
"nodepath",
- Any( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) ) );
+ Any( OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ) );
Reference<XNameAccess> xNameAccess(
xConfigProvider->createInstanceWithArguments(
@@ -1170,7 +1170,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
Reference< XNameAccess > theNameAccess;
// find out which locales are currently installed and add them to the listbox
- theArgs[0] = Any(NamedValue("nodepath", Any(OUString(sInstalledLocalesPath))));
+ theArgs[0] <<= NamedValue("nodepath", Any(OUString(sInstalledLocalesPath)));
theNameAccess.set(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
seqInstalledLanguages = theNameAccess->getElementNames();
@@ -1189,7 +1189,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
// find out whether the user has a specific locale specified
Sequence< Any > theArgs2(1);
- theArgs2[0] = Any(NamedValue("nodepath", Any(OUString(sUserLocalePath))));
+ theArgs2[0] <<= NamedValue("nodepath", Any(OUString(sUserLocalePath)));
theNameAccess.set(
theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW );
if (theNameAccess->hasByName(sUserLocaleKey))
@@ -1370,7 +1370,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
css::configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext()));
Sequence< Any > theArgs(1);
- theArgs[0] = Any(NamedValue("nodepath", Any(OUString(sUserLocalePath))));
+ theArgs[0] <<= NamedValue("nodepath", Any(OUString(sUserLocalePath)));
Reference< XPropertySet >xProp(
theConfigProvider->createInstanceWithArguments(sAccessUpdSrvc, theArgs ), UNO_QUERY_THROW );
if ( !m_sUserLocaleValue.equals(aLangString))
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9bcf188a448d..81e2698187b7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -201,10 +201,10 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
beans::NamedValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = Any( aConfigRoot );
+ aProperty.Value <<= aConfigRoot;
Sequence< Any > aArgumentList( 1 );
- aArgumentList[0] = Any( aProperty );
+ aArgumentList[0] <<= aProperty;
m_xConfigurationUpdateAccess = xConfigurationProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess",
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index f15c752e6972..fbeaef4f4a5e 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -383,7 +383,7 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
{
Any aBookmark = getBookmark();
if(!aBookmark.hasValue())
- aBookmark = makeAny(_nPosition);
+ aBookmark <<= _nPosition;
connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rRow->get().begin();
connectivity::ORowVector< ORowSetValue >::Vector::iterator aEnd = _rRow->get().end();
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 59b1e886e7fd..88fa1275215f 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -362,14 +362,14 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
if ( aNewValue != m_pImpl->m_aProps.aTitle )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue = makeAny( m_pImpl->m_aProps.aTitle );
+ aEvent.OldValue <<= m_pImpl->m_aProps.aTitle;
try
{
impl_rename_throw( aNewValue ,false);
OSL_ENSURE( m_pImpl->m_aProps.aTitle == aNewValue, "OContentHelper::setPropertyValues('Title'): rename did not work!" );
- aEvent.NewValue = makeAny( aNewValue );
+ aEvent.NewValue <<= aNewValue;
aChanges.getArray()[ nChanged ] = aEvent;
nChanged++;
}
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index dac50054acb4..fc06709657d0 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -57,7 +57,7 @@ bool LimitBoxImpl::EventNotify( NotifyEvent& rNEvt )
bHandled = LimitBox::EventNotify(rNEvt);
uno::Sequence< beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "DBLimit.Value";
- aArgs[0].Value = uno::makeAny( GetValue() );
+ aArgs[0].Value <<= GetValue();
m_pControl->dispatchCommand( aArgs );
break;
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 6d20196910bd..203e12adac2f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -505,7 +505,7 @@ FeatureState OQueryController::GetState(sal_uInt16 _nId) const
case SID_QUERY_LIMIT:
aReturn.bEnabled = m_bGraphicalDesign;
if( aReturn.bEnabled )
- aReturn.aValue = makeAny( m_nLimit );
+ aReturn.aValue <<= m_nLimit;
break;
case SID_QUERY_PROP_DLG:
aReturn.bEnabled = m_bGraphicalDesign;
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 2f2e1d4c4af4..6e91d8622eaf 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -43,7 +43,7 @@ Any SAL_CALL DesktopContext::getValueByName( const OUString& Name)
if ( Name == JAVA_INTERACTION_HANDLER_NAME )
{
#if HAVE_FEATURE_JAVA
- retVal = makeAny( Reference< XInteractionHandler >( new svt::JavaInteractionHandler()) );
+ retVal <<= Reference< XInteractionHandler >( new svt::JavaInteractionHandler());
#endif
}
else if( m_xNextContext.is() )
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index d4ddee4a2683..55a2dceef234 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -58,7 +58,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r
css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
aArgs[0].Name = "Hidden";
- aArgs[0].Value = makeAny(true);
+ aArgs[0].Value <<= true;
xComponent.set(xLoader->loadComponentFromURL(rURL, "_blank", 0, aArgs));
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index fc3a079b48d5..6e2c62621d41 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -820,10 +820,10 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly,
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
+ aProperty.Value <<= OUString("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob");
uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameAccess > xNameAccess(
xConfigProvider->createInstanceWithArguments(
@@ -847,10 +847,10 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly,
{
uno::Sequence< beans::PropertyValue > aPropList(2);
aProperty.Name = "updateList";
- aProperty.Value = uno::makeAny( rItemList );
+ aProperty.Value <<= rItemList;
aPropList[0] = aProperty;
aProperty.Name = "prepareOnly";
- aProperty.Value = uno::makeAny( bPrepareOnly );
+ aProperty.Value <<= bPrepareOnly;
aPropList[1] = aProperty;
xDispatch->dispatch(aURL, aPropList );
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 405e4d4ec4a6..f20da27e0d5a 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -75,7 +75,7 @@ getUpdateInformation( Reference<deployment::XUpdateInformationProvider > const &
out_error = e.Reason;
} catch (const ucb::CommandAbortedException &) {
} catch (const uno::Exception & e) {
- out_error = uno::makeAny(e);
+ out_error <<= e;
}
return
Sequence<Reference< xml::dom::XElement > >();
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 9061aeab34c8..570ff2244444 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -862,10 +862,10 @@ void MigrationImpl::runServices()
{
// Build argument array
uno::Sequence< uno::Any > seqArguments(3);
- seqArguments[0] = uno::makeAny(NamedValue("Productname",
- uno::makeAny(m_aInfo.productname)));
- seqArguments[1] = uno::makeAny(NamedValue("UserData",
- uno::makeAny(m_aInfo.userdata)));
+ seqArguments[0] <<= NamedValue("Productname",
+ uno::makeAny(m_aInfo.productname));
+ seqArguments[1] <<= NamedValue("UserData",
+ uno::makeAny(m_aInfo.userdata));
// create an instance of every migration service
@@ -884,8 +884,8 @@ void MigrationImpl::runServices()
if ( nSize > 0 )
seqExtBlackList = comphelper::arrayToSequence< OUString >(
&i_mig->excludeExtensions[0], nSize );
- seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList",
- uno::makeAny( seqExtBlackList )));
+ seqArguments[2] <<= NamedValue("ExtensionBlackList",
+ uno::makeAny( seqExtBlackList ));
xMigrationJob.set(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(i_mig->service, seqArguments, xContext),
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f8b6695e5a10..3fd113b75e91 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -471,7 +471,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_FIRST_AUTO:
- rVal = css::uno::makeAny<bool>(IsAutoFirst());
+ rVal <<= (bool) IsAutoFirst();
break;
default:
@@ -1200,7 +1200,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
return false;
}
- rVal = css::uno::makeAny<bool>( bValue );
+ rVal <<= (bool) bValue;
return true;
}
@@ -1696,16 +1696,16 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// 4 Borders and 5 distances
uno::Sequence< uno::Any > aSeq( 9 );
- aSeq[0] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetLeft(), bConvert) );
- aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) );
- aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) );
- aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) );
- aSeq[4] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()));
- aSeq[5] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ));
- aSeq[6] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ));
- aSeq[7] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ));
- aSeq[8] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ));
- rVal = uno::makeAny( aSeq );
+ aSeq[0] <<= SvxBoxItem::SvxLineToLine(GetLeft(), bConvert);
+ aSeq[1] <<= SvxBoxItem::SvxLineToLine(GetRight(), bConvert);
+ aSeq[2] <<= SvxBoxItem::SvxLineToLine(GetBottom(), bConvert);
+ aSeq[3] <<= SvxBoxItem::SvxLineToLine(GetTop(), bConvert);
+ aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance());
+ aSeq[5] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist );
+ aSeq[6] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist );
+ aSeq[7] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist );
+ aSeq[8] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist );
+ rVal <<= aSeq;
return true;
}
case MID_LEFT_BORDER:
@@ -2703,18 +2703,18 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// 2 BorderLines, flags, valid flags and distance
css::uno::Sequence< css::uno::Any > aSeq( 5 );
- aSeq[0] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) );
- aSeq[1] = css::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) );
+ aSeq[0] <<= SvxBoxItem::SvxLineToLine( pHori, bConvert);
+ aSeq[1] <<= SvxBoxItem::SvxLineToLine( pVert, bConvert);
if ( IsTable() )
nVal |= 0x01;
if ( IsDist() )
nVal |= 0x02;
if ( IsMinDist() )
nVal |= 0x04;
- aSeq[2] = css::uno::makeAny( nVal );
- aSeq[3] = css::uno::makeAny( static_cast<sal_Int16>(nValidFlags) );
- aSeq[4] = css::uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()) );
- rVal = css::uno::makeAny( aSeq );
+ aSeq[2] <<= nVal;
+ aSeq[3] <<= static_cast<sal_Int16>(nValidFlags);
+ aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist());
+ rVal <<= aSeq;
return true;
}
@@ -3122,7 +3122,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
nMemId &= ~CONVERT_TWIPS;
if ( nMemId == 0 )
{
- rVal = uno::makeAny( SvxBoxItem::SvxLineToLine(pLine.get(), bConvert) );
+ rVal <<= SvxBoxItem::SvxLineToLine(pLine.get(), bConvert);
return true;
}
else if ( pLine )
@@ -3496,7 +3496,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_GRAPHIC_TRANSPARENT:
- rVal = css::uno::makeAny<bool>( aColor.GetTransparency() == 0xff );
+ rVal <<= ( aColor.GetTransparency() == 0xff );
break;
case MID_GRAPHIC_URL:
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 130dfaaeebfe..8eafaf61324e 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -638,7 +638,7 @@ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) con
switch(nMemberId)
{
case MID_IS_HYPHEN:
- rVal = css::uno::makeAny<bool>(bHyphen);
+ rVal <<= (bool)bHyphen;
break;
case MID_HYPHEN_MIN_LEAD:
rVal <<= (sal_Int16)nMinLead;
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index d9dedb672807..c7c875e1a8ff 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -521,7 +521,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch( nMemberId )
{
case MID_ITALIC:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_POSTURE:
rVal <<= (awt::FontSlant)GetValue(); // values from awt::FontSlant and FontItalic are equal
@@ -660,7 +660,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch( nMemberId )
{
case MID_BOLD :
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_WEIGHT:
{
@@ -1289,7 +1289,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch(nMemberId)
{
case MID_TEXTLINED:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool)GetBoolValue();
break;
case MID_TL_STYLE:
rVal <<= (sal_Int16)(GetValue());
@@ -1298,7 +1298,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int32)( mColor.GetColor() );
break;
case MID_TL_HASCOLOR:
- rVal = css::uno::makeAny<bool>( !mColor.GetTransparency() );
+ rVal <<= (bool) !mColor.GetTransparency();
break;
}
return true;
@@ -1490,7 +1490,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
switch(nMemberId)
{
case MID_CROSSED_OUT:
- rVal = css::uno::makeAny<bool>(GetBoolValue());
+ rVal <<= (bool) GetBoolValue();
break;
case MID_CROSS_OUT:
rVal <<= (sal_Int16)(GetValue());
@@ -1792,7 +1792,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) c
{
case MID_GRAPHIC_TRANSPARENT:
{
- rVal = css::uno::makeAny<bool>(aColor.GetTransparency() == 0xff);
+ rVal <<= aColor.GetTransparency() == 0xff;
break;
}
default:
@@ -2302,7 +2302,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
rVal <<= (sal_Int8)(nProp);
break;
case MID_AUTO_ESC:
- rVal = css::uno::makeAny<bool>(DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc);
+ rVal <<= (DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc);
break;
}
return true;
@@ -2779,7 +2779,7 @@ bool SvxTwoLinesItem::QueryValue( css::uno::Any& rVal,
switch( nMemberId )
{
case MID_TWOLINES:
- rVal = css::uno::makeAny<bool>( bOn );
+ rVal <<= (bool) bOn;
break;
case MID_START_BRACKET:
{
@@ -2942,7 +2942,7 @@ bool SvxCharRotateItem::QueryValue( css::uno::Any& rVal,
rVal <<= (sal_Int16)GetValue();
break;
case MID_FITTOLINE:
- rVal = css::uno::makeAny<bool>( IsFitToLine() );
+ rVal <<= (bool) IsFitToLine();
break;
default:
bRet = false;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 07bd926349ec..aaaf92980e76 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1025,7 +1025,7 @@ void BibDataManager::setActiveDataSource(const OUString& rURL)
aEvent.Requery = false;
aEvent.FeatureDescriptor = getActiveDataTable();
- aEvent.State = makeAny( getDataSources() );
+ aEvent.State <<= getDataSources();
if(pToolbar)
{
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 5f78a4254e77..61bbcb7794eb 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -850,7 +850,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
aEvent.FeatureDescriptor=m_xDatMan->getQueryField();
uno::Sequence<OUString> aStringSeq=m_xDatMan->getQueryFields();
- aEvent.State = makeAny( aStringSeq );
+ aEvent.State <<= aStringSeq;
pObj->xListener->statusChanged( aEvent );
bMenuFilter=true;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 3064ce695848..1a343a6b3df3 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2178,10 +2178,10 @@ namespace pcr
case ControlType::FORMATTEDFIELD:
case FormComponentType::CURRENCYFIELD:
case FormComponentType::PATTERNFIELD:
- _rValue = makeAny( true );
+ _rValue <<= true;
break;
default:
- _rValue = makeAny( false );
+ _rValue <<= false;
break;
}
}
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index fe880bef9463..28c092c76a81 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -424,10 +424,10 @@ UpdateInformationProvider::getConfigurationItemAny(uno::Reference<lang::XMultiSe
{
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = uno::makeAny(node);
+ aProperty.Value <<= node;
uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameAccess > xNameAccess(
configurationProvider->createInstanceWithArguments(
@@ -481,7 +481,7 @@ UpdateInformationProvider::load(const OUString& rURL)
ucb::Command aCommand;
aCommand.Name = "open";
- aCommand.Argument = uno::makeAny(aOpenArgument);
+ aCommand.Argument <<= aOpenArgument;
sal_Int32 nCommandId = xCommandProcessor->createCommandIdentifier();
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index d01ec3792713..1065eb1bcb73 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1606,7 +1606,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
// this property set as result only. But the user of this CacheItem
// should know, which value the key names has :-) ITS IMPORTANT!
CacheItem aItem;
- aItem[PROPNAME_NAME] = css::uno::makeAny(sItem);
+ aItem[PROPNAME_NAME] <<= sItem;
switch(eType)
{
case E_TYPE :
@@ -2018,12 +2018,7 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue,
switch(nProp)
{
// Preferred
- case 0: {
- if (sValue.toInt32() == 1)
- rItem[PROPNAME_PREFERRED] = css::uno::makeAny(true);
- else
- rItem[PROPNAME_PREFERRED] = css::uno::makeAny(false);
- }
+ case 0: rItem[PROPNAME_PREFERRED] <<= (sValue.toInt32() == 1);
break;
// MediaType
case 1: rItem[PROPNAME_MEDIATYPE] <<= ::rtl::Uri::decode(sValue, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8);
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 8cb47f675c31..61ff445f40d1 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -137,11 +137,11 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen
{
uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
aPopupMenu[0].Name = "CommandURL";
- aPopupMenu[0].Value = uno::makeAny( "vnd.openoffice.org:" + rName );
+ aPopupMenu[0].Value <<= "vnd.openoffice.org:" + rName;
aPopupMenu[1].Name = "Label";
aPopupMenu[1].Value <<= rName;
aPopupMenu[2].Name = "ItemDescriptorContainer";
- aPopupMenu[2].Value = uno::makeAny( xMenuDesc );
+ aPopupMenu[2].Value <<= xMenuDesc;
aPopupMenu[3].Name = "Type";
aPopupMenu[3].Value <<= sal_Int32( 0 );
@@ -273,7 +273,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
controlGeneralInfo.ImportToolBarControlData( helper, props );
beans::PropertyValue aProp;
aProp.Name = "Visible";
- aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
+ aProp.Value <<= rHeader.isVisible(); // where is the visible attribute stored
props.push_back( aProp );
if ( rHeader.getTct() == 0x01
|| rHeader.getTct() == 0x10 )
@@ -327,7 +327,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
TBCMenuSpecific* pMenu = getMenuSpecific();
if ( pMenu )
- aProp.Value = uno::makeAny( sMenuBar += pMenu->Name() ); // name of popup
+ aProp.Value <<= sMenuBar += pMenu->Name(); // name of popup
nStyle |= ui::ItemStyle::DROP_DOWN;
props.push_back( aProp );
}
@@ -487,15 +487,15 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
}
aProp.Name = "Label";
- aProp.Value = uno::makeAny( customText.getString().replace('&','~') );
+ aProp.Value <<= customText.getString().replace('&','~');
sControlData.push_back( aProp );
aProp.Name = "Type";
- aProp.Value = uno::makeAny( ui::ItemType::DEFAULT );
+ aProp.Value <<= ui::ItemType::DEFAULT;
sControlData.push_back( aProp );
aProp.Name = "Tooltip";
- aProp.Value = uno::makeAny( tooltip.getString() );
+ aProp.Value <<= tooltip.getString();
sControlData.push_back( aProp );
/*
aToolbarItem(0).Name = "CommandURL" wstrOnAction
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index c5923d0ee6c2..40707db7f974 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1854,7 +1854,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
break;
case PROPERTY_ID_NAVIGATION:
- aReturn = makeAny(NavigationBarMode_CURRENT);
+ aReturn <<= NavigationBarMode_CURRENT;
break;
case PROPERTY_ID_CYCLE:
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index f0602891adbf..b73b96c3a0e0 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -62,9 +62,9 @@ namespace frm
{
Any aError;
if ( !_rContextDescription.isEmpty() )
- aError = makeAny( prependErrorInfo( _rException, static_cast< XSQLErrorBroadcaster* >( this ), _rContextDescription ) );
+ aError <<= prependErrorInfo( _rException, static_cast< XSQLErrorBroadcaster* >( this ), _rContextDescription );
else
- aError = makeAny( _rException );
+ aError <<= _rException;
onError( SQLErrorEvent( static_cast< XSQLErrorBroadcaster* >( this ), aError ) );
}
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index cadf6c095a75..30029e9cd893 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -96,7 +96,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_SLANT:
- aValue = makeAny(_rFont.Slant);
+ aValue <<= _rFont.Slant;
break;
case PROPERTY_ID_FONT_UNDERLINE:
@@ -108,7 +108,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_WORDLINEMODE:
- aValue = makeAny( _rFont.WordLineMode );
+ aValue <<= _rFont.WordLineMode;
break;
default:
@@ -238,7 +238,7 @@ namespace frm
break;
case PROPERTY_ID_FONT:
- _rValue = makeAny( m_aFont );
+ _rValue <<= m_aFont;
break;
default:
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 4b617e2646eb..4762f805274c 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -266,12 +266,12 @@ namespace frm
// the maybeboid anys
if ( nNonVoids & PERSIST_TABSTOP )
- m_aTabStop = makeAny( _rxInStream->readBoolean() );
+ m_aTabStop <<= _rxInStream->readBoolean();
else
m_aTabStop.clear();
if ( nNonVoids & PERSIST_BACKGROUND )
- m_aBackgroundColor = makeAny( _rxInStream->readLong() );
+ m_aBackgroundColor <<= _rxInStream->readLong();
else
m_aBackgroundColor.clear();
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index c8777e7e239c..7188e34a7973 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -315,7 +315,7 @@ namespace svt
Sequence< OUString > aNames { "Title" };
Sequence< Any > aValues( 1 );
Any* pValues = aValues.getArray();
- pValues[0] = makeAny( _rTitle );
+ pValues[0] <<= _rTitle;
m_pContent->insertNewContent( sFolderType, aNames, aValues, aCreated );
aCreatedUrl = aCreated.getURL();
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index b04a4caf41cd..1805d4b93f43 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -141,7 +141,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL,
// return the model - like loadComponentFromURL()
css::uno::Any aRet;
if ( xComponent.is () )
- aRet = css::uno::makeAny( xComponent );
+ aRet <<= xComponent;
return aRet;
}
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 18863a28e5aa..2122c3949400 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -381,7 +381,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement(
aStatusbarItemProp[2].Value <<= nOffset;
aStatusbarItemProp[3].Value <<= nItemBits;
aStatusbarItemProp[4].Value <<= nWidth;
- aStatusbarItemProp[5].Value = makeAny( css::ui::ItemType::DEFAULT );
+ aStatusbarItemProp[5].Value <<= css::ui::ItemType::DEFAULT;
m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
}
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 92404ddcb818..a108baaa287f 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -310,7 +310,7 @@ void impl_setDockingWindowVisibility( const css::uno::Reference< css::uno::XComp
css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
aArgs[0].Name = aDockWinArgName;
- aArgs[0].Value = css::uno::makeAny( bVisible );
+ aArgs[0].Value <<= bVisible;
css::uno::Reference< css::frame::XDispatchHelper > xDispatcher = css::frame::DispatchHelper::create( rxContext );
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 425b57879739..1243f2d88205 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -655,12 +655,12 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
Sequence< PropertyValue > aWindowState( 8 );
aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED;
- aWindowState[0].Value = makeAny( !rElementData.m_bFloating );
+ aWindowState[0].Value <<= !rElementData.m_bFloating;
aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE;
- aWindowState[1].Value = makeAny( rElementData.m_bVisible );
+ aWindowState[1].Value <<= rElementData.m_bVisible;
aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA;
- aWindowState[2].Value = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+ aWindowState[2].Value <<= static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea );
aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS;
aWindowState[3].Value <<= rElementData.m_aDockedData.m_aPos;
@@ -671,9 +671,9 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE;
aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME;
- aWindowState[6].Value = makeAny( rElementData.m_aUIName );
+ aWindowState[6].Value <<= rElementData.m_aUIName;
aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED;
- aWindowState[7].Value = makeAny( rElementData.m_aDockedData.m_bLocked );
+ aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked;
if ( xPersistentWindowState->hasByName( aName ))
{
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 4f69df830dcb..98edc791193e 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1593,11 +1593,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
uno::Sequence< beans::PropertyValue > aWindowState( 9 );
aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED;
- aWindowState[0].Value = ::uno::makeAny( !rElementData.m_bFloating );
+ aWindowState[0].Value <<= !rElementData.m_bFloating;
aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE;
- aWindowState[1].Value = uno::makeAny( rElementData.m_bVisible );
+ aWindowState[1].Value <<= rElementData.m_bVisible;
aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA;
- aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+ aWindowState[2].Value <<= static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea );
awt::Point aPos = rElementData.m_aDockedData.m_aPos;
aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS;
@@ -1610,11 +1610,11 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE;
aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME;
- aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
+ aWindowState[6].Value <<= rElementData.m_aUIName;
aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED;
- aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
+ aWindowState[7].Value <<= rElementData.m_aDockedData.m_bLocked;
aWindowState[8].Name = WINDOWSTATE_PROPERTY_STYLE;
- aWindowState[8].Value = uno::makeAny( static_cast<sal_uInt16>(rElementData.m_nStyle) );
+ aWindowState[8].Value <<= static_cast<sal_uInt16>(rElementData.m_nStyle);
OUString aName = rElementData.m_aName;
if ( xPersistentWindowState->hasByName( aName ))
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index f18f85055de6..d77774cc7308 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2799,7 +2799,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*
{
css::uno::Reference< css::task::XStatusIndicator > xProgress(m_xIndicatorInterception.get(),
css::uno::UNO_QUERY);
- aValue = css::uno::makeAny(xProgress);
+ aValue <<= xProgress;
}
break;
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 87e3f23340f6..a1d3f8bff5ed 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -126,8 +126,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstan
css::uno::Sequence< css::uno::Any > aArgs( 1 );
aPropValue.Name = aTopWindowArgName;
- aPropValue.Value = css::uno::makeAny( xTopWindow );
- aArgs[0] = css::uno::makeAny( aPropValue );
+ aPropValue.Value <<= xTopWindow;
+ aArgs[0] <<= aPropValue;
pTabWindow->initialize( aArgs );
xReturn.set( static_cast< OWeakObject* >( pTabWindow ), css::uno::UNO_QUERY );
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 94df703b3140..8cc4316d8669 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -201,11 +201,11 @@ void GlobalSettings_Access::impl_initConfigAccess()
css::configuration::theDefaultProvider::get( m_xContext );
aPropValue.Name = "nodepath";
- aPropValue.Value = css::uno::makeAny(OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars"));
- aArgs[0] = css::uno::makeAny( aPropValue );
+ aPropValue.Value <<= OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars");
+ aArgs[0] <<= aPropValue;
aPropValue.Name = "lazywrite";
- aPropValue.Value = css::uno::makeAny( true );
- aArgs[1] = css::uno::makeAny( aPropValue );
+ aPropValue.Value <<= true;
+ aArgs[1] <<= aPropValue;
m_xConfigAccess.set(xConfigProvider->createInstanceWithArguments(
SERVICENAME_CFGREADACCESS, aArgs ),
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index d970bea83838..fccf5977c8d0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -838,8 +838,8 @@ void ImageManagerImpl::replaceImages(
aInsertEvent.Accessor <<= xOwner;
aInsertEvent.Source = xOwner;
aInsertEvent.ResourceURL = m_aResourceString;
- aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+ aInsertEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY );
implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
}
if ( pReplacedImages != nullptr )
@@ -850,8 +850,8 @@ void ImageManagerImpl::replaceImages(
aReplaceEvent.Source = xOwner;
aReplaceEvent.ResourceURL = m_aResourceString;
aReplaceEvent.ReplacedElement = Any();
- aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+ aReplaceEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
}
}
@@ -934,24 +934,24 @@ void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUS
if ( pRemovedImages != nullptr )
{
ConfigurationEvent aRemoveEvent;
- aRemoveEvent.aInfo = uno::makeAny( nImageType );
- aRemoveEvent.Accessor = uno::makeAny( xOwner );
+ aRemoveEvent.aInfo <<= nImageType;
+ aRemoveEvent.Accessor <<= xOwner;
aRemoveEvent.Source = xOwner;
aRemoveEvent.ResourceURL = m_aResourceString;
- aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+ aRemoveEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY );
implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
}
if ( pReplacedImages != nullptr )
{
ConfigurationEvent aReplaceEvent;
- aReplaceEvent.aInfo = uno::makeAny( nImageType );
- aReplaceEvent.Accessor = uno::makeAny( xOwner );
+ aReplaceEvent.aInfo <<= nImageType;
+ aReplaceEvent.Accessor <<= xOwner;
aReplaceEvent.Source = xOwner;
aReplaceEvent.ResourceURL = m_aResourceString;
aReplaceEvent.ReplacedElement = Any();
- aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+ aReplaceEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
}
}
@@ -1073,35 +1073,35 @@ void ImageManagerImpl::reload()
if ( pInsertedImages != nullptr )
{
ConfigurationEvent aInsertEvent;
- aInsertEvent.aInfo = uno::makeAny( (sal_uInt16)i );
- aInsertEvent.Accessor = uno::makeAny( xOwner );
+ aInsertEvent.aInfo <<=(sal_uInt16)i;
+ aInsertEvent.Accessor <<= xOwner;
aInsertEvent.Source = xOwner;
aInsertEvent.ResourceURL = m_aResourceString;
- aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY ));
+ aInsertEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY );
implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert );
}
if ( pReplacedImages != nullptr )
{
ConfigurationEvent aReplaceEvent;
- aReplaceEvent.aInfo = uno::makeAny( (sal_uInt16)i );
- aReplaceEvent.Accessor = uno::makeAny( xOwner );
+ aReplaceEvent.aInfo <<= (sal_uInt16)i;
+ aReplaceEvent.Accessor <<= xOwner;
aReplaceEvent.Source = xOwner;
aReplaceEvent.ResourceURL = m_aResourceString;
aReplaceEvent.ReplacedElement = Any();
- aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY ));
+ aReplaceEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY );
implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace );
}
if ( pRemovedImages != nullptr )
{
ConfigurationEvent aRemoveEvent;
- aRemoveEvent.aInfo = uno::makeAny( (sal_uInt16)i );
- aRemoveEvent.Accessor = uno::makeAny( xOwner );
+ aRemoveEvent.aInfo <<= (sal_uInt16)i;
+ aRemoveEvent.Accessor <<= xOwner;
aRemoveEvent.Source = xOwner;
aRemoveEvent.ResourceURL = m_aResourceString;
- aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >(
- static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY ));
+ aRemoveEvent.Element <<= uno::Reference< XNameAccess >(
+ static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY );
implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove );
}
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 5cd3fc0a2739..6d8c08516efc 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1450,14 +1450,14 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
Sequence< Any > aPropSeq( 3 );
PropertyValue aPropValue;
aPropValue.Name = "UserConfigStorage";
- aPropValue.Value = makeAny( m_xUserConfigStorage );
- aPropSeq[0] = makeAny( aPropValue );
+ aPropValue.Value <<= m_xUserConfigStorage;
+ aPropSeq[0] <<= aPropValue;
aPropValue.Name = "ModuleIdentifier";
- aPropValue.Value = makeAny( m_aModuleIdentifier );
- aPropSeq[1] = makeAny( aPropValue );
+ aPropValue.Value <<= m_aModuleIdentifier;
+ aPropSeq[1] <<= aPropValue;
aPropValue.Name = "UserRootCommit";
- aPropValue.Value = makeAny( m_xUserRootCommit );
- aPropSeq[2] = makeAny( aPropValue );
+ aPropValue.Value <<= m_xUserRootCommit;
+ aPropSeq[2] <<= aPropValue;
xInit->initialize( aPropSeq );
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 65955e025e66..d38377387376 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1142,11 +1142,11 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager()
Sequence< Any > aPropSeq( 2 );
PropertyValue aPropValue;
aPropValue.Name = "UserConfigStorage";
- aPropValue.Value = makeAny( m_xDocConfigStorage );
- aPropSeq[0] = makeAny( aPropValue );
+ aPropValue.Value <<= m_xDocConfigStorage;
+ aPropSeq[0] <<= aPropValue;
aPropValue.Name = "ModuleIdentifier";
- aPropValue.Value = makeAny( m_aModuleIdentifier );
- aPropSeq[1] = makeAny( aPropValue );
+ aPropValue.Value <<= m_aModuleIdentifier;
+ aPropSeq[1] <<= aPropValue;
xInit->initialize( aPropSeq );
}
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 9194f45ccdc6..13ee80120597 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -532,37 +532,37 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
switch ( i )
{
case PROPERTY_LOCKED:
- pv.Value = makeAny( rWinStateInfo.bLocked ); break;
+ pv.Value <<= rWinStateInfo.bLocked; break;
case PROPERTY_DOCKED:
- pv.Value = makeAny( rWinStateInfo.bDocked ); break;
+ pv.Value <<= rWinStateInfo.bDocked; break;
case PROPERTY_VISIBLE:
- pv.Value = makeAny( rWinStateInfo.bVisible ); break;
+ pv.Value <<= rWinStateInfo.bVisible; break;
case PROPERTY_CONTEXT:
- pv.Value = makeAny( rWinStateInfo.bContext ); break;
+ pv.Value <<= rWinStateInfo.bContext; break;
case PROPERTY_HIDEFROMMENU:
- pv.Value = makeAny( rWinStateInfo.bHideFromMenu ); break;
+ pv.Value <<= rWinStateInfo.bHideFromMenu; break;
case PROPERTY_NOCLOSE:
- pv.Value = makeAny( rWinStateInfo.bNoClose ); break;
+ pv.Value <<= rWinStateInfo.bNoClose; break;
case PROPERTY_SOFTCLOSE:
- pv.Value = makeAny( rWinStateInfo.bSoftClose ); break;
+ pv.Value <<= rWinStateInfo.bSoftClose; break;
case PROPERTY_CONTEXTACTIVE:
- pv.Value = makeAny( rWinStateInfo.bContextActive ); break;
+ pv.Value <<= rWinStateInfo.bContextActive; break;
case PROPERTY_DOCKINGAREA:
- pv.Value = makeAny( rWinStateInfo.aDockingArea ); break;
+ pv.Value <<= rWinStateInfo.aDockingArea; break;
case PROPERTY_POS:
- pv.Value = makeAny( rWinStateInfo.aPos ); break;
+ pv.Value <<= rWinStateInfo.aPos; break;
case PROPERTY_SIZE:
- pv.Value = makeAny( rWinStateInfo.aSize ); break;
+ pv.Value <<= rWinStateInfo.aSize; break;
case PROPERTY_UINAME:
- pv.Value = makeAny( rWinStateInfo.aUIName ); break;
+ pv.Value <<= rWinStateInfo.aUIName; break;
case PROPERTY_INTERNALSTATE:
- pv.Value = makeAny( sal_Int32( rWinStateInfo.nInternalState )); break;
+ pv.Value <<= sal_Int32( rWinStateInfo.nInternalState ); break;
case PROPERTY_STYLE:
- pv.Value = makeAny( sal_Int16( rWinStateInfo.nStyle )); break;
+ pv.Value <<= sal_Int16( rWinStateInfo.nStyle ); break;
case PROPERTY_DOCKPOS:
- pv.Value = makeAny( rWinStateInfo.aDockPos ); break;
+ pv.Value <<= rWinStateInfo.aDockPos; break;
case PROPERTY_DOCKSIZE:
- pv.Value = makeAny( rWinStateInfo.aDockSize ); break;
+ pv.Value <<= rWinStateInfo.aDockSize; break;
default:
assert( false && "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
@@ -637,7 +637,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
{
aWindowStateInfo.aDockingArea = (DockingArea)nDockingArea;
nMask |= WINDOWSTATE_MASK_DOCKINGAREA;
- a = makeAny( aWindowStateInfo.aDockingArea );
+ a <<= aWindowStateInfo.aDockingArea;
bAddToSeq = true;
}
}
@@ -1361,7 +1361,7 @@ Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentif
if ( pModuleIter != m_aModuleToWindowStateHashMap.end() )
{
if ( pModuleIter->second.is() )
- a = makeAny( pModuleIter->second );
+ a <<= pModuleIter->second;
else
{
Reference< XNameAccess > xResourceURLWindowState;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index f156dfa7cceb..6257c12b521c 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -297,7 +297,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
aPropValue.Value <<= xToolbarWindow;
aArgs[3] <<= aPropValue;
aPropValue.Name = "ItemId";
- aPropValue.Value = makeAny( sal_Int32( nId ));
+ aPropValue.Value <<= sal_Int32( nId );
aArgs[4] <<= aPropValue;
try
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 6296fed95174..ced85e93f49f 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -254,7 +254,7 @@ void ComplexToolbarController::addNotifyInfo(
uno::Sequence< beans::NamedValue > aInfoSeq( rInfo );
aInfoSeq.realloc( nCount+1 );
aInfoSeq[nCount].Name = "Source";
- aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() );
+ aInfoSeq[nCount].Value <<= getFrameInterface();
pNotifyInfo->aInfoSeq = aInfoSeq;
Application::PostUserEvent( LINK(nullptr, ComplexToolbarController, Notify_Impl), pNotifyInfo );
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 51c6cc1e2067..0d2fa663aeb4 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -417,7 +417,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
Sequence< PropertyValue > aArgsList( 1 );
aArgsList[0].Name = "Referer";
- aArgsList[0].Value = makeAny( OUString( "private:user" ));
+ aArgsList[0].Value <<= OUString( "private:user" );
dispatchCommand( aURL, aArgsList, aTargetFrame );
}
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index a4bf6e447b2b..9105f945e89c 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -244,11 +244,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
{
Sequence< PropertyValue > aArgsList(3);
aArgsList[0].Name = "Referer";
- aArgsList[0].Value = makeAny( OUString( "private:user" ) );
+ aArgsList[0].Value <<= OUString( "private:user" );
// documents in the picklist will never be opened as templates
aArgsList[1].Name = "AsTemplate";
- aArgsList[1].Value = makeAny( false );
+ aArgsList[1].Value <<= false;
// Type detection needs to know which app we are opening it from.
aArgsList[2].Name = "DocumentService";
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 53fc6dd2e9f7..efbe34c91f9d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -319,7 +319,7 @@ void StatusBarManager::CreateControllers()
// TODO remove this
aPropValue.Name = "ServiceManager";
- aPropValue.Value = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) );
+ aPropValue.Value <<= uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
aPropVector.push_back( uno::makeAny( aPropValue ) );
aPropValue.Name = "ParentWindow";
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 518ef1a1d9ba..d72a16518055 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -720,7 +720,7 @@ void ToolBarManager::CreateControllers()
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = "Identifier";
- aPropValue.Value = uno::makeAny( nId );
+ aPropValue.Value <<= nId;
aPropertyVector.push_back( uno::makeAny( aPropValue ) );
Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -826,7 +826,7 @@ void ToolBarManager::CreateControllers()
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = "Identifier";
- aPropValue.Value = uno::makeAny( nId );
+ aPropValue.Value <<= nId;
aPropertyVector.push_back( uno::makeAny( aPropValue ) );
Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
@@ -1703,7 +1703,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
{
// We have found the requested item, toggle the visible flag
// and write back the configuration settings to the toolbar
- aProp[nVisibleIndex].Value = makeAny( !bVisible );
+ aProp[nVisibleIndex].Value <<= !bVisible;
try
{
xItemContainer->replaceByIndex( i, makeAny( aProp ));
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 007f6c4a7a65..6542f9dcfa74 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -166,17 +166,17 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
aSeqSeq.realloc( aSeqSeq.getLength() + 1 );
aSeq[0].Name = m_aPropType;
- aSeq[0].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+ aSeq[0].Value <<= aFactory.getToken( 0, '^', nToken );
if ( nToken > 0 )
{
aSeq.realloc( 2 );
aSeq[1].Name = m_aPropName;
- aSeq[1].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+ aSeq[1].Value <<= aFactory.getToken( 0, '^', nToken );
if ( nToken > 0 )
{
aSeq.realloc( 3 );
aSeq[2].Name = m_aPropModule;
- aSeq[2].Value = makeAny( aFactory.getToken( 0, '^', nToken ));
+ aSeq[2].Value <<= aFactory.getToken( 0, '^', nToken );
}
}
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 265f1b8fd9cd..a86813acb07d 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -991,7 +991,7 @@ uno::Reference< util::XChangesBatch > const & GrammarCheckingIterator::GetUpdate
// get configuration update access
beans::PropertyValue aValue;
aValue.Name = "nodepath";
- aValue.Value = uno::makeAny( OUString("org.openoffice.Office.Linguistic/ServiceManager") );
+ aValue.Value <<= OUString("org.openoffice.Office.Linguistic/ServiceManager");
uno::Sequence< uno::Any > aProps(1);
aProps[0] <<= aValue;
m_xUpdateAccess.set(
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index ec75f877fabf..6ff528df1e95 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -249,7 +249,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
if ( aSet[nInd].Name.equals( aName ) )
{
- aSet[nInd].Value = uno::makeAny( aChars.toInt32() );
+ aSet[nInd].Value <<= aChars.toInt32();
bFound = true;
break;
}
@@ -258,7 +258,7 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
{
aSet.realloc( nLen + 1 );
aSet[nLen].Name = aName;
- aSet[nLen].Value = uno::makeAny( aChars.toInt32() );
+ aSet[nLen].Value <<= aChars.toInt32();
}
m_xDocProp->setDocumentStatistics( aSet );
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 47aff71124a5..8470c4a0f182 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -300,7 +300,7 @@ void Color::addTransformation( sal_Int32 nElement, sal_Int32 nValue )
sal_Int32 nSize = maInteropTransformations.getLength();
maInteropTransformations.realloc(nSize + 1);
maInteropTransformations[nSize].Name = getColorTransformationName( nToken );
- maInteropTransformations[nSize].Value = css::uno::Any( nValue );
+ maInteropTransformations[nSize].Value <<= nValue;
}
void Color::addChartTintTransformation( double fTint )
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index b6d6e1986d49..37a6281f160d 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -216,7 +216,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "logheight" ;
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
else
@@ -251,7 +251,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "logheight/" + OUString::number( nIntVal );
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
break;
@@ -270,7 +270,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "max(logwidth,logheight)";
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
break;
@@ -280,7 +280,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "min(logwidth,logheight)";
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
break;
@@ -307,7 +307,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "min(logwidth,logheight)/" + OUString::number( nIntVal );
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
break;
@@ -321,7 +321,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "logwidth" ;
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
else
@@ -362,7 +362,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
aGuide.maName = rValue;
aGuide.maFormula = "logwidth/" + OUString::number( nIntVal );
- aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) );
+ aRet.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide );
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
break;
@@ -374,7 +374,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
if ( bConstant )
{
if (nConstant != -1) {
- aRet.Value = Any( nConstant );
+ aRet.Value <<= nConstant;
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
}
@@ -388,7 +388,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
}
if ( ( n >= '0' ) && ( n <= '9' ) )
{ // seems to be a ST_Coordinate
- aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
+ aRet.Value <<= (sal_Int32)(rValue.toInt32() );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
}
else
@@ -396,7 +396,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
sal_Int32 nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getAdjustmentGuideList(), rValue );
if ( nGuideIndex >= 0 )
{
- aRet.Value = Any( nGuideIndex );
+ aRet.Value <<= nGuideIndex;
aRet.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
}
else
@@ -404,13 +404,13 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
nGuideIndex = CustomShapeProperties::GetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), rValue );
if ( nGuideIndex >= 0 )
{
- aRet.Value = Any( nGuideIndex );
+ aRet.Value <<= nGuideIndex;
aRet.Type = EnhancedCustomShapeParameterType::EQUATION;
}
else
{
SAL_WARN("oox", "error: unhandled value " << rValue);
- aRet.Value = Any( rValue );
+ aRet.Value <<= rValue;
}
}
}
@@ -1061,7 +1061,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
aGuide.maFormula = "("
+ GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_stAng ).get() ) )
+ ")/60000.0";
- aAngles.First.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) );
+ aAngles.First.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide );
aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION;
// swing angle
@@ -1069,7 +1069,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
aGuide.maFormula = "("
+ GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, rAttribs.getString( XML_swAng ).get() ) )
+ ")/60000.0";
- aAngles.Second.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) );
+ aAngles.Second.Value <<= CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide );
aAngles.Second.Type = EnhancedCustomShapeParameterType::EQUATION;
mrPath2D.parameter.push_back( aScale );
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 175e291e93a8..8916ae27c1cc 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -40,7 +40,7 @@ void lcl_parseAdjustmentValue(std::vector<drawing::EnhancedCustomShapeAdjustment
else if (aToken.startsWith(aValuePrefix))
{
OString aValue = aToken.copy(strlen(aValuePrefix), aToken.getLength() - strlen(aValuePrefix) - strlen(" }"));
- aAdjustmentValue.Value = uno::makeAny(aValue.toInt32());
+ aAdjustmentValue.Value <<= aValue.toInt32();
}
else if (!aToken.startsWith("State = "))
SAL_WARN("oox", "lcl_parseAdjustmentValue: unexpected prefix: " << aToken);
@@ -81,7 +81,7 @@ drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterP
static const char aExpectedFVPrefix[] = "First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
assert(aToken.startsWith(aExpectedFVPrefix));
sal_Int32 nIndex = strlen(aExpectedFVPrefix);
- aPair.First.Value = uno::makeAny(static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32()));
+ aPair.First.Value <<= static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32());
static const char aExpectedFTPrefix[] = ", Type = (short) ";
aToken = aToken.copy(nIndex);
@@ -93,7 +93,7 @@ drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterP
aToken = aToken.copy(nIndex);
assert(aToken.startsWith(aExpectedSVPrefix));
nIndex = strlen(aExpectedSVPrefix);
- aPair.Second.Value = uno::makeAny(static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32()));
+ aPair.Second.Value <<= static_cast<sal_uInt32>(aToken.getToken(0, '}', nIndex).toInt32());
static const char aExpectedSTPrefix[] = ", Type = (short) ";
aToken = aToken.copy(nIndex);
@@ -250,7 +250,7 @@ void lcl_parseHandlePosition(std::vector<beans::PropertyValue>& rHandle, const O
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = "Position";
- aPropertyValue.Value = uno::makeAny(lcl_parseEnhancedCustomShapeParameterPair(aToken));
+ aPropertyValue.Value <<= lcl_parseEnhancedCustomShapeParameterPair(aToken);
rHandle.push_back(aPropertyValue);
}
else if (!aToken.startsWith("Name =") && !aToken.startsWith("Handle ="))
@@ -293,7 +293,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
static const char aExpectedVPrefix[] = "Value = (any) { (long) ";
assert(aToken.startsWith(aExpectedVPrefix));
sal_Int32 nIndex = strlen(aExpectedVPrefix);
- aParameter.Value = uno::makeAny(aToken.getToken(0, '}', nIndex).toInt32());
+ aParameter.Value <<= aToken.getToken(0, '}', nIndex).toInt32();
static const char aExpectedTPrefix[] = ", Type = (short) ";
aToken = aToken.copy(nIndex);
@@ -303,7 +303,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = rName;
- aPropertyValue.Value = uno::makeAny(aParameter);
+ aPropertyValue.Value <<= aParameter;
rHandle.push_back(aPropertyValue);
}
@@ -327,7 +327,7 @@ void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OStrin
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = rName;
// We only expect a Value here
- aPropertyValue.Value = uno::makeAny(rValue.getToken(0, '}', nIndex).toInt32());
+ aPropertyValue.Value <<= rValue.getToken(0, '}', nIndex).toInt32();
rHandle.push_back(aPropertyValue);
}
else
@@ -449,7 +449,7 @@ void lcl_parsePathCoordinateValues(std::vector<beans::PropertyValue>& rPath, con
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = "Coordinates";
- aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aPairs));
+ aPropertyValue.Value <<= comphelper::containerToSequence(aPairs);
rPath.push_back(aPropertyValue);
}
@@ -513,7 +513,7 @@ void lcl_parsePathSegmentValues(std::vector<beans::PropertyValue>& rPath, const
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = "Segments";
- aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSegments));
+ aPropertyValue.Value <<= comphelper::containerToSequence(aSegments);
rPath.push_back(aPropertyValue);
}
@@ -577,7 +577,7 @@ void lcl_parsePathTextFrameValues(std::vector<beans::PropertyValue>& rPath, cons
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = "TextFrames";
- aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aTextFrames));
+ aPropertyValue.Value <<= comphelper::containerToSequence(aTextFrames);
rPath.push_back(aPropertyValue);
}
@@ -641,7 +641,7 @@ void lcl_parsePathSubViewSizeValues(std::vector<beans::PropertyValue>& rPath, co
beans::PropertyValue aPropertyValue;
aPropertyValue.Name = "SubViewSize";
- aPropertyValue.Value = uno::makeAny(comphelper::containerToSequence(aSizes));
+ aPropertyValue.Value <<= comphelper::containerToSequence(aSizes);
rPath.push_back(aPropertyValue);
}
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 7d39719a45ac..a72988627602 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -339,14 +339,14 @@ uno::Sequence<beans::PropertyValue> Diagram::getDomsAsPropertyValues() const
++i)
{
pValue[0].Name = i->first;
- pValue[0].Value = uno::makeAny(i->second);
+ pValue[0].Value <<= i->second;
++pValue;
}
if ( 0 < maDataRelsMap.getLength() )
{
pValue[0].Name = "OOXDiagramDataRels";
- pValue[0].Value = uno::makeAny ( maDataRelsMap );
+ pValue[0].Value <<= maDataRelsMap;
++pValue;
}
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 65913bd426ba..3bf6d78e7624 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -163,7 +163,7 @@ public:
sal_Int32 nIdx = LayoutNodeContext::tagToVarIdx( getBaseToken( aElement ) );
if( nIdx != -1 )
{
- mVariables[ nIdx ] = makeAny( rAttribs.getString( XML_val ).get() );
+ mVariables[ nIdx ] <<= rAttribs.getString( XML_val ).get();
}
return this;
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index d6c7de519991..8ef18a5d2965 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -88,7 +88,7 @@ css::beans::PropertyValue Effect::getEffect()
}
aRet.Name = msName;
- aRet.Value = css::uno::Any( aSeq );
+ aRet.Value <<= aSeq;
return aRet;
}
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index fd4eadc3cfaf..dc7f85517ea2 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -39,37 +39,37 @@ EffectPropertiesContext::~EffectPropertiesContext()
void EffectPropertiesContext::saveUnsupportedAttribs( Effect& rEffect, const AttributeList& rAttribs )
{
if( rAttribs.hasAttribute( XML_algn ) )
- rEffect.maAttribs["algn"] = makeAny( rAttribs.getString( XML_algn, "" ) );
+ rEffect.maAttribs["algn"] <<= rAttribs.getString( XML_algn, "" );
if( rAttribs.hasAttribute( XML_blurRad ) )
- rEffect.maAttribs["blurRad"] = makeAny( rAttribs.getInteger( XML_blurRad, 0 ) );
+ rEffect.maAttribs["blurRad"] <<= rAttribs.getInteger( XML_blurRad, 0 );
if( rAttribs.hasAttribute( XML_dir ) )
- rEffect.maAttribs["dir"] = makeAny( rAttribs.getInteger( XML_dir, 0 ) );
+ rEffect.maAttribs["dir"] <<= rAttribs.getInteger( XML_dir, 0 );
if( rAttribs.hasAttribute( XML_dist ) )
- rEffect.maAttribs["dist"] = makeAny( rAttribs.getInteger( XML_dist, 0 ) );
+ rEffect.maAttribs["dist"] <<= rAttribs.getInteger( XML_dist, 0 );
if( rAttribs.hasAttribute( XML_kx ) )
- rEffect.maAttribs["kx"] = makeAny( rAttribs.getInteger( XML_kx, 0 ) );
+ rEffect.maAttribs["kx"] <<= rAttribs.getInteger( XML_kx, 0 );
if( rAttribs.hasAttribute( XML_ky ) )
- rEffect.maAttribs["ky"] = makeAny( rAttribs.getInteger( XML_ky, 0 ) );
+ rEffect.maAttribs["ky"] <<= rAttribs.getInteger( XML_ky, 0 );
if( rAttribs.hasAttribute( XML_rotWithShape ) )
- rEffect.maAttribs["rotWithShape"] = makeAny( rAttribs.getInteger( XML_rotWithShape, 0 ) );
+ rEffect.maAttribs["rotWithShape"] <<= rAttribs.getInteger( XML_rotWithShape, 0 );
if( rAttribs.hasAttribute( XML_sx ) )
- rEffect.maAttribs["sx"] = makeAny( rAttribs.getInteger( XML_sx, 0 ) );
+ rEffect.maAttribs["sx"] <<= rAttribs.getInteger( XML_sx, 0 );
if( rAttribs.hasAttribute( XML_sy ) )
- rEffect.maAttribs["sy"] = makeAny( rAttribs.getInteger( XML_sy, 0 ) );
+ rEffect.maAttribs["sy"] <<= rAttribs.getInteger( XML_sy, 0 );
if( rAttribs.hasAttribute( XML_rad ) )
- rEffect.maAttribs["rad"] = makeAny( rAttribs.getInteger( XML_rad, 0 ) );
+ rEffect.maAttribs["rad"] <<= rAttribs.getInteger( XML_rad, 0 );
if( rAttribs.hasAttribute( XML_endA ) )
- rEffect.maAttribs["endA"] = makeAny( rAttribs.getInteger( XML_endA, 0 ) );
+ rEffect.maAttribs["endA"] <<= rAttribs.getInteger( XML_endA, 0 );
if( rAttribs.hasAttribute( XML_endPos ) )
- rEffect.maAttribs["endPos"] = makeAny( rAttribs.getInteger( XML_endPos, 0 ) );
+ rEffect.maAttribs["endPos"] <<= rAttribs.getInteger( XML_endPos, 0 );
if( rAttribs.hasAttribute( XML_fadeDir ) )
- rEffect.maAttribs["fadeDir"] = makeAny( rAttribs.getInteger( XML_fadeDir, 0 ) );
+ rEffect.maAttribs["fadeDir"] <<= rAttribs.getInteger( XML_fadeDir, 0 );
if( rAttribs.hasAttribute( XML_stA ) )
- rEffect.maAttribs["stA"] = makeAny( rAttribs.getInteger( XML_stA, 0 ) );
+ rEffect.maAttribs["stA"] <<= rAttribs.getInteger( XML_stA, 0 );
if( rAttribs.hasAttribute( XML_stPos ) )
- rEffect.maAttribs["stPos"] = makeAny( rAttribs.getInteger( XML_stPos, 0 ) );
+ rEffect.maAttribs["stPos"] <<= rAttribs.getInteger( XML_stPos, 0 );
if( rAttribs.hasAttribute( XML_grow ) )
- rEffect.maAttribs["grow"] = makeAny( rAttribs.getInteger( XML_grow, 0 ) );
+ rEffect.maAttribs["grow"] <<= rAttribs.getInteger( XML_grow, 0 );
}
ContextHandlerRef EffectPropertiesContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 6bdce225da98..47c15028d5dd 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -793,16 +793,16 @@ css::beans::PropertyValue ArtisticEffectProperties::getEffect()
{
css::uno::Sequence< css::beans::PropertyValue > aGraphicSeq( 2 );
aGraphicSeq[0].Name = "Id";
- aGraphicSeq[0].Value = uno::makeAny( mrOleObjectInfo.maProgId );
+ aGraphicSeq[0].Value <<= mrOleObjectInfo.maProgId;
aGraphicSeq[1].Name = "Data";
- aGraphicSeq[1].Value = uno::makeAny( mrOleObjectInfo.maEmbeddedData );
+ aGraphicSeq[1].Value <<= mrOleObjectInfo.maEmbeddedData;
aSeq[i].Name = "OriginalGraphic";
- aSeq[i].Value = uno::makeAny( aGraphicSeq );
+ aSeq[i].Value <<= aGraphicSeq;
}
aRet.Name = msName;
- aRet.Value = css::uno::Any( aSeq );
+ aRet.Value <<= aSeq;
return aRet;
}
diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx
index 06c20131b6ef..012c3f34370f 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -371,7 +371,7 @@ ContextHandlerRef ArtisticEffectContext::onCreateContext(
{
OUString sName = ArtisticEffectProperties::getEffectString( nAttrib );
if( !sName.isEmpty() )
- maEffect.maAttribs[sName] = uno::makeAny( rAttribs.getInteger( nAttrib, 0 ) );
+ maEffect.maAttribs[sName] <<= rAttribs.getInteger( nAttrib, 0 );
}
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 01d79c08ec96..9533f4ec9654 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -98,7 +98,7 @@ namespace oox { namespace drawingml {
#define PUT_PROP( aProperties, nPos, sPropName, aPropValue ) \
aProperties[nPos].Name = sPropName; \
- aProperties[nPos].Value = Any( aPropValue );
+ aProperties[nPos].Value <<= aPropValue;
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
: mpLinePropertiesPtr( new LineProperties )
@@ -764,7 +764,7 @@ Reference< XShape > const & Shape::createAndInsert(
mpCustomShapePropertiesPtr->getShapePresetTypeName();
OUString sShapePresetTypeName(reinterpret_cast< const char* >(
aNameSeq.getConstArray()), aNameSeq.getLength(), RTL_TEXTENCODING_UTF8);
- aGrabBag[length].Value = uno::makeAny(sShapePresetTypeName);
+ aGrabBag[length].Value <<= sShapePresetTypeName;
propertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag));
}
//If the text box has links then save the link information so that
@@ -777,11 +777,11 @@ Reference< XShape > const & Shape::createAndInsert(
sal_Int32 length = aGrabBag.getLength();
aGrabBag.realloc( length + 3 );
aGrabBag[length].Name = "TxbxHasLink";
- aGrabBag[length].Value = uno::makeAny(this->isLinkedTxbx());
+ aGrabBag[length].Value <<= this->isLinkedTxbx();
aGrabBag[length + 1 ].Name = "Txbx-Id";
- aGrabBag[length + 1 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().id);
+ aGrabBag[length + 1 ].Value <<= this->getLinkedTxbxAttributes().id;
aGrabBag[length + 2 ].Name = "Txbx-Seq";
- aGrabBag[length + 2 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().seq);
+ aGrabBag[length + 2 ].Value <<= this->getLinkedTxbxAttributes().seq;
propertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag));
}
@@ -835,7 +835,7 @@ Reference< XShape > const & Shape::createAndInsert(
xPropertySet->getPropertyValue(aGrabBagPropName) >>= aGrabBag;
beans::PropertyValue aPair;
aPair.Name = "mso-rotation-angle";
- aPair.Value = uno::makeAny(mnRotation);
+ aPair.Value <<= mnRotation;
if (aGrabBag.hasElements())
{
sal_Int32 nLength = aGrabBag.getLength();
@@ -912,11 +912,11 @@ Reference< XShape > const & Shape::createAndInsert(
sal_Int32 length = aGrabBag.getLength();
aGrabBag.realloc( length + 3 );
aGrabBag[length].Name = "TxbxHasLink";
- aGrabBag[length].Value = uno::makeAny(this->isLinkedTxbx());
+ aGrabBag[length].Value <<= isLinkedTxbx();
aGrabBag[length + 1 ].Name = "Txbx-Id";
- aGrabBag[length + 1 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().id);
+ aGrabBag[length + 1 ].Value <<= getLinkedTxbxAttributes().id;
aGrabBag[length + 2 ].Name = "Txbx-Seq";
- aGrabBag[length + 2 ].Value = uno::makeAny(this->getLinkedTxbxAttributes().seq);
+ aGrabBag[length + 2 ].Value <<= getLinkedTxbxAttributes().seq;
propertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aGrabBag));
}
@@ -935,8 +935,10 @@ Reference< XShape > const & Shape::createAndInsert(
// Store original fill and line colors of the shape and the theme color name to InteropGrabBag
Sequence< PropertyValue > aProperties( 6 ); //allocate the maximum possible number of slots
sal_Int32 nSize = 2;
- PUT_PROP( aProperties, 0, "OriginalSolidFillClr", aShapeProps.getProperty(PROP_FillColor) );
- PUT_PROP( aProperties, 1, "OriginalLnSolidFillClr", aShapeProps.getProperty(PROP_LineColor) );
+ aProperties[0].Name = "OriginalSolidFillClr";
+ aProperties[0].Value = aShapeProps.getProperty(PROP_FillColor);
+ aProperties[1].Name = "OriginalLnSolidFillClr";
+ aProperties[1].Value = aShapeProps.getProperty(PROP_LineColor);
OUString sColorFillScheme = aFillProperties.maFillColor.getSchemeName();
if( !aFillProperties.maFillColor.isPlaceHolder() && !sColorFillScheme.isEmpty() )
{
@@ -1013,7 +1015,8 @@ Reference< XShape > const & Shape::createAndInsert(
if( !aEffect.Name.isEmpty() )
{
Sequence< PropertyValue > aEffectsGrabBag( 3 );
- PUT_PROP( aEffectsGrabBag, 0, "Attribs", aEffect.Value );
+ aEffectsGrabBag[0].Name = "Attribs";
+ aEffectsGrabBag[0].Value = aEffect.Value;
Color& aColor( it->moColor );
OUString sColorScheme = aColor.getSchemeName();
@@ -1046,9 +1049,9 @@ Reference< XShape > const & Shape::createAndInsert(
if( aCamera3DEffects.getLength() > 0 || aLightRig3DEffects.getLength() > 0 || aShape3DEffects.getLength() > 0 )
{
Sequence< PropertyValue > a3DEffectsGrabBag( 3 );
- PUT_PROP( a3DEffectsGrabBag, 0, "Camera", Any( aCamera3DEffects ) );
- PUT_PROP( a3DEffectsGrabBag, 1, "LightRig", Any( aLightRig3DEffects ) );
- PUT_PROP( a3DEffectsGrabBag, 2, "Shape3D", Any( aShape3DEffects ) );
+ PUT_PROP( a3DEffectsGrabBag, 0, "Camera", aCamera3DEffects );
+ PUT_PROP( a3DEffectsGrabBag, 1, "LightRig", aLightRig3DEffects );
+ PUT_PROP( a3DEffectsGrabBag, 2, "Shape3D", aShape3DEffects );
putPropertyToGrabBag( "3DEffectProperties", Any( a3DEffectsGrabBag ) );
}
@@ -1539,17 +1542,17 @@ uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfTypeFro
// [0] => RID, [1] => InputStream [2] => extension
OUString sRelId = aIt->second.maId;
- diagramRelTuple[0] = uno::makeAny ( sRelId );
+ diagramRelTuple[0] <<= sRelId;
OUString sTarget = xImageRels->getFragmentPathFromRelId( sRelId );
uno::Reference< io::XInputStream > xImageInputStrm( rFilter.openInputStream( sTarget ), uno::UNO_SET_THROW );
StreamDataSequence dataSeq;
if ( rFilter.importBinaryData( dataSeq, sTarget ) )
{
- diagramRelTuple[1] = uno::makeAny( dataSeq );
+ diagramRelTuple[1] <<= dataSeq;
}
- diagramRelTuple[2] = uno::makeAny( sTarget.copy( sTarget.lastIndexOf(".") ) );
+ diagramRelTuple[2] <<= sTarget.copy( sTarget.lastIndexOf(".") );
xRelListTemp[counter] = diagramRelTuple;
++counter;
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index cf1930afdafe..5a4b3213d2f7 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -218,37 +218,37 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getCameraAttr
if( mfFieldOfVision.has() )
{
aSeq[nSize].Name = "fov";
- aSeq[nSize].Value = css::uno::Any( mfFieldOfVision.use() );
+ aSeq[nSize].Value <<= mfFieldOfVision.use();
nSize++;
}
if( mfZoom.has() )
{
aSeq[nSize].Name = "zoom";
- aSeq[nSize].Value = css::uno::Any( mfZoom.use() );
+ aSeq[nSize].Value <<= mfZoom.use();
nSize++;
}
if( mnPreset.has() )
{
aSeq[nSize].Name = "prst";
- aSeq[nSize].Value = css::uno::Any( getCameraPrstName( mnPreset.use() ) );
+ aSeq[nSize].Value <<= getCameraPrstName( mnPreset.use() );
nSize++;
}
if( maCameraRotation.mnLatitude.has() )
{
aSeq[nSize].Name = "rotLat";
- aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnLatitude.use() );
+ aSeq[nSize].Value <<= maCameraRotation.mnLatitude.use();
nSize++;
}
if( maCameraRotation.mnLongitude.has() )
{
aSeq[nSize].Name = "rotLon";
- aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnLongitude.use() );
+ aSeq[nSize].Value <<= maCameraRotation.mnLongitude.use();
nSize++;
}
if( maCameraRotation.mnRevolution.has() )
{
aSeq[nSize].Name = "rotRev";
- aSeq[nSize].Value = css::uno::Any( maCameraRotation.mnRevolution.use() );
+ aSeq[nSize].Value <<= maCameraRotation.mnRevolution.use();
nSize++;
}
aSeq.realloc( nSize );
@@ -262,31 +262,31 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getLightRigAt
if( mnLightRigDirection.has() )
{
aSeq[nSize].Name = "dir";
- aSeq[nSize].Value = css::uno::Any( getLightRigDirName( mnLightRigDirection.use() ) );
+ aSeq[nSize].Value <<= getLightRigDirName( mnLightRigDirection.use() );
nSize++;
}
if( mnLightRigType.has() )
{
aSeq[nSize].Name = "rig";
- aSeq[nSize].Value = css::uno::Any( getLightRigName( mnLightRigType.use() ) );
+ aSeq[nSize].Value <<= getLightRigName( mnLightRigType.use() );
nSize++;
}
if( maLightRigRotation.mnLatitude.has() )
{
aSeq[nSize].Name = "rotLat";
- aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnLatitude.use() );
+ aSeq[nSize].Value <<= maLightRigRotation.mnLatitude.use();
nSize++;
}
if( maLightRigRotation.mnLongitude.has() )
{
aSeq[nSize].Name = "rotLon";
- aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnLongitude.use() );
+ aSeq[nSize].Value <<= maLightRigRotation.mnLongitude.use();
nSize++;
}
if( maLightRigRotation.mnRevolution.has() )
{
aSeq[nSize].Name = "rotRev";
- aSeq[nSize].Value = css::uno::Any( maLightRigRotation.mnRevolution.use() );
+ aSeq[nSize].Value <<= maLightRigRotation.mnRevolution.use();
nSize++;
}
aSeq.realloc( nSize );
@@ -300,19 +300,19 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getBevelAttri
if( rProps.mnPreset.has() )
{
aSeq[nSize].Name = "prst";
- aSeq[nSize].Value = css::uno::Any( getBevelPresetTypeString( rProps.mnPreset.use() ) );
+ aSeq[nSize].Value <<= getBevelPresetTypeString( rProps.mnPreset.use() );
nSize++;
}
if( rProps.mnWidth.has() )
{
aSeq[nSize].Name = "w";
- aSeq[nSize].Value = css::uno::Any( rProps.mnWidth.use() );
+ aSeq[nSize].Value <<= rProps.mnWidth.use();
nSize++;
}
if( rProps.mnHeight.has() )
{
aSeq[nSize].Name = "h";
- aSeq[nSize].Value = css::uno::Any( rProps.mnHeight.use() );
+ aSeq[nSize].Value <<= rProps.mnHeight.use();
nSize++;
}
aSeq.realloc( nSize );
@@ -328,17 +328,17 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getColorAttri
{
// RGB color and transparency value
aSeq[0].Name = "rgbClr";
- aSeq[0].Value = css::uno::Any( rColor.getColor( rGraphicHelper, rPhClr ) );
+ aSeq[0].Value <<= rColor.getColor( rGraphicHelper, rPhClr );
aSeq[1].Name = "rgbClrTransparency";
- aSeq[1].Value = css::uno::Any( rColor.getTransparency() );
+ aSeq[1].Value <<= rColor.getTransparency();
}
else
{
// scheme color with name and transformations
aSeq[0].Name = "schemeClr";
- aSeq[0].Value = css::uno::Any( sColorScheme );
+ aSeq[0].Value <<= sColorScheme;
aSeq[1].Name = "schemeClrTransformations";
- aSeq[1].Value = css::uno::Any( rColor.getTransformations() );
+ aSeq[1].Value <<= rColor.getTransformations();
}
return aSeq;
}
@@ -351,49 +351,49 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getShape3DAtt
if( mnExtrusionH.has() )
{
aSeq[nSize].Name = "extrusionH";
- aSeq[nSize].Value = css::uno::Any( mnExtrusionH.use() );
+ aSeq[nSize].Value <<= mnExtrusionH.use();
nSize++;
}
if( mnContourW.has() )
{
aSeq[nSize].Name = "contourW";
- aSeq[nSize].Value = css::uno::Any( mnContourW.use() );
+ aSeq[nSize].Value <<= mnContourW.use();
nSize++;
}
if( mnShapeZ.has() )
{
aSeq[nSize].Name = "z";
- aSeq[nSize].Value = css::uno::Any( mnShapeZ.use() );
+ aSeq[nSize].Value <<= mnShapeZ.use();
nSize++;
}
if( mnMaterial.has() )
{
aSeq[nSize].Name = "prstMaterial";
- aSeq[nSize].Value = css::uno::Any( getPresetMaterialTypeString( mnMaterial.use() ) );
+ aSeq[nSize].Value <<= getPresetMaterialTypeString( mnMaterial.use() );
nSize++;
}
if( maTopBevelProperties.has() )
{
aSeq[nSize].Name = "bevelT";
- aSeq[nSize].Value = css::uno::Any( getBevelAttributes( maTopBevelProperties.use() ) );
+ aSeq[nSize].Value <<= getBevelAttributes( maTopBevelProperties.use() );
nSize++;
}
if( maBottomBevelProperties.has() )
{
aSeq[nSize].Name = "bevelB";
- aSeq[nSize].Value = css::uno::Any( getBevelAttributes( maBottomBevelProperties.use() ) );
+ aSeq[nSize].Value <<= getBevelAttributes( maBottomBevelProperties.use() );
nSize++;
}
if( maExtrusionColor.isUsed() )
{
aSeq[nSize].Name = "extrusionClr";
- aSeq[nSize].Value = css::uno::Any( getColorAttributes( maExtrusionColor, rGraphicHelper, rPhClr ) );
+ aSeq[nSize].Value <<= getColorAttributes( maExtrusionColor, rGraphicHelper, rPhClr );
nSize++;
}
if( maContourColor.isUsed() )
{
aSeq[nSize].Name = "contourClr";
- aSeq[nSize].Value = css::uno::Any( getColorAttributes( maContourColor, rGraphicHelper, rPhClr ) );
+ aSeq[nSize].Value <<= getColorAttributes( maContourColor, rGraphicHelper, rPhClr );
nSize++;
}
aSeq.realloc( nSize );
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index 52abd9500456..b3b6b50e66e9 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -304,7 +304,7 @@ void TextEffectsContext::onEndElement()
Sequence<PropertyValue> aSeq;
PropertyValue aPropertyValue = mpGrabBagStack->getRootProperty();
aPropertyValue.Value >>= aSeq;
- aPropertyValue.Value = makeAny(aSeq[0]);
+ aPropertyValue.Value <<= aSeq[0];
mrTextEffectsProperties.push_back(aPropertyValue);
}
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b019f5699317..0c887c7b79d0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3029,12 +3029,12 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet )
rXPropSet->getPropertyValue( "ShadowYDistance" ) >>= dY;
aShadowAttribsGrabBag[0].Name = "dist";
- aShadowAttribsGrabBag[0].Value = Any(static_cast< sal_Int32 >(sqrt(dX*dX + dY*dY) * 360));
+ aShadowAttribsGrabBag[0].Value <<= static_cast< sal_Int32 >(sqrt(dX*dX + dY*dY) * 360);
aShadowAttribsGrabBag[1].Name = "dir";
- aShadowAttribsGrabBag[1].Value = Any((static_cast< sal_Int32 >(atan2(dY,dX) * 180 * 60000 / M_PI) + 21600000) % 21600000);
+ aShadowAttribsGrabBag[1].Value <<= (static_cast< sal_Int32 >(atan2(dY,dX) * 180 * 60000 / M_PI) + 21600000) % 21600000;
aShadowGrabBag[0].Name = "Attribs";
- aShadowGrabBag[0].Value = Any(aShadowAttribsGrabBag);
+ aShadowGrabBag[0].Value <<= aShadowAttribsGrabBag;
aShadowGrabBag[1].Name = "RgbClr";
aShadowGrabBag[1].Value = rXPropSet->getPropertyValue( "ShadowColor" );
aShadowGrabBag[2].Name = "RgbClrTransparency";
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx
index fdae712d00e8..c78ec045e555 100644
--- a/oox/source/helper/grabbagstack.cxx
+++ b/oox/source/helper/grabbagstack.cxx
@@ -38,7 +38,7 @@ PropertyValue GrabBagStack::getRootProperty()
PropertyValue aProperty;
aProperty.Name = mCurrentElement.maElementName;
- aProperty.Value = makeAny(comphelper::containerToSequence(mCurrentElement.maPropertyList));
+ aProperty.Value <<= comphelper::containerToSequence(mCurrentElement.maPropertyList);
return aProperty;
}
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index 08b390a10aa7..3c7bce7849d0 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -113,10 +113,10 @@ void SaveInteropProperties(uno::Reference<frame::XModel> const& xModel,
objectsList.erase(it);
}
- objectsList[rObjectName] = uno::Any( aGrabBagAttribute );
+ objectsList[rObjectName] <<= aGrabBagAttribute;
// put objects list back into the grab bag
- aGrabBag[sEmbeddingsPropName] = uno::Any(objectsList.getAsConstPropertyValueList());
+ aGrabBag[sEmbeddingsPropName] <<= objectsList.getAsConstPropertyValueList();
// put grab bag back into the document
xDocProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag.getAsConstPropertyValueList()));
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 0173d3794105..94cdd9672e39 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -106,7 +106,7 @@ namespace oox { namespace ppt {
SAL_INFO("oox.ppt", "OOX: TODO what to do with more than one" );
break;
}
- rTarget = makeAny( aParaTarget );
+ rTarget <<= aParaTarget;
}
break;
}
@@ -130,7 +130,7 @@ namespace oox { namespace ppt {
SAL_INFO("oox.ppt", "OOX: TODO sldTgt" );
break;
case XML_sndTgt:
- aTarget = makeAny(msValue);
+ aTarget <<= msValue;
break;
case XML_spTgt:
{
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index 1c879a6582ec..7cd57abd9819 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -155,7 +155,7 @@ namespace oox { namespace ppt {
{
if( isCurrentElement( mnElement ) && maColor.isUsed() )
{
- maValue = makeAny( maColor.getColor( getFilter().getGraphicHelper() ) );
+ maValue <<= maColor.getColor( getFilter().getGraphicHelper() );
}
}
@@ -166,7 +166,7 @@ namespace oox { namespace ppt {
case PPT_TOKEN( boolVal ):
{
bool val = rAttribs.getBool( XML_val, false );
- maValue = makeAny( val );
+ maValue <<= val;
return this;
}
case PPT_TOKEN( clrVal ):
@@ -175,20 +175,20 @@ namespace oox { namespace ppt {
case PPT_TOKEN( fltVal ):
{
double val = rAttribs.getDouble( XML_val, 0.0 );
- maValue = makeAny( val );
+ maValue <<= val;
return this;
}
case PPT_TOKEN( intVal ):
{
sal_Int32 val = rAttribs.getInteger( XML_val, 0 );
- maValue = makeAny( val );
+ maValue <<= val;
return this;
}
case PPT_TOKEN( strVal ):
{
OUString val = rAttribs.getString( XML_val, OUString() );
convertMeasure( val ); // ignore success or failure if it fails, use as is
- maValue = makeAny( val );
+ maValue <<= val;
return this;
}
default:
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index d6e6781961cc..99d78da02ea8 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -76,7 +76,7 @@ namespace oox { namespace ppt {
sAttributes.append( iter->name );
}
OUString sTmp( sAttributes.makeStringAndClear() );
- mpNode->getNodeProperties()[ NP_ATTRIBUTENAME ] = makeAny( sTmp );
+ mpNode->getNodeProperties()[ NP_ATTRIBUTENAME ] <<= sTmp;
}
break;
}
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index c8e11e0f6979..c6920899b45e 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -377,9 +377,9 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
if( attribs.hasAttribute( XML_afterEffect ) )
{
aUserData[ "after-effect" ]
- = makeAny( attribs.getBool( XML_afterEffect, false ) );
+ <<= attribs.getBool( XML_afterEffect, false );
}
- aProps[ NP_AUTOREVERSE ] = makeAny( attribs.getBool( XML_autoRev, false ) );
+ aProps[ NP_AUTOREVERSE ] <<= attribs.getBool( XML_autoRev, false );
// TODO
if( attribs.hasAttribute( XML_bldLvl ) )
@@ -528,7 +528,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
nEffectPresetClass = 0;
break;
}
- aUserData[ "preset-class" ] = makeAny( nEffectPresetClass );
+ aUserData[ "preset-class" ] <<= nEffectPresetClass;
if( attribs.hasAttribute( XML_presetID ) )
{
sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
@@ -537,11 +537,11 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
p++;
aUserData[ "preset-id" ]
- = makeAny( OUString::createFromAscii( p->mpStrPresetId ) );
+ <<= OUString::createFromAscii( p->mpStrPresetId );
sal_Int32 nPresetSubType = attribs.getInteger( XML_presetSubtype, 0 );
if( nPresetSubType )
{
- aUserData[ "preset-sub-type" ] = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) );
+ aUserData[ "preset-sub-type" ] <<= getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType );
}
}
}
diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index e7137926d3dd..c17d2075b52d 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -133,14 +133,14 @@ namespace oox { namespace ppt {
break;
}
maCond.mnType = aElementToken;
- maCond.maValue = makeAny( nEnum );
+ maCond.maValue <<= nEnum;
return this;
}
case PPT_TOKEN( tn ):
{
maCond.mnType = aElementToken;
sal_uInt32 nId = rAttribs.getUnsigned( XML_val, 0 );
- maCond.maValue = makeAny( nId );
+ maCond.maValue <<= nId;
return this;
}
case PPT_TOKEN( tgtEl ):
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index b67eb8b56817..8dc1392bed81 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -383,7 +383,7 @@ void PresentationFragmentHandler::finalizeImport()
// writing back the original PageCount of this document, it can be accessed from the XModel
// via getArgs after the import.
- rFilterData["OriginalPageCount"] = makeAny(nPageCount);
+ rFilterData["OriginalPageCount"] <<= nPageCount;
bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", true);
OUString aPageRange = rFilterData.getUnpackedValueOrDefault("PageRange", OUString());
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 47cb777bda08..3aaa9815d57e 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -84,17 +84,17 @@ namespace oox { namespace ppt {
aHSL[ 0 ] = double(one) / 100000;
aHSL[ 1 ] = double(two) / 100000;
aHSL[ 2 ] = double(three) / 100000;
- aColor = Any(aHSL);
+ aColor <<= aHSL;
break;
case AnimationColorSpace::RGB:
nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16
| ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8
| ( ( ( three * 128 ) / 1000 ) & 0xff );
- aColor = Any(nColor);
+ aColor <<= nColor;
break;
default:
nColor = 0;
- aColor = Any( nColor );
+ aColor <<= nColor;
break;
}
return aColor;
@@ -188,7 +188,7 @@ namespace oox { namespace ppt {
OUString aString;
if( maTo >>= aString )
{
- maTo = makeAny( aString == "visible" );
+ maTo <<= aString == "visible";
if( !maTo.has<sal_Bool>() )
SAL_WARN("oox.ppt", "conversion failed" );
}
@@ -291,7 +291,7 @@ namespace oox { namespace ppt {
}
break;
}
- mpNode->getNodeProperties()[ NP_COMMAND ] = makeAny((sal_Int16)nCommand);
+ mpNode->getNodeProperties()[ NP_COMMAND ] <<= (sal_Int16)nCommand;
if( nCommand == EffectCommands::CUSTOM )
{
SAL_WARN("oox.ppt", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
@@ -301,7 +301,7 @@ namespace oox { namespace ppt {
if( aParamValue.Value.hasValue() )
{
Sequence< NamedValue > aParamSeq( &aParamValue, 1 );
- mpNode->getNodeProperties()[ NP_PARAMETER ] = makeAny( aParamSeq );
+ mpNode->getNodeProperties()[ NP_PARAMETER ] <<= aParamSeq;
}
}
catch( RuntimeException& )
@@ -424,8 +424,8 @@ namespace oox { namespace ppt {
if( isCurrentElement( mnElement ) )
{
NodePropertyMap & rProps(mpNode->getNodeProperties());
- rProps[ NP_DIRECTION ] = makeAny( mnDir == XML_cw );
- rProps[ NP_COLORINTERPOLATION ] = makeAny( mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB );
+ rProps[ NP_DIRECTION ] <<= mnDir == XML_cw;
+ rProps[ NP_COLORINTERPOLATION ] <<= mnColorSpace == XML_hsl ? AnimationColorSpace::HSL : AnimationColorSpace::RGB;
const GraphicHelper& rGraphicHelper = getFilter().getGraphicHelper();
if( maToClr.isUsed() )
mpNode->setTo( Any( maToClr.getColor( rGraphicHelper ) ) );
@@ -522,7 +522,7 @@ namespace oox { namespace ppt {
nEnum = AnimationCalcMode::DISCRETE;
break;
}
- aProps[ NP_CALCMODE ] = makeAny(nEnum);
+ aProps[ NP_CALCMODE ] <<= nEnum;
}
OUString aStr;
aStr = xAttribs->getOptionalValue( XML_from );
@@ -612,7 +612,7 @@ namespace oox { namespace ppt {
// TODO what to do with mbZoomContents
mbZoomContents = attribs.getBool( XML_zoomContents, false );
pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
- = makeAny((sal_Int16)AnimationTransformType::SCALE);
+ <<= (sal_Int16)AnimationTransformType::SCALE;
}
virtual void onEndElement() override
@@ -690,7 +690,7 @@ namespace oox { namespace ppt {
AttributeList attribs( xAttribs );
pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
- = makeAny((sal_Int16)AnimationTransformType::ROTATE);
+ <<= (sal_Int16)AnimationTransformType::ROTATE;
// see also DFF_msofbtAnimateRotationData in
// sd/source/filter/ppt/pptinanimations.cxx
if(attribs.hasAttribute( XML_by ) )
@@ -735,7 +735,7 @@ namespace oox { namespace ppt {
: TimeNodeContext( rParent, aElement, xAttribs, pNode )
{
pNode->getNodeProperties()[ NP_TRANSFORMTYPE ]
- = makeAny((sal_Int16)AnimationTransformType::TRANSLATE);
+ <<= (sal_Int16)AnimationTransformType::TRANSLATE;
AttributeList attribs( xAttribs );
sal_Int32 nOrigin = xAttribs->getOptionalValueToken( XML_origin, 0 );
@@ -756,7 +756,7 @@ namespace oox { namespace ppt {
if (aStr.endsWith("E"))
aStr = aStr.copy(0, aStr.getLength() - 1);
aStr = aStr.trim();
- pNode->getNodeProperties()[ NP_PATH ] = makeAny(aStr);
+ pNode->getNodeProperties()[ NP_PATH ] <<= aStr;
mnPathEditMode = xAttribs->getOptionalValueToken( XML_pathEditMode, 0 );
msPtsTypes = xAttribs->getOptionalValue( XML_ptsTypes );
mnAngle = attribs.getInteger( XML_rAng, 0 );
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 9af13d245f0c..a84171949e1f 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -452,13 +452,13 @@ ShapeContextHandler::getShape()
sal_Int32 length = aValue.getLength();
aValue.realloc(length+1);
- diagramDrawing[0] = uno::makeAny( mxFilterBase->importFragment( aFragmentPath ) );
- diagramDrawing[1] = uno::makeAny( pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
- *mxFilterBase, aFragmentPath, "image" ) );
+ diagramDrawing[0] <<= mxFilterBase->importFragment( aFragmentPath );
+ diagramDrawing[1] <<= pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
+ *mxFilterBase, aFragmentPath, "image" );
beans::PropertyValue* pValue = aValue.getArray();
pValue[length].Name = "OOXDrawing";
- pValue[length].Value = uno::makeAny( diagramDrawing );
+ pValue[length].Value <<= diagramDrawing;
pShapePtr->setDiagramDoms( aValue );
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index bfc2f5c4e43b..0ed5f9024ccc 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -107,7 +107,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
if (static_cast<long>(basegfx::rad2deg(fRotate)) != NormAngle360(static_cast<long>(nRotation) * 100) / 100)
{
comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
- aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation);
+ aCustomShapeGeometry["TextPreRotateAngle"] <<= nRotation;
xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
}
}
@@ -181,7 +181,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
oox::OptValue<OUString> presetShapeName = rAttribs.getString(XML_prst);
const OUString& preset = presetShapeName.get();
comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
- aCustomShapeGeometry["PresetTextWarp"] = uno::makeAny(preset);
+ aCustomShapeGeometry["PresetTextWarp"] <<= preset;
xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
}
break;
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e90ee9093970..8def04fd7fe4 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -395,14 +395,14 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
length = aGrabBag.getLength();
aGrabBag.realloc( length+1 );
aGrabBag[length].Name = "VML-Z-ORDER";
- aGrabBag[length].Value = uno::makeAny( maTypeModel.maZIndex.toInt32() );
+ aGrabBag[length].Value <<= maTypeModel.maZIndex.toInt32();
if( !s_mso_next_textbox.isEmpty() )
{
length = aGrabBag.getLength();
aGrabBag.realloc( length+1 );
aGrabBag[length].Name = "mso-next-textbox";
- aGrabBag[length].Value = uno::makeAny( s_mso_next_textbox );
+ aGrabBag[length].Value <<= s_mso_next_textbox;
}
if( !sLinkChainName.isEmpty() )
@@ -410,13 +410,13 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS
length = aGrabBag.getLength();
aGrabBag.realloc( length+4 );
aGrabBag[length].Name = "TxbxHasLink";
- aGrabBag[length].Value = uno::makeAny( true );
+ aGrabBag[length].Value <<= true;
aGrabBag[length+1].Name = "Txbx-Id";
- aGrabBag[length+1].Value = uno::makeAny( id );
+ aGrabBag[length+1].Value <<= id;
aGrabBag[length+2].Name = "Txbx-Seq";
- aGrabBag[length+2].Value = uno::makeAny( seq );
+ aGrabBag[length+2].Value <<= seq;
aGrabBag[length+3].Name = "LinkChainName";
- aGrabBag[length+3].Value = uno::makeAny( sLinkChainName );
+ aGrabBag[length+3].Value <<= sLinkChainName;
}
propertySet->setPropertyValue( "InteropGrabBag", uno::makeAny(aGrabBag) );
}
@@ -704,7 +704,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
xPropertySet->getPropertyValue("FrameInteropGrabBag") >>= aGrabBag;
beans::PropertyValue aPair;
aPair.Name = "mso-layout-flow-alt";
- aPair.Value = uno::makeAny(maTypeModel.maLayoutFlowAlt);
+ aPair.Value <<= maTypeModel.maLayoutFlowAlt;
if (aGrabBag.hasElements())
{
sal_Int32 nLength = aGrabBag.getLength();
@@ -806,13 +806,13 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
if (bFlipX)
{
aPropSequence [nPropertyIndex].Name = "MirroredX";
- aPropSequence [nPropertyIndex].Value = makeAny (bFlipX);
+ aPropSequence [nPropertyIndex].Value <<= bFlipX;
nPropertyIndex++;
}
if (bFlipY)
{
aPropSequence [nPropertyIndex].Name = "MirroredY";
- aPropSequence [nPropertyIndex].Value = makeAny (bFlipY);
+ aPropSequence [nPropertyIndex].Value <<= bFlipY;
}
aPropertySet.setAnyProperty(PROP_CustomShapeGeometry, makeAny( aPropSequence ) );
}
@@ -1270,7 +1270,7 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
beans::PropertyValue aPair;
aPair.Name = "mso-edit-as";
- aPair.Value = uno::makeAny(maTypeModel.maEditAs);
+ aPair.Value <<= maTypeModel.maEditAs;
if (aGrabBag.hasElements())
{
sal_Int32 nLength = aGrabBag.getLength();
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 395bf1e3c1ea..ac8c51273d77 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -85,13 +85,13 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
if (rFont.mobBold.has())
{
aPropertyValue.Name = "CharWeight";
- aPropertyValue.Value = uno::makeAny(rFont.mobBold.get() ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL);
+ aPropertyValue.Value <<= rFont.mobBold.get() ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
aPropVec.push_back(aPropertyValue);
}
if (rFont.monSize.has())
{
aPropertyValue.Name = "CharHeight";
- aPropertyValue.Value = uno::makeAny(double(rFont.monSize.get()) / 2.);
+ aPropertyValue.Value <<= double(rFont.monSize.get()) / 2.;
aPropVec.push_back(aPropertyValue);
}
if (rFont.monSpacing.has())
@@ -100,7 +100,7 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
// Value is not converted to mm100: SvxKerningItem::PutValue() gets
// called with nMemberId = 0, so no mm100 -> twips conversion will
// be done there.
- aPropertyValue.Value = uno::makeAny(sal_Int16(rFont.monSpacing.get()));
+ aPropertyValue.Value <<= sal_Int16(rFont.monSpacing.get());
aPropVec.push_back(aPropertyValue);
}
if (rParagraph.moParaAdjust.has())
@@ -112,13 +112,13 @@ void TextBox::convert(const uno::Reference<drawing::XShape>& xShape) const
eAdjust = style::ParagraphAdjust_RIGHT;
aPropertyValue.Name = "ParaAdjust";
- aPropertyValue.Value = uno::makeAny(eAdjust);
+ aPropertyValue.Value <<= eAdjust;
aPropVec.push_back(aPropertyValue);
}
if (rFont.moColor.has())
{
aPropertyValue.Name = "CharColor";
- aPropertyValue.Value = uno::makeAny(rFont.moColor.get().toUInt32(16));
+ aPropertyValue.Value <<= rFont.moColor.get().toUInt32(16);
aPropVec.push_back(aPropertyValue);
}
xTextAppend->appendTextPortion(aIt->maText, comphelper::containerToSequence(aPropVec));
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index a51060db812f..0238c586577a 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -861,7 +861,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
}
if( mappedObject.is() )
{
- a = css::uno::makeAny( mappedObject );
+ a <<= mappedObject;
}
else
{
@@ -967,7 +967,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
fprintf( stderr, "Python exception: %s\n",
OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
#endif
- ret = css::uno::makeAny( e );
+ ret <<= e;
}
return ret;
}
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 95f94d52b81e..40a3ebc638c1 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -127,7 +127,7 @@ void ScCellRangeObj::testSortOOB()
aSort[0].SortAscending = true;
aProps[0].Name = "SortFields";
- aProps[0].Value = uno::makeAny(aSort);
+ aProps[0].Value <<= aSort;
xSortable->sort(aProps);
}
diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
index 0f8119995929..8fc4eaca3916 100644
--- a/sc/qa/extras/sccondformats.cxx
+++ b/sc/qa/extras/sccondformats.cxx
@@ -81,15 +81,15 @@ void ScConditionalFormatTest::testCondFormat()
uno::Sequence< beans::PropertyValue > aPropertyValueList(5);
aPropertyValueList[0].Name = SC_UNONAME_STYLENAME;
- aPropertyValueList[0].Value = uno::makeAny<OUString>("Result2");
+ aPropertyValueList[0].Value <<= OUString("Result2");
aPropertyValueList[1].Name = SC_UNONAME_FORMULA1;
- aPropertyValueList[1].Value = uno::makeAny<OUString>("$Sheet1.$B$2");
+ aPropertyValueList[1].Value <<= OUString("$Sheet1.$B$2");
aPropertyValueList[2].Name = SC_UNONAME_FORMULA2;
- aPropertyValueList[2].Value = uno::makeAny<OUString>("$Sheet1.$A$2");
+ aPropertyValueList[2].Value <<= OUString("$Sheet1.$A$2");
aPropertyValueList[3].Name = SC_UNONAME_OPERATOR;
aPropertyValueList[3].Value <<= sheet::ConditionOperator_EQUAL;
aPropertyValueList[4].Name = SC_UNONAME_SOURCEPOS;
- aPropertyValueList[4].Value = uno::makeAny(table::CellAddress(0, 0, 16));
+ aPropertyValueList[4].Value <<= table::CellAddress(0, 0, 16);
xSheetConditionalEntries->addNew(aPropertyValueList);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSheetConditionalEntries->getCount());
xProps->setPropertyValue(SC_UNONAME_CONDFMT, uno::makeAny(xSheetConditionalEntries));
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 93701696d49d..09904856fd65 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1346,7 +1346,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
aData[nRow-nDataStartRow].getLength() > nCol-nDataStartCol)
aResData.Result = aData[nRow-nDataStartRow][nCol-nDataStartCol];
- rPosData.PositionData = makeAny(aResData);
+ rPosData.PositionData <<= aResData;
return;
}
case DataPilotTablePositionType::COLUMN_HEADER:
@@ -1375,7 +1375,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
aHeaderData.Hierarchy = static_cast<sal_Int32>(pColFields[nField].mnHier);
aHeaderData.Level = static_cast<sal_Int32>(pColFields[nField].mnLevel);
- rPosData.PositionData = makeAny(aHeaderData);
+ rPosData.PositionData <<= aHeaderData;
return;
}
case DataPilotTablePositionType::ROW_HEADER:
@@ -1404,7 +1404,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
aHeaderData.Hierarchy = static_cast<sal_Int32>(pRowFields[nField].mnHier);
aHeaderData.Level = static_cast<sal_Int32>(pRowFields[nField].mnLevel);
- rPosData.PositionData = makeAny(aHeaderData);
+ rPosData.PositionData <<= aHeaderData;
return;
}
}
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 3821afb28a05..08d2d6bcd1a6 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -206,13 +206,13 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput,
aValStr = pCell->GetString().getString();
}
if ( bIsValue )
- aParams[0] = css::uno::makeAny( nValue );
+ aParams[0] <<= nValue;
else
- aParams[0] = css::uno::makeAny( OUString( aValStr ) );
+ aParams[0] <<= aValStr;
// 2) Position of the cell
OUString aPosStr(rPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDocument, pDocument->GetAddressConvention()));
- aParams[1] = css::uno::makeAny(aPosStr);
+ aParams[1] <<= aPosStr;
// use link-update flag to prevent closing the document
// while the macro is running
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b6e069e3451b..1a0e433057bb 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3107,7 +3107,7 @@ static bool lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPa
uno::Reference<table::XCellRange> xCellRange = ScCellRangeObj::CreateRangeFromDoc( pDok, aRange );
uno::Sequence< uno::Any > aArgs(2);
aArgs[0] = lcl_getSheetModule( xCellRange, pDok );
- aArgs[1] = uno::Any( xCellRange );
+ aArgs[1] <<= xCellRange;
xVBARange = ooo::vba::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
if ( xVBARange.is() )
{
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 8e7d88a5092f..f84fdf29208b 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -298,7 +298,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere
// insert spacer
uno::Sequence< beans::PropertyValue > sProps( 1 );
sProps[ 0 ].Name = "Type";
- sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE );
+ sProps[ 0 ].Value <<= ui::ItemType::SEPARATOR_LINE;
toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );
}
toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( comphelper::containerToSequence(props) ) );
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 537a43c8baf4..36705555e8a3 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -136,13 +136,13 @@ void ScXMLSortContext::EndElement()
++i;
uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i);
aSortDescriptor[0].Name = SC_UNONAME_BINDFMT;
- aSortDescriptor[0].Value = css::uno::makeAny(bBindFormatsToContent);
+ aSortDescriptor[0].Value <<= bBindFormatsToContent;
aSortDescriptor[1].Name = SC_UNONAME_COPYOUT;
- aSortDescriptor[1].Value = css::uno::makeAny(bCopyOutputData);
+ aSortDescriptor[1].Value <<= bCopyOutputData;
aSortDescriptor[2].Name = SC_UNONAME_ISCASE;
- aSortDescriptor[2].Value = css::uno::makeAny(bIsCaseSensitive);
+ aSortDescriptor[2].Value <<= bIsCaseSensitive;
aSortDescriptor[3].Name = SC_UNONAME_ISULIST;
- aSortDescriptor[3].Value = css::uno::makeAny(bEnabledUserList);
+ aSortDescriptor[3].Value <<= bEnabledUserList;
aSortDescriptor[4].Name = SC_UNONAME_OUTPOS;
aSortDescriptor[4].Value <<= aOutputPosition;
aSortDescriptor[5].Name = SC_UNONAME_UINDEX;
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index ab273e3202e6..d566abfe8d19 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -544,7 +544,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAtt
{
if (sLeftMarginName == pAttribs[i].Name)
{
- pAttribs[i].Value = uno::makeAny( nParaIndent );
+ pAttribs[i].Value <<= nParaIndent;
break;
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index ceee7ec0e45c..f4d219044b2a 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -485,7 +485,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.OldValue = uno::makeAny(uno::Reference<XAccessible>(pCurrentChild));
+ aEvent.OldValue <<= uno::Reference<XAccessible>(pCurrentChild);
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
@@ -495,7 +495,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.NewValue = uno::makeAny(uno::Reference<XAccessible>(pReplacement.get()));
+ aEvent.NewValue <<= uno::Reference<XAccessible>(pReplacement.get());
mpAccessibleDocument->CommitChange(aEvent); // child is new - event
bResult = true;
@@ -1304,7 +1304,7 @@ void ScChildrenShapes::RemoveShape(const uno::Reference<drawing::XShape>& xShape
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.OldValue = uno::makeAny(xOldAccessible);
+ aEvent.OldValue <<= xOldAccessible;
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
}
@@ -2335,7 +2335,7 @@ css::uno::Sequence< css::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence
{
if ( xSelContext->getAccessibleRole() == AccessibleRole::TABLE_CELL )
{
- aSequence[nParaCount] = uno::makeAny( xSel );
+ aSequence[nParaCount] <<= xSel;
nParaCount++;
}
}
@@ -2381,7 +2381,7 @@ css::uno::Sequence< css::uno::Any >
if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xSel );
+ aRet[0] <<= xSel;
return aRet;
}
}
@@ -2412,7 +2412,7 @@ css::uno::Sequence< css::uno::Any >
xChildSelContext->getAccessibleRole() == css::accessibility::AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xChildSel );
+ aRet[0] <<= xChildSel;
return aRet;
}
}
@@ -2439,7 +2439,7 @@ css::uno::Sequence< css::uno::Any >
uno::Reference < XAccessible > xFindCellAcc = mpAccessibleSpreadsheet->GetActiveCell();
// add xFindCellAcc to the return the Sequence
uno::Sequence< uno::Any> aSeq2(1);
- aSeq2[0] = uno::makeAny( xFindCellAcc );
+ aSeq2[0] <<= xFindCellAcc;
return aSeq2;
}
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index f3fc65b0bed8..85bc9c31da63 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -113,7 +113,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
- aEvent.OldValue = uno::makeAny(uno::Reference<XAccessible>(aOldAreas[i].get()));
+ aEvent.OldValue <<= uno::Reference<XAccessible>(aOldAreas[i].get());
CommitChange(aEvent); // child gone - event
aOldAreas[i]->dispose();
@@ -123,7 +123,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
- aEvent.NewValue = uno::makeAny(uno::Reference<XAccessible>(maAreas[i].get()));
+ aEvent.NewValue <<= uno::Reference<XAccessible>(maAreas[i].get());
CommitChange(aEvent); // new child - event
}
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index f8ea191ae938..ee9f22a3d5e4 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -338,9 +338,9 @@ void ScAccessibleSpreadsheet::CompleteSelectionChanged(bool bNewState)
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::STATE_CHANGED;
if (bNewState)
- aEvent.NewValue = uno::makeAny(AccessibleStateType::SELECTED);
+ aEvent.NewValue <<= AccessibleStateType::SELECTED;
else
- aEvent.OldValue = uno::makeAny(AccessibleStateType::SELECTED);
+ aEvent.OldValue <<= AccessibleStateType::SELECTED;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
CommitChange(aEvent);
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index d2d23823b8c9..dfee80e32e7d 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -632,12 +632,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
aParam1.Name = "ParentWindow";
- aParam1.Value = uno::makeAny(xDialogParentWindow);
+ aParam1.Value <<= xDialogParentWindow;
beans::PropertyValue aParam2;
aParam2.Name = "ChartModel";
- aParam2.Value = uno::makeAny(xChartModel);
- pArray[0] = uno::makeAny(aParam1);
- pArray[1] = uno::makeAny(aParam2);
+ aParam2.Value <<= xChartModel;
+ pArray[0] <<= aParam1;
+ pArray[1] <<= aParam2;
xInit->initialize( aSeq );
// try to set the dialog's position so it doesn't hide the chart
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 353ddec0180c..b5d460dba5ec 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1651,7 +1651,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
pArray[0].Value <<= aPageSize;
// #i111158# all positions are relative to the whole page, including non-printable area
pArray[1].Name = SC_UNONAME_INC_NP_AREA;
- pArray[1].Value = uno::makeAny( true );
+ pArray[1].Value <<= true;
if ( bWasCellRange )
{
table::CellRangeAddress aRangeAddress( nTab,
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 0f15c36fdf64..6b2fac6b79e8 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -87,8 +87,8 @@ public:
{
uno::Sequence< uno::Any > aArgs(2);
// access the application object ( parent for workbook )
- aArgs[0] = uno::Any( ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.Application", uno::Sequence< uno::Any >() ) );
- aArgs[1] = uno::Any( mpDocShell->GetModel() );
+ aArgs[0] <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.Application", uno::Sequence< uno::Any >() );
+ aArgs[1] <<= mpDocShell->GetModel();
maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
}
@@ -123,8 +123,8 @@ public:
uno::Reference< sheet::XSpreadsheet > xSheet( xIndexAccess->getByIndex( i ), uno::UNO_QUERY_THROW );
uno::Sequence< uno::Any > aArgs(3);
aArgs[0] = maWorkbook;
- aArgs[1] = uno::Any( xModel );
- aArgs[2] = uno::Any( OUString( sSheetName ) );
+ aArgs[1] <<= xModel;
+ aArgs[2] <<= sSheetName;
// use the convience function
maCachedObject <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
break;
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 11bd37d775c8..f43a0723d8e4 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -887,7 +887,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN
if ( nResId > 0 )
{
OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) );
- aRet = uno::makeAny( sDisplayName );
+ aRet <<= sDisplayName;
}
}
else
@@ -1294,9 +1294,9 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName )
{
const ScPageScaleToItem aItem(static_cast<const ScPageScaleToItem&>(pItemSet->Get(nWhich)));
if ( aPropertyName == SC_UNO_PAGE_SCALETOX )
- aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetWidth()));
+ aAny <<= static_cast<sal_Int16>(aItem.GetWidth());
else
- aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetHeight()));
+ aAny <<= static_cast<sal_Int16>(aItem.GetHeight());
}
break;
default:
@@ -1873,15 +1873,15 @@ uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName )
{
ScPageScaleToItem aItem(static_cast<const ScPageScaleToItem&>(pItemSet->Get(ATTR_PAGE_SCALETO)));
if ( aPropertyName == SC_UNO_PAGE_SCALETOX )
- aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetWidth()));
+ aAny <<= static_cast<sal_Int16>(aItem.GetWidth());
else
- aAny = uno::makeAny(static_cast<sal_Int16>(aItem.GetHeight()));
+ aAny <<= static_cast<sal_Int16>(aItem.GetHeight());
}
break;
case ATTR_HIDDEN:
{
bool bHidden = pStyle && pStyle->IsHidden();
- aAny = uno::makeAny( bHidden );
+ aAny <<= bHidden;
}
break;
default:
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 9e5f5c025714..185e597e257a 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -50,7 +50,7 @@ public:
{
uno::Reference< table::XTableChart > xTableChart( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
// parent Object is sheet
- ret = uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) ) );
+ ret <<= uno::Reference< excel::XChartObject > ( new ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) );
}
catch (const lang::WrappedTargetException&)
{
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index f9161b979335..cbd390032938 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -89,21 +89,21 @@ ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment)
switch (nAlignment)
{
case excel::XlVAlign::xlVAlignBottom :
- aVal = uno::makeAny( table::CellVertJustify2::BOTTOM );
+ aVal <<= table::CellVertJustify2::BOTTOM;
break;
case excel::XlVAlign::xlVAlignCenter :
- aVal = uno::makeAny( table::CellVertJustify2::CENTER );
+ aVal <<= table::CellVertJustify2::CENTER;
break;
case excel::XlVAlign::xlVAlignDistributed:
case excel::XlVAlign::xlVAlignJustify:
- aVal = uno::makeAny( table::CellVertJustify2::STANDARD );
+ aVal <<= table::CellVertJustify2::STANDARD;
break;
case excel::XlVAlign::xlVAlignTop:
- aVal = uno::makeAny( table::CellVertJustify2::TOP);
+ aVal <<= table::CellVertJustify2::TOP;
break;
default:
- aVal = uno::makeAny( table::CellVertJustify2::STANDARD );
+ aVal <<= table::CellVertJustify2::STANDARD;
break;
}
mxPropertySet->setPropertyValue( SC_UNONAME_CELLVJUS, aVal );
@@ -128,16 +128,16 @@ ScVbaFormat< Ifc... >::getVerticalAlignment( )
switch( aAPIAlignment )
{
case table::CellVertJustify2::BOTTOM:
- aResult = uno::makeAny( excel::XlVAlign::xlVAlignBottom );
+ aResult <<= excel::XlVAlign::xlVAlignBottom;
break;
case table::CellVertJustify2::CENTER:
- aResult = uno::makeAny( excel::XlVAlign::xlVAlignCenter );
+ aResult <<= excel::XlVAlign::xlVAlignCenter;
break;
case table::CellVertJustify2::STANDARD:
- aResult = uno::makeAny( excel::XlVAlign::xlVAlignBottom );
+ aResult <<= excel::XlVAlign::xlVAlignBottom;
break;
case table::CellVertJustify2::TOP:
- aResult = uno::makeAny( excel::XlVAlign::xlVAlignTop );
+ aResult <<= excel::XlVAlign::xlVAlignTop;
break;
default:
break;
@@ -164,19 +164,19 @@ ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignme
switch ( nAlignment )
{
case excel::XlHAlign::xlHAlignJustify:
- aVal = uno::makeAny( table::CellHoriJustify_BLOCK);
+ aVal <<= table::CellHoriJustify_BLOCK;
break;
case excel::XlHAlign::xlHAlignCenter:
- aVal = uno::makeAny( table::CellHoriJustify_CENTER );
+ aVal <<= table::CellHoriJustify_CENTER;
break;
case excel::XlHAlign::xlHAlignDistributed:
- aVal = uno::makeAny( table::CellHoriJustify_BLOCK);
+ aVal <<= table::CellHoriJustify_BLOCK;
break;
case excel::XlHAlign::xlHAlignLeft:
- aVal = uno::makeAny( table::CellHoriJustify_LEFT);
+ aVal <<= table::CellHoriJustify_LEFT;
break;
case excel::XlHAlign::xlHAlignRight:
- aVal = uno::makeAny( table::CellHoriJustify_RIGHT);
+ aVal <<= table::CellHoriJustify_RIGHT;
break;
}
// #FIXME what about the default case above?
@@ -208,16 +208,16 @@ ScVbaFormat< Ifc... >::getHorizontalAlignment( )
switch( aAPIAlignment )
{
case table::CellHoriJustify_BLOCK:
- NRetAlignment = uno::makeAny( excel::XlHAlign::xlHAlignJustify );
+ NRetAlignment <<= excel::XlHAlign::xlHAlignJustify;
break;
case table::CellHoriJustify_CENTER:
- NRetAlignment = uno::makeAny( excel::XlHAlign::xlHAlignCenter );
+ NRetAlignment <<= excel::XlHAlign::xlHAlignCenter;
break;
case table::CellHoriJustify_LEFT:
- NRetAlignment = uno::makeAny( excel::XlHAlign::xlHAlignLeft );
+ NRetAlignment <<= excel::XlHAlign::xlHAlignLeft;
break;
case table::CellHoriJustify_RIGHT:
- NRetAlignment = uno::makeAny( excel::XlHAlign::xlHAlignRight );
+ NRetAlignment <<= excel::XlHAlign::xlHAlignRight;
break;
default: // handle those other cases with a NULL return
break;
@@ -245,17 +245,17 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation )
switch( nOrientation )
{
case excel::XlOrientation::xlDownward:
- aVal = uno::makeAny( table::CellOrientation_TOPBOTTOM);
+ aVal <<= table::CellOrientation_TOPBOTTOM;
break;
case excel::XlOrientation::xlHorizontal:
- aVal = uno::makeAny( table::CellOrientation_STANDARD );
+ aVal <<= table::CellOrientation_STANDARD;
mxPropertySet->setPropertyValue( SC_UNONAME_ROTANG, uno::makeAny( sal_Int32(0) ) );
break;
case excel::XlOrientation::xlUpward:
- aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP);
+ aVal <<= table::CellOrientation_BOTTOMTOP;
break;
case excel::XlOrientation::xlVertical:
- aVal = uno::makeAny( table::CellOrientation_STACKED);
+ aVal <<= table::CellOrientation_STACKED;
break;
}
// #FIXME what about the default case above?
@@ -285,19 +285,19 @@ ScVbaFormat< Ifc... >::getOrientation( )
switch(aOrientation)
{
case table::CellOrientation_STANDARD:
- NRetOrientation = uno::makeAny( excel::XlOrientation::xlHorizontal );
+ NRetOrientation <<= excel::XlOrientation::xlHorizontal;
break;
case table::CellOrientation_BOTTOMTOP:
- NRetOrientation = uno::makeAny( excel::XlOrientation::xlUpward );
+ NRetOrientation <<= excel::XlOrientation::xlUpward;
break;
case table::CellOrientation_TOPBOTTOM:
- NRetOrientation = uno::makeAny( excel::XlOrientation::xlDownward );
+ NRetOrientation <<= excel::XlOrientation::xlDownward;
break;
case table::CellOrientation_STACKED:
- NRetOrientation = uno::makeAny( excel::XlOrientation::xlVertical );
+ NRetOrientation <<= excel::XlOrientation::xlVertical;
break;
default:
- NRetOrientation = uno::makeAny( excel::XlOrientation::xlHorizontal );
+ NRetOrientation <<= excel::XlOrientation::xlHorizontal;
}
}
}
@@ -390,7 +390,7 @@ ScVbaFormat< Ifc... >::getNumberFormatLocal( )
OUString sFormat;
xNumberFormats->getByKey(nFormat)->getPropertyValue( FORMATSTRING ) >>= sFormat;
- aRet = uno::makeAny( sFormat.toAsciiLowerCase() );
+ aRet <<= sFormat.toAsciiLowerCase();
}
}
@@ -498,9 +498,9 @@ ScVbaFormat< Ifc... >::getIndentLevel( )
{
sal_Int16 IndentLevel = 0;
if ( ( mxPropertySet->getPropertyValue(sParaIndent) >>= IndentLevel ) )
- NRetIndentLevel = uno::makeAny( sal_Int32( rtl::math::round(static_cast<double>( IndentLevel ) / 352.8)) );
+ NRetIndentLevel <<= sal_Int32( rtl::math::round(static_cast<double>( IndentLevel ) / 352.8));
else
- NRetIndentLevel = uno::makeAny( sal_Int32(0) );
+ NRetIndentLevel <<= sal_Int32(0);
}
}
catch (const uno::Exception&)
@@ -568,13 +568,13 @@ ScVbaFormat< Ifc... >::getLocked( )
const ScProtectionAttr& rProtAttr = static_cast<const ScProtectionAttr &>( pDataSet->Get(ATTR_PROTECTION) );
SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION);
if(eState != SfxItemState::DONTCARE)
- aCellProtection = uno::makeAny(rProtAttr.GetProtection());
+ aCellProtection <<= rProtAttr.GetProtection();
}
else // fallback to propertyset
{
util::CellProtection cellProtection;
mxPropertySet->getPropertyValue(sCellProt) >>= cellProtection;
- aCellProtection = uno::makeAny( cellProtection.IsLocked );
+ aCellProtection <<= cellProtection.IsLocked;
}
}
}
@@ -601,13 +601,13 @@ ScVbaFormat< Ifc... >::getFormulaHidden( )
const ScProtectionAttr& rProtAttr = static_cast<const ScProtectionAttr &>( pDataSet->Get(ATTR_PROTECTION) );
SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION);
if(eState != SfxItemState::DONTCARE)
- aBoolRet = uno::makeAny(rProtAttr.GetHideFormula());
+ aBoolRet <<= rProtAttr.GetHideFormula();
}
else
{
util::CellProtection aCellProtection;
mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection;
- aBoolRet = uno::makeAny( aCellProtection.IsFormulaHidden );
+ aBoolRet <<= aCellProtection.IsFormulaHidden;
}
}
}
@@ -664,10 +664,10 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder )
switch(nReadingOrder)
{
case excel::Constants::xlLTR:
- aVal = uno::makeAny( text::WritingMode_LR_TB );
+ aVal <<= text::WritingMode_LR_TB;
break;
case excel::Constants::xlRTL:
- aVal = uno::makeAny( text::WritingMode_RL_TB );
+ aVal <<= text::WritingMode_RL_TB;
break;
case excel::Constants::xlContext:
DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
@@ -698,13 +698,13 @@ ScVbaFormat< Ifc... >::getReadingOrder( )
if ( ( mxPropertySet->getPropertyValue(sWritingMode) ) >>= aWritingMode )
switch (aWritingMode){
case text::WritingMode_LR_TB:
- NRetReadingOrder = uno::makeAny(excel::Constants::xlLTR);
+ NRetReadingOrder <<= excel::Constants::xlLTR;
break;
case text::WritingMode_RL_TB:
- NRetReadingOrder = uno::makeAny(excel::Constants::xlRTL);
+ NRetReadingOrder <<= excel::Constants::xlRTL;
break;
default:
- NRetReadingOrder = uno::makeAny(excel::Constants::xlRTL);
+ NRetReadingOrder <<= excel::Constants::xlRTL;
}
}
}
@@ -733,7 +733,7 @@ ScVbaFormat< Ifc... >::getNumberFormat( )
sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, m_aDefaultLocale );
OUString sFormat;
xNumberFormats->getByKey(nNewFormat)->getPropertyValue( FORMATSTRING ) >>= sFormat;
- aFormat = uno::makeAny( sFormat );
+ aFormat <<= sFormat;
}
}
catch (const uno::Exception& )
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 7514695a553e..3e326f087c1c 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -166,9 +166,9 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
uno::Any aValue;
if ( aType == sheet::ConditionOperator_FORMULA)
- aValue = uno::makeAny( sheet::ConditionOperator_FORMULA );
+ aValue <<= sheet::ConditionOperator_FORMULA;
else
- aValue = uno::makeAny( ScVbaFormatCondition::retrieveAPIOperator(_aOperator) );
+ aValue <<= ScVbaFormatCondition::retrieveAPIOperator(_aOperator);
beans::PropertyValue aProperty( "Operator", 0, aValue, beans::PropertyState_DIRECT_VALUE );
aPropertyValueVector.push_back( aProperty );
@@ -184,7 +184,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
aPropertyValueVector.push_back( aProp );
}
aProperty.Name = "StyleName";
- aProperty.Value = uno::makeAny( sStyleName );
+ aProperty.Value <<= sStyleName;
mxSheetConditionalEntries->addNew(comphelper::containerToSequence(aPropertyValueVector));
for (sal_Int32 i = mxSheetConditionalEntries->getCount()-1; i >= 0; i--)
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 9799067e26e1..2898cbbd9d4d 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -42,9 +42,9 @@ ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Referen
{
uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
aInitArgs[ 0 ].Name = "Application";
- aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
+ aInitArgs[ 0 ].Value <<= getApplication();
aInitArgs[ 1 ].Name = "ExcelDocumentContext";
- aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
+ aInitArgs[ 1 ].Value <<= getXSomethingFromArgs< frame::XModel >( aArgs, 0 );
init( aInitArgs );
}
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index e11234142647..2eb8a4588c88 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -849,9 +849,9 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference<
uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
NumFormatHelper cellFormat( xRange );
if ( cellFormat.isBooleanType() )
- aValue = uno::makeAny( ( xCell->getValue() != 0.0 ) );
+ aValue <<= ( xCell->getValue() != 0.0 );
else if ( cellFormat.isDateType() )
- aValue = uno::makeAny( bridge::oleautomation::Date( xCell->getValue() ) );
+ aValue <<= bridge::oleautomation::Date( xCell->getValue() );
else
aValue <<= xCell->getValue();
}
@@ -2064,7 +2064,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
// force external to be false
// only first address should have the
// document and sheet specifications
- aExternalCopy = uno::makeAny(false);
+ aExternalCopy <<= false;
}
sAddress += xRange->Address( RowAbsolute, ColumnAbsolute, ReferenceStyle, aExternalCopy, RelativeTo );
}
@@ -5601,7 +5601,7 @@ ScVbaRange::hasError()
uno::Sequence< uno::Any > Params(1);
uno::Reference< excel::XRange > aRange( this );
- Params[0] = uno::makeAny( aRange );
+ Params[0] <<= aRange;
uno::Sequence< sal_Int16 > OutParamIndex;
uno::Sequence< uno::Any > OutParam;
xInvoc->invoke( "IsError", Params, OutParamIndex, OutParam ) >>= dResult;
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 3c2bdda52ccd..fdecac1f9071 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -87,10 +87,10 @@ ScVbaWorkbook::Colors( const ::uno::Any& Index )
{
sal_Int32 nIndex = 0;
Index >>= nIndex;
- aRet = uno::makeAny( XLRGBToOORGB( ColorData[ --nIndex ] ) );
+ aRet <<= XLRGBToOORGB( ColorData[ --nIndex ] );
}
else
- aRet = uno::makeAny( ColorData );
+ aRet <<= ColorData;
return aRet;
}
@@ -104,29 +104,29 @@ bool ScVbaWorkbook::setFilterPropsFromFormat( sal_Int32 nFormat, uno::Sequence<
switch( nFormat )
{
case excel::XlFileFormat::xlCSV:
- rProps[ index ].Value = uno::Any( OUString("Text - txt - csv (StarCalc)") );
+ rProps[ index ].Value <<= OUString("Text - txt - csv (StarCalc)");
break;
case excel::XlFileFormat::xlDBF4:
- rProps[ index ].Value = uno::Any( OUString("DBF") );
+ rProps[ index ].Value <<= OUString("DBF");
break;
case excel::XlFileFormat::xlDIF:
- rProps[ index ].Value = uno::Any( OUString("DIF") );
+ rProps[ index ].Value <<= OUString("DIF");
break;
case excel::XlFileFormat::xlWK3:
- rProps[ index ].Value = uno::Any( OUString("Lotus") );
+ rProps[ index ].Value <<= OUString("Lotus");
break;
case excel::XlFileFormat::xlExcel4Workbook:
- rProps[ index ].Value = uno::Any( OUString("MS Excel 4.0") );
+ rProps[ index ].Value <<= OUString("MS Excel 4.0");
break;
case excel::XlFileFormat::xlExcel5:
- rProps[ index ].Value = uno::Any( OUString("MS Excel 5.0/95") );
+ rProps[ index ].Value <<= OUString("MS Excel 5.0/95");
break;
case excel::XlFileFormat::xlHtml:
- rProps[ index ].Value = uno::Any( OUString("HTML (StarCalc)") );
+ rProps[ index ].Value <<= OUString("HTML (StarCalc)");
break;
case excel::XlFileFormat::xlExcel9795:
default:
- rProps[ index ].Value = uno::Any( OUString("MS Excel 97") );
+ rProps[ index ].Value <<= OUString("MS Excel 97");
break;
}
bRes = true;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 953a7ed7f0d3..88c6fbc49db9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1757,8 +1757,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value = makeAny(xDialogParentWindow);
- pArray[0] = makeAny(aParam);
+ aParam.Value <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 31570339d737..30be7b53a730 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -406,7 +406,7 @@ void ScriptProtocolHandler::createScriptProvider()
Any aContext;
if ( getScriptInvocation() )
- aContext = makeAny( m_xScriptInvocation );
+ aContext <<= m_xScriptInvocation;
m_xScriptProvider.set( xFac->createScriptProvider( aContext ), UNO_QUERY_THROW );
}
}
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 379f2fe48e16..1552292e5df6 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1456,7 +1456,7 @@ void SdTiledRenderingTest::testTdf104405()
// trigger the clone-formatting/paintbrush command to copy formatting contents of cell
uno::Sequence< beans::PropertyValue > aArgs(1);
aArgs[0].Name = "PersistentCopy";
- aArgs[0].Value = uno::makeAny(true);
+ aArgs[0].Value <<= true;
comphelper::dispatchCommand(".uno:FormatPaintbrush", aArgs);
Scheduler::ProcessEventsToIdle();
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 230900ac81a4..e23930d05d4c 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -941,7 +941,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
}
else
{
- aTo = makeAny( false );
+ aTo <<= false;
aAttributeName = "Visibility";
}
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 76e00b457c96..8b2fa727dbb9 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -370,7 +370,7 @@ bool PowerPointExport::exportDocument()
std::vector< PropertyValue > aProperties;
PropertyValue aProperty;
aProperty.Name = sBaseURI;
- aProperty.Value = makeAny( getFileUrl() );
+ aProperty.Value <<= getFileUrl();
aProperties.push_back( aProperty );
exportPPT(aProperties);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 2c3574f93d52..22b21c66c063 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2432,7 +2432,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
if( bHasValue )
{
- aValues[nKeyTime] = makeAny( ValuePair( aValue1, aValue2 ) );
+ aValues[nKeyTime] <<= ValuePair( aValue1, aValue2 );
}
else
{
@@ -2797,7 +2797,7 @@ void AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rT
rTarget >>= aParaTarget.Shape;
/* FIXME: Paragraph should be sal_Int32 as well */
aParaTarget.Paragraph = static_cast<sal_Int16>(nPara);
- rTarget = makeAny( aParaTarget );
+ rTarget <<= aParaTarget;
rSubType = ShapeAnimationSubType::ONLY_TEXT;
dump( " paragraph %d,", (sal_Int32)nPara);
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index b66cd3f2294c..cec616602373 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -167,7 +167,7 @@ bool SdPPTFilter::Export()
std::vector< PropertyValue > aProperties;
PropertyValue aProperty;
aProperty.Name = "BaseURI";
- aProperty.Value = makeAny( mrMedium.GetBaseURL( true ) );
+ aProperty.Value <<= mrMedium.GetBaseURL( true );
aProperties.push_back( aProperty );
bRet = PPTExport( aProperties, xStorRef, mxModel, mxStatusIndicator, pBas, nCnvrtFlags );
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 0e43dede5120..6a597c6d95ce 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -841,7 +841,7 @@ css::uno::Sequence< css::uno::Any >
if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xSel );
+ aRet[0] <<= xSel;
return aRet;
}
}
@@ -852,7 +852,7 @@ css::uno::Sequence< css::uno::Any >
if ( xPara.is() )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xPara );
+ aRet[0] <<= xPara;
return aRet;
}
}
@@ -882,7 +882,7 @@ css::uno::Sequence< css::uno::Any >
xChildSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xChildSel );
+ aRet[0] <<= xChildSel;
return aRet;
}
}
@@ -896,7 +896,7 @@ css::uno::Sequence< css::uno::Any >
if ( xPara.is() )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xPara );
+ aRet[0] <<= xPara;
return aRet;
}
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index f9aa985b59a2..bdf409161d80 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1372,7 +1372,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
if( nPos == 1 )
{
Color aSelectedColor = mpCLBDimColor->GetSelectEntryColor();
- aDimColor = makeAny( (sal_Int32)aSelectedColor.GetRGBColor() );
+ aDimColor <<= (sal_Int32)aSelectedColor.GetRGBColor();
}
if( (mpSet->getPropertyState( nHandleDimColor ) == STLPropertyState::Ambiguous) ||
@@ -1434,12 +1434,12 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
else if( nPos == 1 )
{
// this means stop sound
- aNewSoundURL = makeAny( true );
+ aNewSoundURL <<= true;
}
else
{
OUString aSoundURL( maSoundList[ nPos-2 ] );
- aNewSoundURL = makeAny( aSoundURL );
+ aNewSoundURL <<= aSoundURL;
}
if( mpSet->getPropertyState( nHandleSoundURL ) != STLPropertyState::Ambiguous )
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 1803799e3569..a2ac3a0cc5ff 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1199,7 +1199,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
}
else if( pEffect->getCommand() == EffectCommands::STOPAUDIO )
{
- aSoundSource = makeAny( true );
+ aSoundSource <<= true;
}
addValue( pSet, nHandleSoundURL, aSoundSource );
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index ec9a875076bd..a92f734adce5 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -162,7 +162,7 @@ void SAL_CALL FullScreenPane::setAccessible (
if (pParentWindow != nullptr)
xAccessibleParent = pParentWindow->GetAccessible();
Sequence<Any> aArguments (1);
- aArguments[0] = Any(xAccessibleParent);
+ aArguments[0] <<= xAccessibleParent;
xInitializable->initialize(aArguments);
}
GetWindow()->SetAccessible(rxAccessible);
@@ -196,11 +196,11 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas()
Sequence<Any> aArg (5);
// common: first any is VCL pointer to window (for VCL canvas)
- aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow.get()));
+ aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get());
aArg[1] = Any();
- aArg[2] = makeAny(css::awt::Rectangle());
- aArg[3] = makeAny(false);
- aArg[4] = makeAny(mxWindow);
+ aArg[2] <<= css::awt::Rectangle();
+ aArg[3] <<= false;
+ aArg[4] <<= mxWindow;
Reference<lang::XMultiServiceFactory> xFactory (
mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index bc68ead02288..81a4ab23b393 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -207,8 +207,8 @@ void FuHangulHanjaConversion::StartChineseConversion()
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value = makeAny(xDialogParentWindow);
- pArray[0] = makeAny(aParam);
+ aParam.Value <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index f452e0d41893..72893b7aac5a 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -151,11 +151,11 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
Sequence<Any> aArg (5);
// common: first any is VCL pointer to window (for VCL canvas)
- aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow.get()));
+ aArg[0] <<= reinterpret_cast<sal_Int64>(pWindow.get());
aArg[1] = Any();
- aArg[2] = makeAny(css::awt::Rectangle());
- aArg[3] = makeAny(false);
- aArg[4] = makeAny(rxWindow);
+ aArg[2] <<= css::awt::Rectangle();
+ aArg[3] <<= false;
+ aArg[4] <<= rxWindow;
Reference<lang::XMultiServiceFactory> xFactory (
mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 2da56df510a4..91751a91f24b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -815,12 +815,12 @@ bool SlideshowImpl::startPreview(
Sequence< beans::PropertyValue > aProperties(nPropertyCount);
aProperties[0].Name = "AutomaticAdvancement";
- aProperties[0].Value = uno::makeAny( (double)1.0 ); // one second timeout
+ aProperties[0].Value <<= (double)1.0; // one second timeout
if( mxPreviewAnimationNode.is() )
{
aProperties[1].Name = "NoSlideTransitions";
- aProperties[1].Value = uno::makeAny( true );
+ aProperties[1].Value <<= true;
}
bRet = startShowImpl( aProperties );
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 7d030d2a8e6d..269df8a8fb44 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -81,21 +81,21 @@ CacheConfiguration::CacheConfiguration()
// Obtain access to Impress configuration.
Sequence<Any> aCreationArguments(3);
- aCreationArguments[0] = makeAny(beans::PropertyValue(
+ aCreationArguments[0] <<= beans::PropertyValue(
"nodepath",
0,
makeAny(sPathToImpressConfigurationRoot),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[1] <<= beans::PropertyValue(
"depth",
0,
makeAny((sal_Int32)-1),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[2] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[2] <<= beans::PropertyValue(
"lazywrite",
0,
makeAny(true),
- beans::PropertyState_DIRECT_VALUE));
+ beans::PropertyState_DIRECT_VALUE);
Reference<XInterface> xRoot (xProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index e813a8e0124e..dd10efa08cd3 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -60,21 +60,21 @@ void ConfigurationAccess::Initialize (
try
{
Sequence<Any> aCreationArguments(3);
- aCreationArguments[0] = makeAny(beans::PropertyValue(
+ aCreationArguments[0] <<= beans::PropertyValue(
"nodepath",
0,
makeAny(rsRootName),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[1] <<= beans::PropertyValue(
"depth",
0,
makeAny((sal_Int32)-1),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[2] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[2] <<= beans::PropertyValue(
"lazywrite",
0,
makeAny(true),
- beans::PropertyState_DIRECT_VALUE));
+ beans::PropertyState_DIRECT_VALUE);
OUString sAccessService;
if (eMode == READ_ONLY)
sAccessService = "com.sun.star.configuration.ConfigurationAccess";
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 1af83e0f39f3..806e60e36c02 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1622,7 +1622,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
pProperties->Name = maStrPlayFull;
pProperties->Handle = -1;
- pProperties->Value = css::uno::makeAny(pInfo->mbSecondPlayFull);
+ pProperties->Value <<= pInfo->mbSecondPlayFull;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
}
break;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 27077422358f..8ef2221e9dcc 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1246,7 +1246,7 @@ public:
// FIXME: is this always true ?
aProperties[2].Name = "PageIncludesNonprintableArea";
- aProperties[2].Value = makeAny( true );
+ aProperties[2].Value <<= true;
return aProperties;
}
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index efd92521c3ba..5abfc7dcf580 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -294,13 +294,13 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
{
Reference< lang::XMultiServiceFactory > xProvider = configuration::theDefaultProvider::get( mxContext );
Sequence< Any > aCreationArguments( 2 );
- aCreationArguments[0] = makeAny( PropertyValue(
+ aCreationArguments[0] <<= PropertyValue(
"nodepath", 0,
makeAny( GetPathToConfigurationRoot() ),
- PropertyState_DIRECT_VALUE ) );
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ PropertyState_DIRECT_VALUE );
+ aCreationArguments[1] <<= beans::PropertyValue(
"lazywrite", 0, makeAny( true ),
- PropertyState_DIRECT_VALUE ) );
+ PropertyState_DIRECT_VALUE );
OUString sAccessService;
if ( bReadOnly )
sAccessService = "com.sun.star.configuration.ConfigurationAccess";
@@ -439,36 +439,36 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence()
{
Sequence< PropertyValue > aRet( 15 );
OptimizerSettings& rSettings( maSettings.front() );
- aRet[ 0 ].Name = "JPEGCompression";
- aRet[ 0 ].Value= Any( rSettings.mbJPEGCompression );
- aRet[ 1 ].Name = "JPEGQuality";
- aRet[ 1 ].Value= Any( rSettings.mnJPEGQuality );
- aRet[ 2 ].Name = "RemoveCropArea";
- aRet[ 2 ].Value= Any( rSettings.mbRemoveCropArea );
- aRet[ 3 ].Name = "ImageResolution";
- aRet[ 3 ].Value= Any( rSettings.mnImageResolution );
- aRet[ 4 ].Name = "EmbedLinkedGraphics";
- aRet[ 4 ].Value= Any( rSettings.mbEmbedLinkedGraphics );
- aRet[ 5 ].Name = "OLEOptimization";
- aRet[ 5 ].Value= Any( rSettings.mbOLEOptimization );
- aRet[ 6 ].Name = "OLEOptimizationType";
- aRet[ 6 ].Value= Any( rSettings.mnOLEOptimizationType );
- aRet[ 7 ].Name = "DeleteUnusedMasterPages";
- aRet[ 7 ].Value= Any( rSettings.mbDeleteUnusedMasterPages );
- aRet[ 8 ].Name = "DeleteHiddenSlides";
- aRet[ 8 ].Value= Any( rSettings.mbDeleteHiddenSlides );
- aRet[ 9 ].Name = "DeleteNotesPages";
- aRet[ 9 ].Value= Any( rSettings.mbDeleteNotesPages );
- aRet[ 10].Name = "CustomShowName";
- aRet[ 10].Value= Any( rSettings.maCustomShowName );
- aRet[ 11].Name = "SaveAsURL";
- aRet[ 11].Value= Any( rSettings.maSaveAsURL );
- aRet[ 12].Name = "FilterName";
- aRet[ 12].Value= Any( rSettings.maFilterName );
- aRet[ 13].Name = "OpenNewDocument";
- aRet[ 13].Value= Any( rSettings.mbOpenNewDocument );
- aRet[ 14].Name = "EstimatedFileSize";
- aRet[ 14].Value= Any( rSettings.mnEstimatedFileSize );
+ aRet[ 0 ].Name = "JPEGCompression";
+ aRet[ 0 ].Value <<= rSettings.mbJPEGCompression;
+ aRet[ 1 ].Name = "JPEGQuality";
+ aRet[ 1 ].Value <<= rSettings.mnJPEGQuality;
+ aRet[ 2 ].Name = "RemoveCropArea";
+ aRet[ 2 ].Value <<= rSettings.mbRemoveCropArea;
+ aRet[ 3 ].Name = "ImageResolution";
+ aRet[ 3 ].Value <<= rSettings.mnImageResolution;
+ aRet[ 4 ].Name = "EmbedLinkedGraphics";
+ aRet[ 4 ].Value <<= rSettings.mbEmbedLinkedGraphics;
+ aRet[ 5 ].Name = "OLEOptimization";
+ aRet[ 5 ].Value <<= rSettings.mbOLEOptimization;
+ aRet[ 6 ].Name = "OLEOptimizationType";
+ aRet[ 6 ].Value <<= rSettings.mnOLEOptimizationType;
+ aRet[ 7 ].Name = "DeleteUnusedMasterPages";
+ aRet[ 7 ].Value <<= rSettings.mbDeleteUnusedMasterPages;
+ aRet[ 8 ].Name = "DeleteHiddenSlides";
+ aRet[ 8 ].Value <<= rSettings.mbDeleteHiddenSlides;
+ aRet[ 9 ].Name = "DeleteNotesPages";
+ aRet[ 9 ].Value <<= rSettings.mbDeleteNotesPages;
+ aRet[ 10].Name = "CustomShowName";
+ aRet[ 10].Value <<= rSettings.maCustomShowName;
+ aRet[ 11].Name = "SaveAsURL";
+ aRet[ 11].Value <<= rSettings.maSaveAsURL;
+ aRet[ 12].Name = "FilterName";
+ aRet[ 12].Value <<= rSettings.maFilterName;
+ aRet[ 13].Name = "OpenNewDocument";
+ aRet[ 13].Value <<= rSettings.mbOpenNewDocument;
+ aRet[ 14].Name = "EstimatedFileSize";
+ aRet[ 14].Value <<= rSettings.mnEstimatedFileSize;
return aRet;
}
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index b8ed17b82526..ff0930521f85 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -754,8 +754,8 @@ void Parser::readImage()
aMaxRange[i] = aDataSequence[i+nMaskColors/2] / 255.0;
}
- aMaskRanges[0] = uno::makeAny(aMinRange);
- aMaskRanges[1] = uno::makeAny(aMaxRange);
+ aMaskRanges[0] <<= aMinRange;
+ aMaskRanges[1] <<= aMaxRange;
m_pSink->drawColorMaskedImage( aImg, aMaskRanges );
}
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 2ad9c1269581..23867f4bc931 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -46,21 +46,21 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
if (rxContext.is())
{
Sequence<Any> aCreationArguments(3);
- aCreationArguments[0] = makeAny(beans::PropertyValue(
+ aCreationArguments[0] <<= beans::PropertyValue(
"nodepath",
0,
makeAny(rsRootName),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[1] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[1] <<= beans::PropertyValue(
"depth",
0,
makeAny((sal_Int32)-1),
- beans::PropertyState_DIRECT_VALUE));
- aCreationArguments[2] = makeAny(beans::PropertyValue(
+ beans::PropertyState_DIRECT_VALUE);
+ aCreationArguments[2] <<= beans::PropertyValue(
"lazywrite",
0,
makeAny(true),
- beans::PropertyState_DIRECT_VALUE));
+ beans::PropertyState_DIRECT_VALUE);
OUString sAccessService;
if (eMode == READ_ONLY)
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 2e56f5bdc414..749e8a58d08a 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -539,15 +539,15 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
{
default:
case VM_Standard:
- aValue = Any(sal_Int32(0));
+ aValue <<= sal_Int32(0);
break;
case VM_Notes:
- aValue = Any(sal_Int32(1));
+ aValue <<= sal_Int32(1);
break;
case VM_SlideOverview:
- aValue = Any(sal_Int32(2));
+ aValue <<= sal_Int32(2);
break;
}
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx
index f27f1027929e..be6e57073e5d 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -167,10 +167,10 @@ IMPL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void)
uno::Sequence<beans::PropertyValue> aArgs(2);
aArgs[0].Name = OUString::fromUtf8("Symbols");
- aArgs[0].Value = uno::makeAny(sHexText.toString());
+ aArgs[0].Value <<= sHexText.toString();
//add font settings here
aArgs[1].Name = OUString::fromUtf8("FontName");
- aArgs[1].Value = uno::makeAny(sFontName);
+ aArgs[1].Value <<= sFontName;
comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
}
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 4005e20306b7..571ec8e4ad90 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -198,11 +198,11 @@ void RecentDocsViewItem::OpenDocument()
sal_Int32 nSize = 2;
aArgsList.realloc(nSize);
aArgsList[0].Name = "Referer";
- aArgsList[0].Value = makeAny(OUString("private:user"));
+ aArgsList[0].Value <<= OUString("private:user");
// documents will never be opened as templates
aArgsList[1].Name = "AsTemplate";
- aArgsList[1].Value = makeAny(false);
+ aArgsList[1].Value <<= false;
xDispatch = xDispatchProvider->queryDispatch(aTargetURL, "_default", 0);
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 45f96b235e6e..6e9946347b13 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -719,7 +719,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
sal_Int32 nIndex = lNewArgs.getLength();
lNewArgs.realloc( nIndex+1 );
lNewArgs[nIndex].Name = OUString::createFromAscii( pSlot->pUnoName );
- lNewArgs[nIndex].Value = makeAny( SfxDispatchController_Impl::getSlaveCommand( aDispatchURL ));
+ lNewArgs[nIndex].Value <<= SfxDispatchController_Impl::getSlaveCommand( aDispatchURL );
}
eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
@@ -832,7 +832,7 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Refe
// Use special uno struct to transport don't care state
css::frame::status::ItemStatus aItemStatus;
aItemStatus.State = css::frame::status::ItemState::DONT_CARE;
- aState = makeAny( aItemStatus );
+ aState <<= aItemStatus;
}
css::frame::FeatureStateEvent aEvent;
@@ -852,7 +852,7 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Refe
// MBA: we might decide to *not* disable "invisible" slots, but this would be
// a change that needs to adjust at least the testtool
aEvent.IsEnabled = false;
- aEvent.State = makeAny( aVisibilityStatus );
+ aEvent.State <<= aVisibilityStatus;
}
aListener->statusChanged( aEvent );
@@ -939,7 +939,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
// Use special uno struct to transport don't care state
css::frame::status::ItemStatus aItemStatus;
aItemStatus.State = css::frame::status::ItemState::DONT_CARE;
- aState = makeAny( aItemStatus );
+ aState <<= aItemStatus;
}
css::frame::FeatureStateEvent aEvent;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index f799296ca8ec..07d0af89d038 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2016,12 +2016,12 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
IsNumberFormat( pLine->m_aValueEdit->GetText(), nIndex, nValue );
if ( bIsNum )
- aPropertiesSeq[i].Value = makeAny( nValue );
+ aPropertiesSeq[i].Value <<= nValue;
}
else if ( CUSTOM_TYPE_BOOLEAN == nType )
{
bool bValue = pLine->m_aYesNoButton->IsYesChecked();
- aPropertiesSeq[i].Value = makeAny( bValue );
+ aPropertiesSeq[i].Value <<= bValue;
}
else if ( CUSTOM_TYPE_DATETIME == nType )
{
@@ -2063,7 +2063,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
else
{
OUString sValue( pLine->m_aValueEdit->GetText() );
- aPropertiesSeq[i].Value = makeAny( sValue );
+ aPropertiesSeq[i].Value <<= sValue;
}
}
}
@@ -2551,7 +2551,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
if ( bIsNum )
seqValue[k] = dValue;
}
- aPropertiesSeq[i].Value = makeAny( seqValue );
+ aPropertiesSeq[i].Value <<= seqValue;
}
else if ( CMIS_TYPE_INTEGER == sType )
{
@@ -2569,7 +2569,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
if ( bIsNum )
seqValue[k] = (sal_Int64) dValue;
}
- aPropertiesSeq[i].Value = makeAny( seqValue );
+ aPropertiesSeq[i].Value <<= seqValue;
}
else if ( CMIS_TYPE_BOOL == sType )
{
@@ -2581,7 +2581,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
bool bValue = (*it)->m_aYesButton->IsChecked();
seqValue[k] = bValue;
}
- aPropertiesSeq[i].Value = makeAny( seqValue );
+ aPropertiesSeq[i].Value <<= seqValue;
}
else if ( CMIS_TYPE_DATETIME == sType )
@@ -2599,7 +2599,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
aTmpDate.GetYear(), true );
seqValue[k] = aDateTime;
}
- aPropertiesSeq[i].Value = makeAny( seqValue );
+ aPropertiesSeq[i].Value <<= seqValue;
}
else
{
@@ -2611,7 +2611,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
OUString sValue( (*it)->m_aValueEdit->GetText() );
seqValue[k] = sValue;
}
- aPropertiesSeq[i].Value = makeAny( seqValue );
+ aPropertiesSeq[i].Value <<= seqValue;
}
}
}
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index ea70c9ca81cf..284111783c2c 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -140,14 +140,14 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd ,
uno::Sequence< uno::Any > aArgs(2);
beans::PropertyValue aPropValue;
aPropValue.Name = "Frame";
- aPropValue.Value = uno::makeAny( xFrame );
+ aPropValue.Value <<= xFrame;
aArgs[0] <<= aPropValue;
aPropValue.Name = "ResourceURL";
// create a resource URL from the nId provided by the sfx2
OUString aResourceURL( aDockWindowResourceURL );
aResourceURL += OUString::number(nId);
- aPropValue.Value = uno::makeAny( aResourceURL );
+ aPropValue.Value <<= aResourceURL;
aArgs[1] <<= aPropValue;
uno::Reference< awt::XWindow > xWindow;
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 647759ca36d2..b6ff97b0a99d 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1041,7 +1041,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
{
aInitArguments[0] <<= nTemplateDescription;
if ( mpPreferredParentWindow )
- aInitArguments[1] = makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) );
+ aInitArguments[1] <<= VCLUnoHelper::GetInterface( mpPreferredParentWindow );
}
else
{
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 7792e0b98903..ac01c0fc6e6f 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -173,11 +173,11 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
//used in filter/source/pdf/impdialog.cxx
uno::Sequence< beans::PropertyValue > aFilterDataValue(1);
aFilterDataValue[0].Name = "_OkButtonString";
- aFilterDataValue[0].Value = css::uno::makeAny(SfxResId(STR_PDF_EXPORT_SEND ).toString());
+ aFilterDataValue[0].Value <<= SfxResId(STR_PDF_EXPORT_SEND ).toString();
//add to the filterdata property, the only one the PDF export filter dialog will care for
aPropsForDialog[0].Name = "FilterData";
- aPropsForDialog[0].Value = css::uno::makeAny( aFilterDataValue );
+ aPropsForDialog[0].Value <<= aFilterDataValue;
//when executing the dialog will merge the persistent FilterData properties
xFilterProperties->setPropertyValues( aPropsForDialog );
@@ -326,9 +326,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
// Retrieve filter from type
css::uno::Sequence< css::beans::NamedValue > aQuery( bSendAsPDF ? 3 : 2 );
aQuery[0].Name = "Type";
- aQuery[0].Value = css::uno::makeAny( aTypeName );
+ aQuery[0].Value <<= aTypeName;
aQuery[1].Name = "DocumentService";
- aQuery[1].Value = css::uno::makeAny( aModule );
+ aQuery[1].Value <<= aModule;
if( bSendAsPDF )
{
// #i91419#
@@ -337,7 +337,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
// this seems to be a bug
// without flags we get an import filter here, which is also unwanted
aQuery[2].Name = "Flags";
- aQuery[2].Value = css::uno::makeAny( sal_Int32(0x80042) ); // EXPORT ALIEN 3RDPARTY
+ aQuery[2].Value <<= sal_Int32(0x80042); // EXPORT ALIEN 3RDPARTY
}
css::uno::Reference< css::container::XEnumeration > xEnumeration =
@@ -483,7 +483,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
const OUString aPasswordPropName( "Password" );
css::uno::Sequence< css::beans::PropertyValue > aArgs( ++nNumArgs );
aArgs[nNumArgs-1].Name = "FilterName";
- aArgs[nNumArgs-1].Value = css::uno::makeAny( aFilterName );
+ aArgs[nNumArgs-1].Value <<= aFilterName;
::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() );
OUString aPassword = aMediaDescrPropsHM.getUnpackedValueOrDefault(
@@ -493,7 +493,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
{
aArgs.realloc( ++nNumArgs );
aArgs[nNumArgs-1].Name = aPasswordPropName;
- aArgs[nNumArgs-1].Value = css::uno::makeAny( aPassword );
+ aArgs[nNumArgs-1].Value <<= aPassword;
}
bool bNeedsPreparation = false;
@@ -623,7 +623,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
// We need 1:1 copy of the document to preserve an added signature.
aArgs.realloc( ++nNumArgs );
aArgs[nNumArgs-1].Name = "CopyStreamIfPossible";
- aArgs[nNumArgs-1].Value = css::uno::makeAny( true );
+ aArgs[nNumArgs-1].Value <<= true;
try
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index f3d17b2427c9..5133d805ec30 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1779,8 +1779,8 @@ void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pOb
OSL_ENSURE( i_pObjSh, "SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
Sequence< PropertyValue > lProps(1);
lProps[0].Name = "ooSetupFactoryStyleFilter";
- lProps[0].Value = makeAny(
- i_nFilter | (m_bWantHierarchical ? SFXSTYLEBIT_HIERARCHY : 0));
+ lProps[0].Value <<=
+ i_nFilter | (m_bWantHierarchical ? SFXSTYLEBIT_HIERARCHY : 0);
xModuleManager->replaceByName( getModuleIdentifier( xModuleManager, i_pObjSh ), makeAny( lProps ) );
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 0dfd449e4727..a73219aff151 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -705,9 +705,9 @@ bool SfxDocTplService_Impl::addEntry( Content& rParentFolder,
aNames[2] = TARGET_URL;
Sequence< Any > aValues(3);
- aValues[0] = makeAny( rTitle );
- aValues[1] = makeAny( false );
- aValues[2] = makeAny( rTargetURL );
+ aValues[0] <<= rTitle;
+ aValues[1] <<= false;
+ aValues[2] <<= rTargetURL;
OUString aType( TYPE_LINK );
OUString aAdditionalProp( PROPERTY_TYPE );
@@ -755,8 +755,8 @@ bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
aNames[1] = IS_FOLDER;
Sequence< Any > aValues(2);
- aValues[0] = makeAny( aFolderName );
- aValues[1] = makeAny( true );
+ aValues[0] <<= aFolderName;
+ aValues[1] <<= true;
OUString aType;
@@ -820,8 +820,8 @@ bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPa
aNames[1] = IS_FOLDER;
Sequence< Any > aValues(2);
- aValues[0] = makeAny( aTryName );
- aValues[1] = makeAny( true );
+ aValues[0] <<= aTryName;
+ aValues[1] <<= true;
OUString aType( TYPE_FSYS_FOLDER );
@@ -886,8 +886,8 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a
aNames[1] = IS_DOCUMENT;
Sequence< Any > aValues(2);
- aValues[0] = makeAny( aTryName );
- aValues[1] = makeAny( true );
+ aValues[0] <<= aTryName;
+ aValues[1] <<= true;
OUString aType( TYPE_FSYS_FILE );
@@ -990,7 +990,7 @@ bool SfxDocTplService_Impl::setProperty( Content& rContent,
if ( rPropValue >>= aValue )
{
maRelocator.makeRelocatableURL( aValue );
- aPropValue = makeAny( aValue );
+ aPropValue <<= aValue;
}
else
{
@@ -1001,7 +1001,7 @@ bool SfxDocTplService_Impl::setProperty( Content& rContent,
{
maRelocator.makeRelocatableURL( aValues[ n ] );
}
- aPropValue = makeAny( aValues );
+ aPropValue <<= aValues;
}
else
{
@@ -1049,7 +1049,7 @@ bool SfxDocTplService_Impl::getProperty(Content& rContent, const OUString& rProp
if ( rPropValue >>= aValue )
{
maRelocator.makeAbsoluteURL( aValue );
- rPropValue = makeAny( aValue );
+ rPropValue <<= aValue;
}
else
{
@@ -1060,7 +1060,7 @@ bool SfxDocTplService_Impl::getProperty(Content& rContent, const OUString& rProp
{
maRelocator.makeAbsoluteURL( aValues[ n ] );
}
- rPropValue = makeAny( aValues );
+ rPropValue <<= aValues;
}
else
{
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c8d24c3fff6f..1d25ce1b8e20 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2466,11 +2466,11 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage
{
Sequence< beans::PropertyValue > aProps( 3 );
aProps[0].Name = "VersionMajor";
- aProps[0].Value = makeAny( bIsMajor );
+ aProps[0].Value <<= bIsMajor;
aProps[1].Name = "VersionComment";
- aProps[1].Value = makeAny( rMessage );
+ aProps[1].Value <<= rMessage;
aProps[2].Name = "CheckIn";
- aProps[2].Value = makeAny( true );
+ aProps[2].Value <<= true;
OUString sName( pMedium->GetName( ) );
storeSelf( aProps );
@@ -3373,7 +3373,7 @@ void SfxBaseModel::getGrabBagItem(css::uno::Any& rVal) const
m_pData->m_xGrabBagItem->QueryValue(rVal);
else {
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 0fcdb557e811..ee4195d4384c 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -108,17 +108,17 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ )
{
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Referer";
- aArgs[0].Value = makeAny( OUString( "private:user" ));
+ aArgs[0].Value <<= OUString( "private:user" );
aArgs[1].Name = "FileName";
- aArgs[1].Value = makeAny( OUString( aName ));
+ aArgs[1].Value <<= aName;
if ( !aFilter.isEmpty() )
{
aArgs.realloc( 4 );
aArgs[2].Name = "FilterOptions";
- aArgs[2].Value = makeAny( OUString( aOptions ));
+ aArgs[2].Value <<= aOptions;
aArgs[3].Name = "FilterName";
- aArgs[3].Value = makeAny( OUString( aFilter ));
+ aArgs[3].Value <<= aFilter;
}
SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo;
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index b8c0993f92ae..8b8ae93da046 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -320,7 +320,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createE
uno::Sequence<uno::Any> models(m_lModels.size());
for (size_t i = 0; i < m_lModels.size(); ++i)
{
- models[i] = uno::makeAny(m_lModels[i]);
+ models[i] <<= m_lModels[i];
}
uno::Reference< container::XEnumeration > xEnum(
static_cast<container::XEnumeration*>(
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 706a49848bb9..1a46180d91c8 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -128,7 +128,7 @@ void Theme::HandleDataChange()
{
// Do not modify mbIsHighContrastMode when it was manually set.
GetCurrentTheme().mbIsHighContrastMode = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- rTheme.maRawValues[Bool_IsHighContrastModeActive] = Any(GetCurrentTheme().mbIsHighContrastMode);
+ rTheme.maRawValues[Bool_IsHighContrastModeActive] <<= GetCurrentTheme().mbIsHighContrastMode;
}
GetCurrentTheme().UpdateTheme();
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 16316ad7f517..b107f9b4d269 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -730,13 +730,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
if( nId == SID_PRINTDOCDIRECT )
{
aProps[nLen].Name = "PrintSelectionOnly";
- aProps[nLen].Value = makeAny( bSelection );
+ aProps[nLen].Value <<= bSelection;
}
else // if nId == SID_PRINTDOC ; nothing to do with the previous HACK
{
// should the printer selection and properties dialogue display an help button
aProps[nLen].Name = "HideHelpButton";
- aProps[nLen].Value = makeAny( bPrintOnHelp );
+ aProps[nLen].Value <<= bPrintOnHelp;
}
ExecPrint( aProps, bIsAPI, (nId == SID_PRINTDOCDIRECT) );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 071d6e1ceed2..eaaaa994c775 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -650,7 +650,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "FilterName";
- aArgs[0].Value = css::uno::makeAny( aFilterName );
+ aArgs[0].Value <<= aFilterName;
// Store document in the html format
try
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 7f1d394c35c5..c89bc1a28c19 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -162,10 +162,10 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = makeAny( aConfigRoot );
+ aProperty.Value <<= aConfigRoot;
Sequence< Any > aArgumentList( 1 );
- aArgumentList[0] = makeAny( aProperty );
+ aArgumentList[0] <<= aProperty;
Reference< XNameAccess > xNameAccess =
Reference< XNameAccess > (
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 98c224401c43..dcc14b913560 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -486,12 +486,12 @@ namespace slideshow
if( mxPlayer.is() )
{
- aArgs[ 0 ] = uno::makeAny(
- sal::static_int_cast< sal_IntPtr >( mpMediaWindow->GetParentWindowHandle() ) );
+ aArgs[ 0 ] <<=
+ sal::static_int_cast< sal_IntPtr >( mpMediaWindow->GetParentWindowHandle() );
aAWTRect.X = aAWTRect.Y = 0;
- aArgs[ 1 ] = uno::makeAny( aAWTRect );
- aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() ) );
+ aArgs[ 1 ] <<= aAWTRect;
+ aArgs[ 2 ] <<= reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() );
mxPlayerWindow.set( mxPlayer->createPlayerWindow( aArgs ) );
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 50052d807b42..bb3c4a512a9b 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -360,14 +360,14 @@ namespace internal
if( rIter.first.mnParagraphIndex == -1 )
{
- rCurrProps.Target = uno::makeAny( rIter.first.mxRef );
+ rCurrProps.Target <<= rIter.first.mxRef;
}
else
{
- rCurrProps.Target = uno::makeAny(
+ rCurrProps.Target <<=
presentation::ParagraphTarget(
rIter.first.mxRef,
- rIter.first.mnParagraphIndex ) );
+ rIter.first.mnParagraphIndex );
}
rCurrProps.Properties = ::comphelper::containerToSequence( rIter.second );
diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk
index 85de035974c6..212405b410bd 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -10,18 +10,7 @@
$(eval $(call gb_CompilerTest_CompilerTest,compilerplugins_clang))
$(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
- compilerplugins/clang/test/datamembershadow \
- compilerplugins/clang/test/externvar \
- compilerplugins/clang/test/finalprotected \
- compilerplugins/clang/test/passstuffbyref \
- compilerplugins/clang/test/oslendian-1 \
- compilerplugins/clang/test/oslendian-2 \
- compilerplugins/clang/test/oslendian-3 \
- compilerplugins/clang/test/redundantcast \
- compilerplugins/clang/test/salbool \
- compilerplugins/clang/test/stringconstant \
- compilerplugins/clang/test/unnecessaryoverride-dtor \
- compilerplugins/clang/test/vclwidgets \
+ compilerplugins/clang/test/unoany \
))
$(eval $(call gb_CompilerTest_use_udk_api,compilerplugins_clang))
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index aa1302df3640..3d15a40dd037 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2014,7 +2014,7 @@ bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent )
Sequence < OUString > aNames { "Title" };
Sequence < Any > aValues(1);
- aValues[0] = makeAny( OUString( m_aName ) );
+ aValues[0] <<= m_aName;
Content aNewFolder;
if ( !pContent->insertNewContent( rCurr.Type, aNames, aValues, aNewFolder ) )
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 94a1567df14e..20bd008b3572 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -143,7 +143,7 @@ SmPrintUIOptions::SmPrintUIOptions()
Sequence< PropertyValue > aHintNoLayoutPage( 1 );
aHintNoLayoutPage[0].Name = "HintNoLayoutPage";
- aHintNoLayoutPage[0].Value = makeAny( true );
+ aHintNoLayoutPage[0].Value <<= true;
m_aUIProperties[nIdx++].Value <<= aHintNoLayoutPage;
assert(nIdx == nNumProps);
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 179ac8015ade..f1714aa97fd3 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -213,7 +213,7 @@ inline acc_CurrentContext::acc_CurrentContext(
{
if (xRestriction.is())
{
- m_restriction = makeAny( xRestriction );
+ m_restriction <<= xRestriction;
}
// return empty any otherwise on getValueByName(), not null interface
}
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index a68e449c7f47..d64c52de01ea 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -84,14 +84,14 @@ uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rTyp
uno::Any aReturn;
if ( m_bSeekable )
- aReturn = uno::Any( ::cppu::queryInterface( rType,
+ aReturn = ::cppu::queryInterface( rType,
static_cast< io::XStream* >( this ),
static_cast< io::XInputStream* >( this ),
- static_cast< io::XSeekable* >( this ) ) );
+ static_cast< io::XSeekable* >( this ) );
else
- aReturn = uno::Any( ::cppu::queryInterface( rType,
+ aReturn = ::cppu::queryInterface( rType,
static_cast< io::XStream* >( this ),
- static_cast< io::XInputStream* >( this ) ) );
+ static_cast< io::XInputStream* >( this ) );
if ( aReturn.hasValue() )
return aReturn ;
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index 6d69fcd9f5ac..b05b0c7b5f10 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -67,7 +67,7 @@ bool SfxGrabBagItem::QueryValue(uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
pValue[0].Value = i.second;
++pValue;
}
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
return true;
}
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 4b2e31c8ab28..a77f52f8b2fa 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -68,12 +68,12 @@ bool SfxImageItem::operator==( const SfxPoolItem& rItem ) const
bool SfxImageItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
css::uno::Sequence< css::uno::Any > aSeq( 4 );
- aSeq[0] = css::uno::makeAny( GetValue() );
- aSeq[1] = css::uno::makeAny( pImpl->nAngle );
- aSeq[2] = css::uno::makeAny( pImpl->bMirrored );
- aSeq[3] = css::uno::makeAny( OUString( pImpl->aURL ));
+ aSeq[0] <<= GetValue();
+ aSeq[1] <<= pImpl->nAngle;
+ aSeq[2] <<= pImpl->bMirrored;
+ aSeq[3] <<= pImpl->aURL;
- rVal = css::uno::makeAny( aSeq );
+ rVal <<= aSeq;
return true;
}
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 8e8bca223a2e..34399ee2f3e8 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -241,7 +241,7 @@ bool SfxStringListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
css::uno::Sequence< OUString > aStringList;
pThis->GetStringList( aStringList );
- rVal = css::uno::makeAny( aStringList );
+ rVal <<= aStringList;
return true;
}
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 11449fb8c2a4..aff3b49707ce 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -61,7 +61,7 @@ void SvCommandList::FillSequence( css::uno::Sequence < css::beans::PropertyValue
{
aCommandSequence[nIndex].Name = aCommandList[ nIndex ].GetCommand();
aCommandSequence[nIndex].Handle = -1;
- aCommandSequence[nIndex].Value = uno::makeAny( aCommandList[ nIndex ].GetArgument() );
+ aCommandSequence[nIndex].Value <<= aCommandList[ nIndex ].GetArgument();
aCommandSequence[nIndex].State = beans::PropertyState_DIRECT_VALUE;
}
}
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index abc1f94d8ec9..f68d56fb51a6 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -69,7 +69,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name)
if (!m_xHandler.is())
m_xHandler.set( new JavaInteractionHandler );
}
- retVal = makeAny(m_xHandler);
+ retVal <<= m_xHandler;
}
else if( m_xNextContext.is() )
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index b8a48f08ae8f..2a443b50c6b7 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -344,7 +344,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier )
// Provide key modifier information to dispatch function
aArgs[0].Name = "KeyModifier";
- aArgs[0].Value = makeAny( KeyModifier );
+ aArgs[0].Value <<= KeyModifier;
aTargetURL.Complete = aCommandURL;
if ( m_xUrlTransformer.is() )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 892b3e2aef4f..c8ba3be334e8 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3367,7 +3367,7 @@ void FmXFormShell::CreateExternalView()
// columns props are a dispatch argument
pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.*
- pDispatchArgs->Value = makeAny(aColumnProps);
+ pDispatchArgs->Value <<= aColumnProps;
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
"FmXFormShell::CreateExternalView : forgot to adjust nDispatchArgs ?");
@@ -3407,7 +3407,7 @@ void FmXFormShell::CreateExternalView()
// content type
pListBoxDescription->Name = FM_PROP_LISTSOURCETYPE;
ListSourceType eType = ListSourceType_VALUELIST;
- pListBoxDescription->Value = makeAny(eType);
+ pListBoxDescription->Value <<= eType;
++pListBoxDescription;
// list source
@@ -3415,7 +3415,7 @@ void FmXFormShell::CreateExternalView()
DBG_ASSERT(aCurrentListSource != aRadioListSources.end(),
"FmXFormShell::CreateExternalView : inconsistent radio descriptions !");
pListBoxDescription->Name = FM_PROP_LISTSOURCE;
- pListBoxDescription->Value = makeAny((*aCurrentListSource).second);
+ pListBoxDescription->Value <<= (*aCurrentListSource).second;
++pListBoxDescription;
// value list
@@ -3423,7 +3423,7 @@ void FmXFormShell::CreateExternalView()
DBG_ASSERT(aCurrentValueList != aRadioValueLists.end(),
"FmXFormShell::CreateExternalView : inconsistent radio descriptions !");
pListBoxDescription->Name = FM_PROP_STRINGITEMLIST;
- pListBoxDescription->Value = makeAny(((*aCurrentValueList).second));
+ pListBoxDescription->Value <<= (*aCurrentValueList).second;
++pListBoxDescription;
DBG_ASSERT(nListBoxDescription == (pListBoxDescription - aListBoxDescription.getConstArray()),
@@ -3454,7 +3454,7 @@ void FmXFormShell::CreateExternalView()
// the
pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.*
- pDispatchArgs->Value = makeAny(aListBoxDescription);
+ pDispatchArgs->Value <<= aListBoxDescription;
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
"FmXFormShell::CreateExternalView : forgot to adjust nDispatchArgs ?");
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index a0f10465b8c7..8d8f7200d6f8 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1556,7 +1556,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
if ( _rxField.is() )
{
nDataType = ::comphelper::getINT32(_rxField->getPropertyValue(FM_PROP_FIELDTYPE));
- aFieldName = Any(_rxField->getPropertyValue(FM_PROP_NAME));
+ aFieldName = _rxField->getPropertyValue(FM_PROP_NAME);
aFieldName >>= sFieldName;
}
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 65956e0187ce..5ad2f181f822 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -277,7 +277,7 @@ bool CreateDir( const INetURLObject& rURL )
uno::Sequence< uno::Any > aValues( 1 );
aProps[0] = "Title";
- aValues[0] = uno::makeAny( OUString( rURL.GetName() ) );
+ aValues[0] <<= rURL.GetName();
::ucbhelper::Content aContent( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() );
bRet = aParent.insertNewContent( "application/vnd.sun.staroffice.fsys-folder", aProps, aValues, aContent );
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 1615e64ef227..3bf513d2b335 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -165,7 +165,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName
css::uno::Sequence < beans::PropertyValue > aSeq;
beans::PropertyValue aValue;
aValue.Name = rSequenceName;
- aValue.Value = css::uno::makeAny( aSeq );
+ aValue.Value <<= aSeq;
assert(aPropSeq.end() == std::find_if(aPropSeq.begin(), aPropSeq.end(),
[&rSequenceName](beans::PropertyValue const& rV)
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index d14ab5672e53..ce1864fc1d31 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -78,7 +78,7 @@ SfxPoolItem* SvxColorListItem::Clone( SfxItemPool * ) const
#define QUERY_PUT_IMPL(svtype, xtype) \
bool svtype::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const \
{ \
- rVal = uno::makeAny( uno::Reference< uno::XWeak >( p##xtype.get() ) ); \
+ rVal <<= uno::Reference< uno::XWeak >( p##xtype.get() ); \
return true; \
} \
\
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 40892bc7d5b0..5f85d00da589 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -154,8 +154,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
case MID_PAGE_ORIENTATION:
- //Landscape= sal_True
- rVal = css::uno::makeAny<bool>(bLandscape);
+ rVal <<= (bool) bLandscape;
break;
case MID_PAGE_LAYOUT :
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index de6e898a1b23..3c721d1b3c56 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -790,7 +790,7 @@ void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const
pGrabBagItem->QueryValue(rVal);
else {
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 4875a4f8d6c0..1c2e93af572e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
// But this link is required by some filters to access the native graphic (PDF export/MS export),
// there we should create a new service to provide this data if needed
aFilterData[ 0 ].Name = "CreateNativeLink";
- aFilterData[ 0 ].Value = Any( true );
+ aFilterData[ 0 ].Value <<= true;
// #i123042# for e.g SVG the path is needed, so hand it over here. I have no real idea
// what consequences this may have; maybe this is not handed over by purpose here. Not
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index bdd97018135e..1354efba237c 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -332,7 +332,7 @@ void PaletteManager::DispatchColorCommand(const OUString& aCommand, const NamedC
Sequence<PropertyValue> aArgs(1);
aArgs[0].Name = aObj.GetURLPath();
- aArgs[0].Value = makeAny(sal_Int32(rColor.first.GetColor()));
+ aArgs[0].Value <<= sal_Int32(rColor.first.GetColor());
URL aTargetURL;
aTargetURL.Complete = aCommand;
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index c8ee4f32ff32..42165d13c10e 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -57,7 +57,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush()
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = "PersistentCopy";
- aArgs[0].Value = makeAny( m_bPersistentCopy );
+ aArgs[0].Value <<= m_bPersistentCopy;
Dispatch( ".uno:FormatPaintbrush"
, aArgs );
}
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 1f6da2730181..9a8e4e419ab5 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -141,10 +141,10 @@ IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl, Timer *, void)
maCommand == ".uno:GrafBlue" ||
maCommand == ".uno:GrafLuminance" ||
maCommand == ".uno:GrafContrast" )
- a = makeAny( sal_Int16( nVal ));
+ a <<= sal_Int16( nVal );
else if ( maCommand == ".uno:GrafGamma" ||
maCommand == ".uno:GrafTransparence" )
- a = makeAny( sal_Int32( nVal ));
+ a <<= sal_Int32( nVal );
if ( a.hasValue() )
{
@@ -350,7 +350,7 @@ void ImplGrafModeControl::Select()
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = "GrafMode";
- aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() ));
+ aArgs[0].Value <<= sal_Int16( GetSelectEntryPos() );
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
This instance may be deleted in the meantime (i.e. when a dialog is opened
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index c6acafaffbe0..f552a4864a4a 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -322,9 +322,9 @@ void TableWindow::PopupModeEnd()
{
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Columns";
- aArgs[0].Value = makeAny( sal_Int16( nCol ));
+ aArgs[0].Value <<= sal_Int16( nCol );
aArgs[1].Name = "Rows";
- aArgs[1].Value = makeAny( sal_Int16( nLine ));
+ aArgs[1].Value <<= sal_Int16( nLine );
TableDialog( aArgs );
}
@@ -657,9 +657,9 @@ void ColumnsWindow::PopupModeEnd()
{
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Columns";
- aArgs[0].Value = makeAny( sal_Int16( nCol ));
+ aArgs[0].Value <<= sal_Int16( nCol );
aArgs[1].Name = "Modifier";
- aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 ));
+ aArgs[1].Value <<= sal_Int16( m_bMod1 ? KEY_MOD1 : 0 );
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
maCommand,
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 3c1c504cb1b1..e79095e5c360 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -132,7 +132,7 @@ IMPL_LINK_NOARG(SvxUndoRedoControl, PopupModeEndHdl, FloatingWindow*, void)
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = aObj.GetURLPath();
- aArgs[0].Value = makeAny( sal_Int16( nCount ));
+ aArgs[0].Value <<= sal_Int16( nCount );
SfxToolBoxControl::Dispatch( m_aCommandURL, aArgs );
}
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index a73c223b1ee0..484c1b52e41b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -410,9 +410,9 @@ IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
ToggleDropDown();
Sequence< PropertyValue > aArgs( 2 );
aArgs[0].Name = "Param";
- aArgs[0].Value = makeAny( sEntry );
+ aArgs[0].Value <<= sEntry;
aArgs[1].Name = "Family";
- aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
+ aArgs[1].Value <<= sal_Int16( eStyleFamily );
switch(nMenuId) {
case RID_SVX_UPDATE_STYLE:
@@ -497,9 +497,9 @@ void SvxStyleBox_Impl::Select()
SaveValue();
Sequence< PropertyValue > aArgs( 2 );
- aArgs[0].Value = makeAny( OUString( aSearchEntry ) );
+ aArgs[0].Value <<= aSearchEntry;
aArgs[1].Name = "Family";
- aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
+ aArgs[1].Value <<= sal_Int16( eStyleFamily );
if( bCreateNew )
{
aArgs[0].Name = "Param";
@@ -3106,7 +3106,7 @@ void SvxCurrencyToolBoxControl::Select( sal_uInt16 nSelectModifier )
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = "NumberFormatCurrency";
- aArgs[0].Value = makeAny( nFormatKey );
+ aArgs[0].Value <<= nFormatKey;
Dispatch( m_aCommandURL, aArgs );
m_nFormatKey = nFormatKey;
}
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 3cfd2f61afe2..24b72d56e4f0 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -148,7 +148,7 @@ void SvxFontSizeBox_Impl::Select()
uno::Sequence< beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "FontHeight.Height";
- aArgs[0].Value = uno::makeAny( fSelVal );
+ aArgs[0].Value <<= fSelVal;
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
This instance may be deleted in the meantime (i.e. when a dialog is opened
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 52774014cd5b..1f2688921915 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2777,7 +2777,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
}
case SDRATTR_OBJMOVEPROTECT:
- rValue = uno::makeAny( mpObj->IsMoveProtect() );
+ rValue <<= mpObj->IsMoveProtect();
break;
case SDRATTR_OBJECTNAME:
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 72b641bf7d1c..2eb0894430e7 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -141,7 +141,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
const GalleryObject* pObj = mpTheme->ImplGetGalleryObject( nIndex );
if( pObj )
- aRet = uno::makeAny( uno::Reference< gallery::XGalleryItem >( new GalleryItem( *this, *pObj ) ) );
+ aRet <<= uno::Reference< gallery::XGalleryItem >( new GalleryItem( *this, *pObj ) );
}
}
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index e248d31210d9..0bab17f58139 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -169,7 +169,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName )
}
else
{
- aRet = uno::makeAny( uno::Reference< gallery::XGalleryTheme >( new ::unogallery::GalleryTheme( rName ) ) );
+ aRet <<= uno::Reference< gallery::XGalleryTheme >( new ::unogallery::GalleryTheme( rName ) );
}
return aRet;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 73eb20dc5ba1..4f84f675e63b 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -765,10 +765,10 @@ bool XLineDashItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName());
aPropSeq[0].Name = "Name";
- aPropSeq[0].Value = uno::makeAny( aApiName );
+ aPropSeq[0].Value <<= aApiName;
aPropSeq[1].Name = "LineDash";
- aPropSeq[1].Value = uno::makeAny( aLineDash );
- rVal = uno::makeAny( aPropSeq );
+ aPropSeq[1].Value <<= aLineDash;
+ rVal <<= aPropSeq;
break;
}
@@ -2535,10 +2535,10 @@ bool XFillGradientItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) c
OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName());
aPropSeq[0].Name = "Name";
- aPropSeq[0].Value = uno::makeAny( aApiName );
+ aPropSeq[0].Value <<= aApiName;
aPropSeq[1].Name = "FillGradient";
- aPropSeq[1].Value = uno::makeAny( aGradient2 );
- rVal = uno::makeAny( aPropSeq );
+ aPropSeq[1].Value <<= aGradient2;
+ rVal <<= aPropSeq;
break;
}
@@ -3000,10 +3000,10 @@ bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons
OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName());
aPropSeq[0].Name = "Name";
- aPropSeq[0].Value = uno::makeAny( aApiName );
+ aPropSeq[0].Value <<= aApiName;
aPropSeq[1].Name = "FillHatch";
- aPropSeq[1].Value = uno::makeAny( aUnoHatch );
- rVal = uno::makeAny( aPropSeq );
+ aPropSeq[1].Value <<= aUnoHatch;
+ rVal <<= aPropSeq;
break;
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 231870ad64fb..de7e28c2c743 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -381,11 +381,11 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId) const
uno::Sequence< beans::PropertyValue > aPropSeq( 3 );
aPropSeq[0].Name = "Name";
- aPropSeq[0].Value = uno::makeAny( aInternalName );
+ aPropSeq[0].Value <<= aInternalName;
aPropSeq[1].Name = "FillBitmapURL";
- aPropSeq[1].Value = uno::makeAny( aURL );
+ aPropSeq[1].Value <<= aURL;
aPropSeq[2].Name = "Bitmap";
- aPropSeq[2].Value = uno::makeAny( xBmp );
+ aPropSeq[2].Value <<= xBmp;
rVal <<= aPropSeq;
}
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index e5b17891d802..9486e369e9e7 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -339,8 +339,8 @@ SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
pMarksAccess->makeNoTextFieldBookmark(aPaM, "test", ODF_FORMDROPDOWN));
CPPUNIT_ASSERT(pFieldmark);
uno::Sequence< OUString > vListEntries { "BBBBB" };
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(sal_Int32(0));
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] <<= vListEntries;
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] <<= sal_Int32(0);
pDoc->getIDocumentContentOperations().InsertString(aPaM, "CCCCC");
SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 4f91797c28ad..68187a49c4ab 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -623,7 +623,7 @@ void Test::testMSCharBackgroundEditing()
if (rProp.Name == "CharShadingMarker")
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), true, rProp.Value.get<bool>());
- rProp.Value = uno::makeAny(false);
+ rProp.Value <<= false;
}
}
xRun->setPropertyValue("CharInteropGrabBag", uno::makeAny(aGrabBag));
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 94131d5eeed5..0cd8202d849d 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -788,7 +788,7 @@ css::uno::Sequence< css::uno::Any >
if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xSel );
+ aRet[0] <<= xSel;
return aRet;
}
}
@@ -810,7 +810,7 @@ css::uno::Sequence< css::uno::Any >
if ( pAccImpl && pAccImpl->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence< uno::Any > aRet(1);
- aRet[0] = uno::makeAny( xAcc );
+ aRet[0] <<= xAcc;
return aRet;
}
}
@@ -856,7 +856,7 @@ css::uno::Sequence< css::uno::Any >
SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
if ( pAccImpl && pAccImpl->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
- aRet[nIndex] = uno::makeAny( xAcc );
+ aRet[nIndex] <<= xAcc;
}
}
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index b44e2bc61558..39e197fc2789 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1904,7 +1904,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
const Size a100thMMSize( 1000, 1000 );
const Size aPixelSize = GetMap()->LogicToPixel( a100thMMSize );
const float fRatio = ((float)a100thMMSize.Width()/100)/aPixelSize.Width();
- rPropVal.Value = uno::makeAny( fRatio );
+ rPropVal.Value <<= fRatio;
rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
pValues[ aValues.getLength() - 1 ] = rPropVal;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index f9bd0a6c37c4..279a05af976b 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -786,7 +786,7 @@ void SwFormat::GetGrabBagItem(uno::Any& rVal) const
else
{
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 69add5f044c5..b688a30c7240 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -434,7 +434,7 @@ namespace sw { namespace mark
{
if ( IsChecked() != checked )
{
- (*GetParameters())[OUString(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
+ (*GetParameters())[OUString(ODF_FORMCHECKBOX_RESULT)] <<= checked;
// mark document as modified
SwDoc *const pDoc( GetMarkPos().GetDoc() );
if ( pDoc )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 03f887808836..838c8c742b09 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1024,7 +1024,7 @@ void SwNumRule::GetGrabBagItem(uno::Any& rVal) const
else
{
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 8ccc886fd1a9..bd17f1aca24a 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -386,7 +386,7 @@ void SwTextBoxHelper::getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uI
}
break;
case MID_CHAIN_NAME:
- rValue = uno::makeAny(pFormat->GetName());
+ rValue <<= pFormat->GetName();
break;
}
}
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 0eea0338b447..2d9e4c6dc109 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -253,8 +253,8 @@ public:
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
- aArgs[1] = uno::Any( mpDocShell->GetModel() );
+ aArgs[0] <<= uno::Reference< uno::XInterface >();
+ aArgs[1] <<= mpDocShell->GetModel();
uno::Reference< uno::XInterface > xDocObj = ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
SAL_INFO("sw.uno",
"Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get());
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 6681928cce63..0b3bbc279fd3 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1580,7 +1580,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
break;
}
}
- aRet = uno::makeAny(nRet);
+ aRet <<= nRet;
}
else
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 54eca80fa57f..fbf373d9b008 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2190,7 +2190,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemP
for(auto& rNV : aSeq)
{
rNV.Name = GetCommandContextByIndex(nIndex++);
- rNV.Value = uno::makeAny(OUString());
+ rNV.Value <<= OUString();
}
SwFormat* pFormat = static_cast<SwDocStyleSheet*>(GetStyleSheetBase())->GetCollection();
if(pFormat && RES_CONDTXTFMTCOLL == pFormat->Which())
@@ -2205,7 +2205,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemP
// get programmatic style name from UI style name
OUString aStyleName = pCond->GetTextFormatColl()->GetName();
SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum(GetFamily()), true);
- pSeq[n].Value = uno::makeAny(aStyleName);
+ pSeq[n].Value <<= aStyleName;
}
}
return uno::makeAny(aSeq);
@@ -2279,7 +2279,7 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry
//UUUU
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && aResult.getValueType() == cppu::UnoType<sal_Int32>::get())
- aResult = uno::makeAny<sal_Int16>(aResult.get<sal_Int32>());
+ aResult <<= (sal_Int16)(aResult.get<sal_Int32>());
//UUUU check for needed metric translation
if(rEntry.nMemberId & SFX_METRIC_ITEM && GetDoc())
{
@@ -3207,7 +3207,7 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence
pFrameFormat = &pDesc->GetMaster();
const uno::Reference<text::XText> xRet = lcl_makeHeaderFooter(nRes, nRes == RES_HEADER, pFrameFormat);
if (xRet.is())
- aRet[nProp] = uno::makeAny(xRet);
+ aRet[nProp] <<= xRet;
}
break;
case FN_PARAM_FTN_INFO:
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 92eb37cabc0f..27d3af746b38 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -317,7 +317,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemProp
else if(FN_TABLE_RELATIVE_WIDTH == pEntry->nWID)
rSz.QueryValue(aRet, MID_FRMSIZE_REL_WIDTH);
else
- aRet = uno::makeAny<bool>(0 != rSz.GetWidthPercent());
+ aRet <<= (0 != rSz.GetWidthPercent());
return aRet;
}
@@ -1746,7 +1746,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
{
auto pFormat(SwUnoCursorHelper::GetCurTextFormatColl(rUnoCursor, false));
if(pFormat)
- aResult = uno::makeAny(pFormat->GetName());
+ aResult <<= pFormat->GetName();
}
break;
default:
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index e331b9de6e45..1a434c6a607e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -148,10 +148,10 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
if (!aBookmarkName.isEmpty()) {
m_aFieldStack.back().SetBookmarkName(aBookmarkName);
m_aFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
- m_aFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.msToolTip));
- m_aFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.msTitle));
+ m_aFieldStack.back().getParameters()["Description"] <<= aFormula.msToolTip;
+ m_aFieldStack.back().getParameters()["Name"] <<= aFormula.msTitle;
if (aFormula.mnMaxLen)
- m_aFieldStack.back().getParameters()["MaxLength"] = uno::makeAny(OUString::number(aFormula.mnMaxLen));
+ m_aFieldStack.back().getParameters()["MaxLength"] <<= OUString::number(aFormula.mnMaxLen);
}
return eF_ResT::TEXT;
}
@@ -205,8 +205,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
if (pFieldmark!=nullptr) {
IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark);
- (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(OUString(aFormula.msTitle));
- (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(OUString(aFormula.msToolTip));
+ (*pParameters)[ODF_FORMCHECKBOX_NAME] <<= aFormula.msTitle;
+ (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] <<= aFormula.msToolTip;
if(pCheckboxFm)
pCheckboxFm->SetChecked(aFormula.mnChecked);
@@ -278,9 +278,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
{
uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size());
std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin());
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] <<= vListEntries;
sal_Int32 nIndex = aFormula.mfDropdownIndex < aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0;
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(nIndex);
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] <<= nIndex;
// set field data here...
}
}
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 0d66d771058d..471e57aa618b 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -371,7 +371,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
// create the popup menu
uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
aPopupMenu[0].Name = "CommandURL";
- aPopupMenu[0].Value = uno::makeAny( "vnd.openoffice.org:" + sMenuName );
+ aPopupMenu[0].Value <<= "vnd.openoffice.org:" + sMenuName;
aPopupMenu[1].Name = "Label";
aPopupMenu[1].Value <<= sMenuName;
aPopupMenu[2].Name = "Type";
@@ -743,7 +743,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
// insert spacer
uno::Sequence< beans::PropertyValue > sProps( 1 );
sProps[ 0 ].Name = "Type";
- sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE );
+ sProps[ 0 ].Value <<= ui::ItemType::SEPARATOR_LINE;
toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );
}
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 73fb70565f42..a6746a4a144e 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -929,7 +929,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
{
aCommandSequence[nIndex].Name = (*aIter).first;
aCommandSequence[nIndex].Handle = -1;
- aCommandSequence[nIndex].Value = makeAny( OUString((*aIter).second) );
+ aCommandSequence[nIndex].Value <<= (*aIter).second;
aCommandSequence[nIndex].State = beans::PropertyState_DIRECT_VALUE;
++aIter;
++nIndex;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 3bd9c957352a..bfb0b1ba5ce6 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -39,9 +39,9 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere
SAL_INFO("sw", "SwVbaGlobals::SwVbaGlobals()");
uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
aInitArgs[ 0 ].Name = "Application";
- aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
+ aInitArgs[ 0 ].Value <<= getApplication();
aInitArgs[ 1 ].Name = "WordDocumentContext";
- aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
+ aInitArgs[ 1 ].Value <<= getXSomethingFromArgs< frame::XModel >( aArgs, 0 );
init( aInitArgs );
}
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index fc5017d50aff..e4d9fbe82ae4 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -675,17 +675,17 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
{
case word::WdInformation::wdActiveEndPageNumber:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor ) );
+ result <<= SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor );
break;
}
case word::WdInformation::wdNumberOfPagesInDocument:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel ) );
+ result <<= SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel );
break;
}
case word::WdInformation::wdVerticalPositionRelativeToPage:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor ) );
+ result <<= SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor );
break;
}
case word::WdInformation::wdWithInTable:
@@ -693,10 +693,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
xCursorProps->getPropertyValue("TextTable") >>= xTextTable;
- if( xTextTable.is() )
- result = uno::makeAny( true );
- else
- result = uno::makeAny( false );
+ result <<= xTextTable.is();
break;
}
case word::WdInformation::wdHeaderFooterType:
@@ -761,7 +758,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
nHeaderFooterType = -1;
}
}
- result = uno::makeAny( nHeaderFooterType );
+ result <<= nHeaderFooterType;
break;
}
default:
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 59eff0ef64df..de9a51471a60 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2709,7 +2709,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const
break;
case DBCONN_MSJET:
case DBCONN_MSACE:
- aSuppressVersionsAny = uno::makeAny(true);
+ aSuppressVersionsAny <<= true;
break;
}
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 5ddc121db500..80520635b2fb 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1289,8 +1289,8 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value = makeAny(xDialogParentWindow);
- pArray[0] = makeAny(aParam);
+ aParam.Value <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 4cadee411d4e..70cc06b6cb24 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -313,8 +313,8 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
Any* pArray = aSequence.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value = makeAny(xDialogParentWindow);
- pArray[0] = makeAny(aParam);
+ aParam.Value <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSequence );
//execute dialog
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 7da48b1dd92a..0a9c346e3c28 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1225,7 +1225,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
- aIterator->second = uno::makeAny(false);
+ aIterator->second <<= false;
}
rWrtSh.SetAttrItem( aGrabBag );
}
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 208c34f6500b..2f7d457cd56c 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -182,12 +182,12 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
aParam1.Name = "ParentWindow";
- aParam1.Value = uno::makeAny(xDialogParentWindow);
+ aParam1.Value <<= xDialogParentWindow;
beans::PropertyValue aParam2;
aParam2.Name = "ChartModel";
- aParam2.Value = uno::makeAny(xChartModel);
- pArray[0] = uno::makeAny(aParam1);
- pArray[1] = uno::makeAny(aParam2);
+ aParam2.Value <<= xChartModel;
+ pArray[0] <<= aParam1;
+ pArray[1] <<= aParam2;
xInit->initialize( aSeq );
// try to set the dialog's position so it doesn't hide the chart
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index ff66a402903c..55b1c55c3726 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -132,8 +132,8 @@ void SwView::ExecLingu(SfxRequest &rReq)
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value = makeAny(xDialogParentWindow);
- pArray[0] = makeAny(aParam);
+ aParam.Value <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
@@ -898,7 +898,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void )
if ( selection >= 0 )
{
OUString sKey = ODF_FORMDROPDOWN_RESULT;
- (*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
+ (*pFieldmark->GetParameters())[ sKey ] <<= selection;
pFieldmark->Invalidate();
SwView& rView = static_cast<SwEditWin*>( GetParent() )->GetView();
rView.GetDocShell()->SetModified();
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 4efd976b1bda..b62aa6577022 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -182,7 +182,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
- aIterator->second = uno::makeAny(false);
+ aIterator->second <<= false;
}
rSet.Put( aGrabBag );
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index e5c6fc81d6be..76094cc1be3a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -3064,7 +3064,7 @@ css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName )
{
case BASEPROPERTY_URL:
{
- aProp = makeAny( OUString( pBase->GetURL() ) );
+ aProp <<= pBase->GetURL();
break;
}
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 94769594276e..ccedc899fe5d 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -185,8 +185,7 @@ static void lcl_throwIndexOutOfBoundsException( )
{
if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0))
lcl_throwIndexOutOfBoundsException( );
- Any aAny;
- aAny = makeAny( maRoadmapItems.at( Index ));
+ Any aAny( maRoadmapItems.at( Index ) );
return aAny;
}
@@ -257,7 +256,7 @@ static void lcl_throwIndexOutOfBoundsException( )
ContainerEvent aEvent;
aEvent.Source = *this;
aEvent.Element <<= xRoadmapItem;
- aEvent.Accessor = makeAny(Index);
+ aEvent.Accessor <<= Index;
return aEvent;
}
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 0752bcd309af..9f8f4c7888b1 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -374,7 +374,7 @@ void OFileAccess::createFolder( const OUString& NewFolderURL )
Sequence<OUString> aNames { "Title" };
Sequence< Any > aValues(1);
Any* pValues = aValues.getArray();
- pValues[0] = makeAny( OUString( aTitle ) );
+ pValues[0] <<= aTitle;
ucbhelper::Content aNew;
try
@@ -634,7 +634,7 @@ bool OFileAccess::createNewFile( const OUString & rParentURL,
Sequence<OUString> aNames { "Title" };
Sequence< Any > aValues(1);
Any* pValues = aValues.getArray();
- pValues[0] = makeAny( OUString( rTitle ) );
+ pValues[0] <<= rTitle;
try
{
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 2f061473e0bb..f288a60aec18 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -445,7 +445,7 @@ bool setTitle(
uno::Sequence< beans::PropertyValue > aPropValues( 1 );
aPropValues[ 0 ].Name = "Title";
aPropValues[ 0 ].Handle = -1;
- aPropValues[ 0 ].Value = uno::makeAny( rNewTitle );
+ aPropValues[ 0 ].Value <<= rNewTitle;
ucb::Command aSetPropsCommand(
"setPropertyValues",
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 646cd2a2784f..5402de23ad52 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -141,7 +141,7 @@ OUString SAL_CALL Content::getContentType()
#define EXCEPT(aExcept) \
do { \
if (bThrow) throw aExcept;\
- aRet = uno::makeAny( aExcept );\
+ aRet <<= aExcept;\
} while(false)
uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterface >& rContext, bool bThrow)
@@ -722,8 +722,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
aEvent.PropertyName = "Title";
if (oldName)
- aEvent.OldValue = uno::makeAny(OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8));
- aEvent.NewValue = uno::makeAny(aNewTitle);
+ aEvent.OldValue <<= OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8);
+ aEvent.NewValue <<= aNewTitle;
aChanges.getArray()[ nChanged ] = aEvent;
nTitlePos = nChanged++;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 141d3ea6da52..012716989b52 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1184,10 +1184,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
if ( aNewValue != m_aProps.getTargetURL() )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue
- = uno::makeAny( m_aProps.getTargetURL() );
- aEvent.NewValue
- = uno::makeAny( aNewValue );
+ aEvent.OldValue <<= m_aProps.getTargetURL();
+ aEvent.NewValue <<= aNewValue;
aChanges.getArray()[ nChanged ] = aEvent;
@@ -1309,8 +1307,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
if ( !aOldTitle.isEmpty() )
{
aEvent.PropertyName = "Title";
- aEvent.OldValue = uno::makeAny( aOldTitle );
- aEvent.NewValue = uno::makeAny( m_aProps.getTitle() );
+ aEvent.OldValue <<= aOldTitle;
+ aEvent.NewValue <<= m_aProps.getTitle();
aChanges.getArray()[ nChanged ] = aEvent;
nChanged++;
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 55a161b27b5c..585f01b402cf 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1125,8 +1125,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( aNewValue != m_aProps.aMediaType )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue = uno::makeAny( m_aProps.aMediaType );
- aEvent.NewValue = uno::makeAny( aNewValue );
+ aEvent.OldValue <<= m_aProps.aMediaType;
+ aEvent.NewValue <<= aNewValue;
m_aProps.aMediaType = aNewValue;
nChanged++;
@@ -1159,8 +1159,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( bNewValue != m_aProps.bCompressed )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue = uno::makeAny( m_aProps.bCompressed );
- aEvent.NewValue = uno::makeAny( bNewValue );
+ aEvent.OldValue <<= m_aProps.bCompressed;
+ aEvent.NewValue <<= bNewValue;
m_aProps.bCompressed = bNewValue;
nChanged++;
@@ -1193,8 +1193,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( bNewValue != m_aProps.bEncrypted )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue = uno::makeAny( m_aProps.bEncrypted );
- aEvent.NewValue = uno::makeAny( bNewValue );
+ aEvent.OldValue <<= m_aProps.bEncrypted;
+ aEvent.NewValue <<= bNewValue;
m_aProps.bEncrypted = bNewValue;
nChanged++;
@@ -1238,9 +1238,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( aNewValue != m_aProps.aEncryptionKey )
{
aEvent.PropertyName = rValue.Name;
- aEvent.OldValue = uno::makeAny(
- m_aProps.aEncryptionKey );
- aEvent.NewValue = uno::makeAny( aNewValue );
+ aEvent.OldValue <<= m_aProps.aEncryptionKey;
+ aEvent.NewValue <<= aNewValue;
m_aProps.aEncryptionKey = aNewValue;
nChanged++;
@@ -1353,8 +1352,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( !aNewTitle.isEmpty() )
{
aEvent.PropertyName = "Title";
- aEvent.OldValue = uno::makeAny( m_aProps.aTitle );
- aEvent.NewValue = uno::makeAny( aNewTitle );
+ aEvent.OldValue <<= m_aProps.aTitle;
+ aEvent.NewValue <<= aNewTitle;
m_aProps.aTitle = aNewTitle;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index f480b97069aa..b120960aca72 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1328,8 +1328,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
if ( !aOldTitle.isEmpty() )
{
aEvent.PropertyName = "Title";
- aEvent.OldValue = uno::makeAny( aOldTitle );
- aEvent.NewValue = uno::makeAny( m_aProps.getTitle() );
+ aEvent.OldValue <<= aOldTitle;
+ aEvent.NewValue <<= m_aProps.getTitle();
aChanges.getArray()[ nChanged ] = aEvent;
nChanged++;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 5ca16f6d0e30..255a1cd0f850 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -752,7 +752,7 @@ uno::Any SAL_CALL Content::execute(
// Unreachable
}
- aRet = uno::makeAny( createNewContent( aArg ) );
+ aRet <<= createNewContent( aArg );
}
else if ( aCommand.Name == "addProperty" )
{
@@ -2144,8 +2144,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
osl::Guard< osl::Mutex > aGuard( m_aMutex );
aEvent.PropertyName = "Title";
- aEvent.OldValue = uno::makeAny( aOldTitle );
- aEvent.NewValue = uno::makeAny( aNewTitle );
+ aEvent.OldValue <<= aOldTitle;
+ aEvent.NewValue <<= aNewTitle;
m_aEscapedTitle = NeonUri::escapeSegment( aNewTitle );
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 95f64c1a922f..77e46b7881b0 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -673,14 +673,14 @@ bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyN
const SvtLinguOptions &rOpt = aOpt;
OUString aTmp( lcl_LanguageToCfgLocaleStr( rOpt.nDefaultLanguage ) );
- *pValue++ = uno::makeAny( aTmp ); // 0
- *pValue++ = uno::makeAny( rOpt.aActiveDics ); // 1
+ *pValue++ <<= aTmp; // 0
+ *pValue++ <<= rOpt.aActiveDics; // 1
*pValue++ <<= rOpt.bIsUseDictionaryList; // 2
*pValue++ <<= rOpt.bIsIgnoreControlCharacters; // 3
aTmp = lcl_LanguageToCfgLocaleStr( rOpt.nDefaultLanguage_CJK );
- *pValue++ = uno::makeAny( aTmp ); // 5
+ *pValue++ <<= aTmp; // 5
aTmp = lcl_LanguageToCfgLocaleStr( rOpt.nDefaultLanguage_CTL );
- *pValue++ = uno::makeAny( aTmp ); // 6
+ *pValue++ <<= aTmp; // 6
*pValue++ <<= rOpt.bIsSpellUpperCase; // 7
*pValue++ <<= rOpt.bIsSpellWithDigits; // 8
@@ -695,7 +695,7 @@ bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyN
*pValue++ <<= rOpt.bIsHyphSpecial; // 18
*pValue++ <<= rOpt.bIsHyphAuto; // 19
- *pValue++ = uno::makeAny( rOpt.aActiveConvDics ); // 20
+ *pValue++ <<= rOpt.aActiveConvDics; // 20
*pValue++ <<= rOpt.bIsIgnorePostPositionalWord; // 21
*pValue++ <<= rOpt.bIsAutoCloseDialog; // 22
@@ -1055,7 +1055,7 @@ uno::Reference< util::XChangesBatch > const & SvtLinguConfig::GetMainUpdateAcces
// get configuration update access
beans::PropertyValue aValue;
aValue.Name = "nodepath";
- aValue.Value = uno::makeAny(OUString("org.openoffice.Office.Linguistic"));
+ aValue.Value <<= OUString("org.openoffice.Office.Linguistic");
uno::Sequence< uno::Any > aProps(1);
aProps[0] <<= aValue;
m_xMainUpdateAccess.set(
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 0521d4826d0b..d0b6e6020a2f 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -539,7 +539,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt )
evt.ScriptCode = xNameQuery->getCodeNameForObject( xIf );
// handle if we passed in our own arguments
if ( !rEvt.Arguments.getLength() )
- evt.Arguments[ 0 ] = uno::makeAny( aEvt );
+ evt.Arguments[ 0 ] <<= aEvt;
xScriptListener->firing( evt );
}
else
@@ -553,7 +553,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt )
evt.Source = xThisControl;
aEvt.Source = xControl;
evt.ScriptCode = m_sLibraryAndCodeName;
- evt.Arguments[ 0 ] = uno::makeAny( aEvt );
+ evt.Arguments[ 0 ] <<= aEvt;
xScriptListener->firing( evt );
}
}
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 3e94440f5a1a..afd4958e2aa6 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -65,7 +65,7 @@ ScVbaListBox::getValue()
throw uno::RuntimeException( "Attribute use invalid." );
uno::Any aRet;
if ( sSelection.getLength() )
- aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] );
+ aRet <<= sItems[ sSelection[ 0 ] ];
return aRet;
}
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index a0a9c73b3964..7ca7c4f87bcb 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -75,7 +75,7 @@ uno::Any ListPropListener::getValueEvent()
sReturnArray[ i ].realloc( 10 );
sReturnArray[ i ][ 0 ] = sList[ i ];
}
- aRet = uno::makeAny( sReturnArray );
+ aRet <<= sReturnArray;
}
return aRet;
}
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 7ff527ac8353..111ff8c7f614 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -266,7 +266,7 @@ ScVbaUserForm::getValue( const OUString& aPropertyName )
ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
if (pControl && !m_sLibName.isEmpty())
pControl->setLibraryAndCodeName( m_sLibName.concat( "." ).concat( getName() ) );
- aResult = uno::makeAny( xVBAControl );
+ aResult <<= xVBAControl;
}
}
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 7b73d2f11b3b..4fb239bac73a 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -350,7 +350,7 @@ ScVbaShape::TextFrame()
{
uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
uno::Sequence< uno::Any > aArgs(2);
- aArgs[0] = uno::makeAny( getParent() );
+ aArgs[0] <<= getParent();
aArgs[1] <<= m_xShape;
uno::Reference< uno::XInterface > xTextFrame = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.excel.TextFrame" , aArgs, xContext );
return uno::makeAny( xTextFrame );
@@ -687,7 +687,7 @@ ScVbaShape::WrapFormat()
{
uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
uno::Sequence< uno::Any > aArgs(2);
- aArgs[0] = uno::makeAny( getParent() );
+ aArgs[0] <<= getParent();
aArgs[1] <<= m_xShape;
uno::Reference< uno::XInterface > xWrapFormat = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.word.WrapFormat" , aArgs, xContext );
return uno::makeAny( xWrapFormat );
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b5700d5a8cc9..c97080e46c1c 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -249,7 +249,7 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Nam
if ( Name == "system.desktop-environment" )
{
- retVal = uno::makeAny( Application::GetDesktopEnvironment() );
+ retVal <<= Application::GetDesktopEnvironment();
}
else if( m_xNextContext.is() )
{
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 8067a1ee2256..4929241407f2 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -135,7 +135,7 @@ Reference< XInterface > openConfig(const char* sPackage)
aParam.Value <<= OUString( "/org.openoffice.TypeDetection.Types/Types" );
if (rtl_str_compareIgnoreAsciiCase(sPackage, "filters") == 0)
aParam.Value <<= OUString( "/org.openoffice.TypeDetection.GraphicFilter/Filters" );
- lParams[0] = makeAny(aParam);
+ lParams[0] <<= aParam;
// get access to file
xCfg = xConfigProvider->createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams);
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 0d1f6b87e1ce..fd66345dfb1f 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -57,7 +57,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co
// creation arguments: nodepath
PropertyValue aPathArgument;
aPathArgument.Name = "nodepath";
- aPathArgument.Value = Any(rTree.getToken(i++, '/'));
+ aPathArgument.Value <<= rTree.getToken(i++, '/');
Sequence< Any > aArguments( 1 );
aArguments[ 0 ] <<= aPathArgument;
@@ -113,13 +113,13 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree )
// creation arguments: nodepath
PropertyValue aPathArgument;
aPathArgument.Name = "nodepath";
- aPathArgument.Value = Any(sTree);
+ aPathArgument.Value <<= sTree;
// creation arguments: commit mode
PropertyValue aModeArgument;
bool bAsynchron = true;
aModeArgument.Name = "lazywrite";
- aModeArgument.Value = Any(bAsynchron);
+ aModeArgument.Value <<= bAsynchron;
Sequence< Any > aArguments( 2 );
aArguments[ 0 ] <<= aPathArgument;
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index f142fa46972c..d8e13aaede0b 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -87,11 +87,11 @@ Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage )
Sequence< PropertyValue > aRet( 1 );
aRet[0].Name = "PageSize";
if( i_nPage < int(mpData->maPages.size() ) )
- aRet[0].Value = makeAny( mpData->maPages[i_nPage].maPageSize );
+ aRet[0].Value <<= mpData->maPages[i_nPage].maPageSize;
else
{
awt::Size aEmpty( 0, 0 );
- aRet[0].Value = makeAny( aEmpty );
+ aRet[0].Value <<= aEmpty;
}
return aRet;
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a047e78d0dc8..63da93c899b2 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -354,7 +354,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
// Argh ! That sure needs cleaning up
if( pContentVal )
{
- pContentVal->Value = css::uno::makeAny( sal_Int32( 1 ) );
+ pContentVal->Value <<= sal_Int32( 1 );
xController->setValue("PageRange", pPagesVal->Value);
}
}
@@ -1824,7 +1824,7 @@ void PrinterOptionsHelper::appendPrintUIOptions( css::uno::Sequence< css::beans:
io_rProps.realloc( nIndex+1 );
css::beans::PropertyValue aVal;
aVal.Name = "ExtraPrintUIOptions";
- aVal.Value = css::uno::makeAny( comphelper::containerToSequence(m_aUIProperties) );
+ aVal.Value <<= comphelper::containerToSequence(m_aUIProperties);
io_rProps[ nIndex ] = aVal;
}
}
@@ -1860,35 +1860,35 @@ css::uno::Any PrinterOptionsHelper::setUIControlOpt(const css::uno::Sequence< OU
if( !i_rTitle.isEmpty() )
{
aCtrl[nUsed ].Name = "Text";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rTitle );
+ aCtrl[nUsed++].Value <<= i_rTitle;
}
if( i_rHelpIds.getLength() )
{
aCtrl[nUsed ].Name = "HelpId";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rHelpIds );
+ aCtrl[nUsed++].Value <<= i_rHelpIds;
}
aCtrl[nUsed ].Name = "ControlType";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rType );
+ aCtrl[nUsed++].Value <<= i_rType;
aCtrl[nUsed ].Name = "ID";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rIDs );
+ aCtrl[nUsed++].Value <<= i_rIDs;
if( i_pVal )
{
aCtrl[nUsed ].Name = "Property";
- aCtrl[nUsed++].Value = css::uno::makeAny( *i_pVal );
+ aCtrl[nUsed++].Value <<= *i_pVal;
}
if( !i_rControlOptions.maDependsOnName.isEmpty() )
{
aCtrl[nUsed ].Name = "DependsOnName";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rControlOptions.maDependsOnName );
+ aCtrl[nUsed++].Value <<= i_rControlOptions.maDependsOnName;
if( i_rControlOptions.mnDependsOnEntry != -1 )
{
aCtrl[nUsed ].Name = "DependsOnEntry";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rControlOptions.mnDependsOnEntry );
+ aCtrl[nUsed++].Value <<= i_rControlOptions.mnDependsOnEntry;
}
if( i_rControlOptions.mbAttachToDependency )
{
aCtrl[nUsed ].Name = "AttachToDependency";
- aCtrl[nUsed++].Value = css::uno::makeAny( i_rControlOptions.mbAttachToDependency );
+ aCtrl[nUsed++].Value <<= i_rControlOptions.mbAttachToDependency;
}
}
if( !i_rControlOptions.maGroupHint.isEmpty() )
@@ -1960,7 +1960,7 @@ css::uno::Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID,
}
css::beans::PropertyValue aVal;
aVal.Name = i_rProperty;
- aVal.Value = css::uno::makeAny( i_bValue );
+ aVal.Value <<= i_bValue;
css::uno::Sequence< OUString > aIds { i_rID };
return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions);
}
@@ -1978,16 +1978,16 @@ css::uno::Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const css::uno::Se
sal_Int32 nUsed = aOpt.maAddProps.size();
aOpt.maAddProps.resize( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) );
aOpt.maAddProps[nUsed].Name = "Choices";
- aOpt.maAddProps[nUsed].Value = css::uno::makeAny( i_rChoices );
+ aOpt.maAddProps[nUsed].Value <<= i_rChoices;
if( i_rDisabledChoices.getLength() )
{
aOpt.maAddProps[nUsed+1].Name = "ChoicesDisabled";
- aOpt.maAddProps[nUsed+1].Value = css::uno::makeAny( i_rDisabledChoices );
+ aOpt.maAddProps[nUsed+1].Value <<= i_rDisabledChoices;
}
css::beans::PropertyValue aVal;
aVal.Name = i_rProperty;
- aVal.Value = css::uno::makeAny( i_nValue );
+ aVal.Value <<= i_nValue;
return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, "Radio", &aVal, aOpt);
}
@@ -2004,16 +2004,16 @@ css::uno::Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rI
sal_Int32 nUsed = aOpt.maAddProps.size();
aOpt.maAddProps.resize( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) );
aOpt.maAddProps[nUsed].Name = "Choices";
- aOpt.maAddProps[nUsed].Value = css::uno::makeAny( i_rChoices );
+ aOpt.maAddProps[nUsed].Value <<= i_rChoices;
if( i_rDisabledChoices.getLength() )
{
aOpt.maAddProps[nUsed+1].Name = "ChoicesDisabled";
- aOpt.maAddProps[nUsed+1].Value = css::uno::makeAny( i_rDisabledChoices );
+ aOpt.maAddProps[nUsed+1].Value <<= i_rDisabledChoices;
}
css::beans::PropertyValue aVal;
aVal.Name = i_rProperty;
- aVal.Value = css::uno::makeAny( i_nValue );
+ aVal.Value <<= i_nValue;
css::uno::Sequence< OUString > aIds { i_rID };
return setUIControlOpt(aIds, i_rTitle, i_rHelpId, "List", &aVal, aOpt);
}
@@ -2033,9 +2033,9 @@ css::uno::Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID,
sal_Int32 nUsed = aOpt.maAddProps.size();
aOpt.maAddProps.resize( nUsed + 2 );
aOpt.maAddProps[nUsed ].Name = "MinValue";
- aOpt.maAddProps[nUsed++].Value = css::uno::makeAny( i_nMinValue );
+ aOpt.maAddProps[nUsed++].Value <<= i_nMinValue;
aOpt.maAddProps[nUsed ].Name = "MaxValue";
- aOpt.maAddProps[nUsed++].Value = css::uno::makeAny( i_nMaxValue );
+ aOpt.maAddProps[nUsed++].Value <<= i_nMaxValue;
}
css::uno::Sequence< OUString > aHelpId;
@@ -2046,7 +2046,7 @@ css::uno::Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID,
}
css::beans::PropertyValue aVal;
aVal.Name = i_rProperty;
- aVal.Value = css::uno::makeAny( i_nValue );
+ aVal.Value <<= i_nValue;
css::uno::Sequence< OUString > aIds { i_rID };
return setUIControlOpt(aIds, i_rTitle, aHelpId, "Range", &aVal, aOpt);
}
@@ -2066,7 +2066,7 @@ css::uno::Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID,
}
css::beans::PropertyValue aVal;
aVal.Name = i_rProperty;
- aVal.Value = css::uno::makeAny( i_rValue );
+ aVal.Value <<= i_rValue;
css::uno::Sequence< OUString > aIds { i_rID };
return setUIControlOpt(aIds, i_rTitle, aHelpId, "Edit", &aVal, i_rControlOptions);
}
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index ec2e3f7b31d5..14268cee9367 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -154,7 +154,7 @@ css::uno::Sequence<css::beans::PropertyValue> UIObjectUnoObj::getState()
for (auto itr = aMap.begin(), itrEnd = aMap.end(); itr != itrEnd; ++itr, ++i)
{
aProps[i].Name = itr->first;
- aProps[i].Value = css::uno::makeAny(itr->second);
+ aProps[i].Value <<= itr->second;
}
return aProps;
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index d1cc051721bc..d0349d8c4f54 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -747,10 +747,10 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
aDragSourceSN = "com.sun.star.datatransfer.dnd.X11DragSource";
aDropTargetSN = "com.sun.star.datatransfer.dnd.X11DropTarget";
- aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
- aDragSourceAL[ 1 ] = makeAny(static_cast<sal_IntPtr>(pEnvData->aShellWindow));
- aDropTargetAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
- aDropTargetAL[ 1 ] = makeAny(static_cast<sal_IntPtr>(pEnvData->aShellWindow));
+ aDragSourceAL[ 0 ] <<= Application::GetDisplayConnection();
+ aDragSourceAL[ 1 ] <<= static_cast<sal_IntPtr>(pEnvData->aShellWindow);
+ aDropTargetAL[ 0 ] <<= Application::GetDisplayConnection();
+ aDropTargetAL[ 1 ] <<= static_cast<sal_IntPtr>(pEnvData->aShellWindow);
#endif
if( !aDragSourceSN.isEmpty() )
mpWindowImpl->mpFrameData->mxDragSource.set(
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 14d0e935c60d..4eee9667c792 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3568,13 +3568,13 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas )
// Feed any with operating system's window handle
// common: first any is VCL pointer to window (for VCL canvas)
- aArg[ 0 ] = makeAny( reinterpret_cast<sal_Int64>(this) );
+ aArg[ 0 ] <<= reinterpret_cast<sal_Int64>(this);
aArg[ 1 ] = GetSystemDataAny();
- aArg[ 2 ] = makeAny( css::awt::Rectangle( mnOutOffX, mnOutOffY, mnOutWidth, mnOutHeight ) );
- aArg[ 3 ] = makeAny( mpWindowImpl->mbAlwaysOnTop );
- aArg[ 4 ] = makeAny( Reference< css::awt::XWindow >(
+ aArg[ 2 ] <<= css::awt::Rectangle( mnOutOffX, mnOutOffY, mnOutWidth, mnOutHeight );
+ aArg[ 3 ] <<= mpWindowImpl->mbAlwaysOnTop;
+ aArg[ 4 ] <<= Reference< css::awt::XWindow >(
const_cast<vcl::Window*>(this)->GetComponentInterface(),
- UNO_QUERY ));
+ UNO_QUERY );
aArg[ 5 ] = GetSystemGfxDataAny();
Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index e8683dfbc37c..0db00ba9d777 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -567,9 +567,9 @@ css::uno::Any X11SalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rS
{
cairo::X11Surface& rXlibSurface=dynamic_cast<cairo::X11Surface&>(*rSurface.get());
css::uno::Sequence< css::uno::Any > args( 3 );
- args[0] = css::uno::Any( false ); // do not call XFreePixmap on it
- args[1] = css::uno::Any( rXlibSurface.getPixmap()->mhDrawable );
- args[2] = css::uno::Any( sal_Int32( rXlibSurface.getDepth() ) );
+ args[0] <<= false; // do not call XFreePixmap on it
+ args[1] <<= rXlibSurface.getPixmap()->mhDrawable;
+ args[2] <<= sal_Int32( rXlibSurface.getDepth() );
return css::uno::Any(args);
}
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 75971173f978..da78072d2b45 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -201,7 +201,7 @@ String2Float( uno::Any& rAny, const gchar * value )
if( 1 != sscanf( value, "%g", &fval ) )
return false;
- rAny = uno::makeAny( fval );
+ rAny <<= fval;
return true;
}
@@ -288,7 +288,7 @@ String2Color( uno::Any& rAny, const gchar * value )
return false;
sal_Int32 nColor = (sal_Int32) blue | ( (sal_Int32) green << 8 ) | ( ( sal_Int32 ) red << 16 );
- rAny = uno::makeAny( nColor );
+ rAny <<= nColor;
return true;
}
@@ -353,7 +353,7 @@ Style2FontSlant( uno::Any& rAny, const gchar * value )
else
return false;
- rAny = uno::makeAny( aFontSlant );
+ rAny <<= aFontSlant;
return true;
}
@@ -373,7 +373,7 @@ String2Weight( uno::Any& rAny, const gchar * value )
if( 1 != sscanf( value, "%g", &weight ) )
return false;
- rAny = uno::makeAny( weight / 4 );
+ rAny <<= weight / 4;
return true;
}
@@ -429,7 +429,7 @@ Justification2Adjust( uno::Any& rAny, const gchar * value )
else
return false;
- rAny = uno::makeAny( nParagraphAdjust );
+ rAny <<= nParagraphAdjust;
return true;
}
@@ -466,7 +466,7 @@ String2Strikeout( uno::Any& rAny, const gchar * value )
if( ( nullptr != font_strikethrough[n] ) &&
0 == strncmp( value, font_strikethrough[n], strlen( font_strikethrough[n] ) ) )
{
- rAny = uno::makeAny( n );
+ rAny <<= n;
return true;
}
}
@@ -519,7 +519,7 @@ String2Underline( uno::Any& rAny, const gchar * value )
else
return false;
- rAny = uno::makeAny( nUnderline );
+ rAny <<= nUnderline;
return true;
}
@@ -543,7 +543,7 @@ SetString( uno::Any& rAny, const gchar * value )
if( !aFontName.isEmpty() )
{
- rAny = uno::makeAny( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) );
+ rAny <<= OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 );
return true;
}
@@ -574,7 +574,7 @@ UnitString2CMM( uno::Any& rAny, const gchar * value )
fValue = fValue * 100;
- rAny = uno::makeAny( (sal_Int32) fValue);
+ rAny <<= (sal_Int32) fValue;
return true;
}
@@ -605,7 +605,7 @@ String2Bool( uno::Any& rAny, const gchar * value )
else
return false;
- rAny = uno::makeAny(bValue);
+ rAny <<= bValue;
return true;
}
@@ -625,7 +625,7 @@ String2Scale( uno::Any& rAny, const gchar * value )
if( 1 != sscanf( value, "%lg", &dval ) )
return false;
- rAny = uno::makeAny((sal_Int16) (dval * 100));
+ rAny <<= (sal_Int16) (dval * 100);
return true;
}
@@ -662,7 +662,7 @@ String2CaseMap( uno::Any& rAny, const gchar * value )
else
return false;
- rAny = uno::makeAny( nCaseMap );
+ rAny <<= nCaseMap;
return true;
}
@@ -729,7 +729,7 @@ String2Locale( uno::Any& rAny, const gchar * value )
g_free(country);
}
- rAny = uno::makeAny(aLocale);
+ rAny <<= aLocale;
}
g_strfreev(str_array);
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 80cc8386d2fb..61825ad6ff0b 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -201,7 +201,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName)
else
aRet.Name = aName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
return aRet;
}
@@ -209,7 +209,7 @@ void BorderHandler::appendGrabBag(const OUString& aKey, const OUString& aValue)
{
beans::PropertyValue aProperty;
aProperty.Name = aKey;
- aProperty.Value = uno::makeAny(aValue);
+ aProperty.Value <<= aValue;
m_aInteropGrabBag.push_back(aProperty);
}
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 47d329d245fa..58c2a35457cc 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -310,7 +310,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_aInteropGrabBagName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
return aRet;
}
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 6d223c263f11..bc00c84999de 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -78,17 +78,17 @@ void CellMarginHandler::createGrabBag(const OUString& aName)
uno::Sequence<beans::PropertyValue> aSeq(2);
aSeq[0].Name = "w";
- aSeq[0].Value = uno::makeAny(m_nWidth);
+ aSeq[0].Value <<= m_nWidth;
aSeq[1].Name = "type";
switch (m_nType)
{
- case NS_ooxml::LN_Value_ST_TblWidth_nil: aSeq[1].Value = uno::makeAny(OUString("nil")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_pct: aSeq[1].Value = uno::makeAny(OUString("pct")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_dxa: aSeq[1].Value = uno::makeAny(OUString("dxa")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_auto: aSeq[1].Value = uno::makeAny(OUString("auto")); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_nil: aSeq[1].Value <<= OUString("nil"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_pct: aSeq[1].Value <<= OUString("pct"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_dxa: aSeq[1].Value <<= OUString("dxa"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_auto: aSeq[1].Value <<= OUString("auto"); break;
}
- aRet.Value = uno::makeAny(aSeq);
+ aRet.Value <<= aSeq;
m_aInteropGrabBag.push_back(aRet);
}
@@ -167,7 +167,7 @@ beans::PropertyValue CellMarginHandler::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_aInteropGrabBagName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
return aRet;
}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index fe7b9a97b0b4..4aa58d2e364b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -191,9 +191,9 @@ DomainMapper::~DomainMapper()
// Grab-bag handling
comphelper::SequenceAsHashMap aProperties;
// Add the saved w:themeFontLang setting
- aProperties["ThemeFontLangProps"] = uno::makeAny(m_pImpl->GetSettingsTable()->GetThemeFontLangProperties());
+ aProperties["ThemeFontLangProps"] <<= m_pImpl->GetSettingsTable()->GetThemeFontLangProperties();
// Add the saved compat settings
- aProperties["CompatSettings"] = uno::makeAny(m_pImpl->GetSettingsTable()->GetCompatSettings());
+ aProperties["CompatSettings"] <<= m_pImpl->GetSettingsTable()->GetCompatSettings();
uno::Reference<beans::XPropertySet> xDocProps(m_pImpl->GetTextDocument(), uno::UNO_QUERY);
if (xDocProps.is())
{
@@ -1640,12 +1640,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
if (aInfo.nSprmId == NS_ooxml::LN_CT_Ruby_rt && aInfo.nHps > 0 )
{
fVal = double(aInfo.nHps) / 2.;
- aVal = uno::makeAny( fVal );
+ aVal <<= fVal;
}
else if (aInfo.nSprmId == NS_ooxml::LN_CT_Ruby_rubyBase && aInfo.nHpsBaseText > 0 )
{
fVal = double(aInfo.nHpsBaseText) / 2.;
- aVal = uno::makeAny( fVal );
+ aVal <<= fVal;
}
else if (m_pImpl->m_bInTableStyleRunProps)
{
@@ -3718,7 +3718,7 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_pImpl->m_aInteropGrabBagName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_pImpl->m_aInteropGrabBag);
m_pImpl->m_aInteropGrabBag.clear();
m_pImpl->m_aInteropGrabBagName.clear();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 2ce6301e6570..8f368a031316 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -337,36 +337,36 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
uno::Sequence< beans::PropertyValue > aGrabBagTS( 10 );
aGrabBagTS[0].Name = "bottomFromText";
- aGrabBagTS[0].Value = uno::makeAny(pTablePositions->getBottomFromText() );
+ aGrabBagTS[0].Value <<= pTablePositions->getBottomFromText();
aGrabBagTS[1].Name = "horzAnchor";
- aGrabBagTS[1].Value = uno::makeAny( pTablePositions->getHorzAnchor() );
+ aGrabBagTS[1].Value <<= pTablePositions->getHorzAnchor();
aGrabBagTS[2].Name = "leftFromText";
- aGrabBagTS[2].Value = uno::makeAny( pTablePositions->getLeftFromText() );
+ aGrabBagTS[2].Value <<= pTablePositions->getLeftFromText();
aGrabBagTS[3].Name = "rightFromText";
- aGrabBagTS[3].Value = uno::makeAny( pTablePositions->getRightFromText() );
+ aGrabBagTS[3].Value <<= pTablePositions->getRightFromText();
aGrabBagTS[4].Name = "tblpX";
- aGrabBagTS[4].Value = uno::makeAny( pTablePositions->getX() );
+ aGrabBagTS[4].Value <<= pTablePositions->getX();
aGrabBagTS[5].Name = "tblpXSpec";
- aGrabBagTS[5].Value = uno::makeAny( pTablePositions->getXSpec() );
+ aGrabBagTS[5].Value <<= pTablePositions->getXSpec();
aGrabBagTS[6].Name = "tblpY";
- aGrabBagTS[6].Value = uno::makeAny( pTablePositions->getY() );
+ aGrabBagTS[6].Value <<= pTablePositions->getY();
aGrabBagTS[7].Name = "tblpYSpec";
- aGrabBagTS[7].Value = uno::makeAny( pTablePositions->getYSpec() );
+ aGrabBagTS[7].Value <<= pTablePositions->getYSpec();
aGrabBagTS[8].Name = "topFromText";
- aGrabBagTS[8].Value = uno::makeAny( pTablePositions->getTopFromText() );
+ aGrabBagTS[8].Value <<= pTablePositions->getTopFromText();
aGrabBagTS[9].Name = "vertAnchor";
- aGrabBagTS[9].Value = uno::makeAny( pTablePositions->getVertAnchor() );
+ aGrabBagTS[9].Value <<= pTablePositions->getVertAnchor();
- aGrabBag["TablePosition"] = uno::makeAny( aGrabBagTS );
+ aGrabBag["TablePosition"] <<= aGrabBagTS;
}
boost::optional<PropertyMap::Property> aTableStyleVal = m_aTableProperties->getProperty(META_PROP_TABLE_STYLE_NAME);
@@ -380,7 +380,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
pTableStyle = dynamic_cast<TableStyleSheetEntry*>( pStyleSheet.get( ) );
m_aTableProperties->Erase( aTableStyleVal->first );
- aGrabBag["TableStyleName"] = uno::makeAny( sTableStyleName );
+ aGrabBag["TableStyleName"] <<= sTableStyleName;
if( pStyleSheet )
{
@@ -396,19 +396,19 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
TableInfo rStyleInfo;
if (lcl_extractTableBorderProperty(pMergedProperties, PROP_TOP_BORDER, rStyleInfo, aBorderLine))
{
- aGrabBag["TableStyleTopBorder"] = uno::makeAny( aBorderLine );
+ aGrabBag["TableStyleTopBorder"] <<= aBorderLine;
}
if (lcl_extractTableBorderProperty(pMergedProperties, PROP_BOTTOM_BORDER, rStyleInfo, aBorderLine))
{
- aGrabBag["TableStyleBottomBorder"] = uno::makeAny( aBorderLine );
+ aGrabBag["TableStyleBottomBorder"] <<= aBorderLine;
}
if (lcl_extractTableBorderProperty(pMergedProperties, PROP_LEFT_BORDER, rStyleInfo, aBorderLine))
{
- aGrabBag["TableStyleLeftBorder"] = uno::makeAny( aBorderLine );
+ aGrabBag["TableStyleLeftBorder"] <<= aBorderLine;
}
if (lcl_extractTableBorderProperty(pMergedProperties, PROP_RIGHT_BORDER, rStyleInfo, aBorderLine))
{
- aGrabBag["TableStyleRightBorder"] = uno::makeAny( aBorderLine );
+ aGrabBag["TableStyleRightBorder"] <<= aBorderLine;
}
#ifdef DEBUG_WRITERFILTER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 1c1a3c10fcde..7884d3cfdc95 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -78,26 +78,26 @@ bool DomainMapperTableManager::attribute(Id nName, Value& rValue)
TablePropertyMapPtr pPropMap(new TablePropertyMap());
pPropMap->Insert(PROP_TBL_LOOK, uno::makeAny<sal_Int32>(rValue.getInt()));
insertTableProps(pPropMap);
- m_aTableLook["val"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["val"] <<= (sal_Int32)rValue.getInt();
}
break;
case NS_ooxml::LN_CT_TblLook_noVBand:
- m_aTableLook["noVBand"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["noVBand"] <<= (sal_Int32)rValue.getInt();
break;
case NS_ooxml::LN_CT_TblLook_noHBand:
- m_aTableLook["noHBand"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["noHBand"] <<= (sal_Int32)rValue.getInt();
break;
case NS_ooxml::LN_CT_TblLook_lastColumn:
- m_aTableLook["lastColumn"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["lastColumn"] <<= (sal_Int32)rValue.getInt();
break;
case NS_ooxml::LN_CT_TblLook_lastRow:
- m_aTableLook["lastRow"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["lastRow"] <<= (sal_Int32)rValue.getInt();
break;
case NS_ooxml::LN_CT_TblLook_firstColumn:
- m_aTableLook["firstColumn"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["firstColumn"] <<= (sal_Int32)rValue.getInt();
break;
case NS_ooxml::LN_CT_TblLook_firstRow:
- m_aTableLook["firstRow"] = uno::makeAny<sal_Int32>(rValue.getInt());
+ m_aTableLook["firstRow"] <<= (sal_Int32)rValue.getInt();
break;
default:
bRet = false;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 334814bc398b..c51659eec07f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -950,7 +950,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
beans::PropertyValue aRet;
uno::Sequence<beans::PropertyValue> aGrabBag(1);
aRet.Name = "ParaFrameProperties";
- aRet.Value = uno::makeAny(rAppendContext.pLastParagraphProperties->IsFrameMode());
+ aRet.Value <<= rAppendContext.pLastParagraphProperties->IsFrameMode();
aGrabBag[0] = aRet;
aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag", aGrabBag));
@@ -1256,7 +1256,7 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper
for( int i =0; i < len; ++i )
{
if (aValues[i].Name == "CharHidden")
- aValues[i].Value = uno::makeAny(false);
+ aValues[i].Value <<= false;
}
uno::Reference< text::XTextRange > xTextRange;
@@ -2008,7 +2008,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
uno::Sequence<beans::PropertyValue> aShapeGrabBag(1);
beans::PropertyValue aRet;
aRet.Name = "SdtEndBefore";
- aRet.Value = uno::makeAny(true);
+ aRet.Value <<= true;
aShapeGrabBag[0] = aRet;
xShapePropertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aShapeGrabBag));
}
@@ -4187,7 +4187,7 @@ void DomainMapper_Impl::CloseFieldCommand()
uno::Sequence<beans::PropertyValue> aValues(1);
beans::PropertyValue propertyVal;
propertyVal.Name = "Identifier";
- propertyVal.Value = uno::makeAny(sCmd);
+ propertyVal.Value <<= sCmd;
aValues[0] = propertyVal;
xTC->setPropertyValue("Fields",
uno::makeAny(aValues));
@@ -4390,13 +4390,13 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
uno::Any aValue(propertyVal.Value);
aValue >>= titleStr;
titleStr = titleStr + rResult;
- propertyVal.Value = uno::makeAny(titleStr);
+ propertyVal.Value <<= titleStr;
aValues[i] = propertyVal;
}
else
{
propertyVal.Name = "Title";
- propertyVal.Value = uno::makeAny(rResult);
+ propertyVal.Value <<= rResult;
aValues[i] = propertyVal;
}
xFieldProperties->setPropertyValue("Fields",
@@ -4785,7 +4785,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties
if (!m_pSdtHelper->isInteropGrabBagEmpty() && bHasGrabBag && !m_pSdtHelper->isOutsideAParagraph())
{
comphelper::SequenceAsHashMap aFrameGrabBag(xPropertySet->getPropertyValue("FrameInteropGrabBag"));
- aFrameGrabBag["SdtPr"] = uno::makeAny(m_pSdtHelper->getInteropGrabBagAndClear());
+ aFrameGrabBag["SdtPr"] <<= m_pSdtHelper->getInteropGrabBagAndClear();
xPropertySet->setPropertyValue("FrameInteropGrabBag", uno::makeAny(aFrameGrabBag.getAsConstPropertyValueList()));
}
}
@@ -4804,7 +4804,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties
uno::Sequence<beans::PropertyValue> aFrameGrabBag(1);
beans::PropertyValue aRet;
aRet.Name = "SdtEndBefore";
- aRet.Value = uno::makeAny(true);
+ aRet.Value <<= true;
aFrameGrabBag[0] = aRet;
xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aFrameGrabBag));
}
@@ -5287,7 +5287,7 @@ void DomainMapper_Impl::appendGrabBag(std::vector<beans::PropertyValue>& rIntero
return;
beans::PropertyValue aProperty;
aProperty.Name = aKey;
- aProperty.Value = uno::makeAny(aValue);
+ aProperty.Value <<= aValue;
rInteropGrabBag.push_back(aProperty);
}
@@ -5297,7 +5297,7 @@ void DomainMapper_Impl::appendGrabBag(std::vector<beans::PropertyValue>& rIntero
return;
beans::PropertyValue aProperty;
aProperty.Name = aKey;
- aProperty.Value = uno::makeAny(comphelper::containerToSequence(rValue));
+ aProperty.Value <<= comphelper::containerToSequence(rValue);
rValue.clear();
rInteropGrabBag.push_back(aProperty);
}
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 3b83bc1c0322..5be3e72d65ee 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -56,7 +56,7 @@ void LatentStyleHandler::lcl_attribute(Id rName, Value& rVal)
}
if (bFound)
{
- aValue.Value = uno::makeAny(rVal.getString());
+ aValue.Value <<= rVal.getString();
m_aAttributes.push_back(aValue);
}
}
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index f3836351e12b..715215297bde 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -62,10 +62,10 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal)
aValue.Name = "type";
switch (nIntValue)
{
- case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value = uno::makeAny(OUString("nil")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value = uno::makeAny(OUString("pct")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value = uno::makeAny(OUString("dxa")); break;
- case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value = uno::makeAny(OUString("auto")); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_nil: aValue.Value <<= OUString("nil"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_pct: aValue.Value <<= OUString("pct"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_dxa: aValue.Value <<= OUString("dxa"); break;
+ case NS_ooxml::LN_Value_ST_TblWidth_auto: aValue.Value <<= OUString("auto"); break;
}
m_aInteropGrabBag.push_back(aValue);
}
@@ -84,7 +84,7 @@ void MeasureHandler::lcl_attribute(Id rName, Value & rVal)
{
beans::PropertyValue aValue;
aValue.Name = "w";
- aValue.Value = uno::makeAny(nIntValue);
+ aValue.Value <<= nIntValue;
m_aInteropGrabBag.push_back(aValue);
}
break;
@@ -133,7 +133,7 @@ beans::PropertyValue MeasureHandler::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_aInteropGrabBagName;
- aRet.Value = uno::makeAny( comphelper::containerToSequence(m_aInteropGrabBag) );
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
return aRet;
}
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 9a52c416f029..84db1d61819e 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -265,7 +265,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
beans::PropertyValue aValue;
aValue.Name = "compatSetting";
- aValue.Value = uno::makeAny(m_pImpl->m_pCurrentCompatSetting);
+ aValue.Value <<= m_pImpl->m_pCurrentCompatSetting;
m_pImpl->m_aCompatSettings.push_back(aValue);
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index e2ee7b6c9fd0..b35d762c69b7 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -160,7 +160,7 @@ beans::PropertyValue StyleSheetEntry::GetInteropGrabBag()
aRet.Name = sStyleIdentifierI;
beans::PropertyValues aSeq = GetInteropGrabBagSeq();
- aRet.Value = uno::makeAny(aSeq);
+ aRet.Value <<= aSeq;
return aRet;
}
@@ -465,7 +465,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
{
beans::PropertyValue aValue;
aValue.Name = "default";
- aValue.Value = uno::makeAny(m_pImpl->m_pCurrentEntry->bIsDefaultStyle);
+ aValue.Value <<= m_pImpl->m_pCurrentEntry->bIsDefaultStyle;
m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
}
break;
@@ -474,7 +474,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
{
beans::PropertyValue aValue;
aValue.Name = "customStyle";
- aValue.Value = uno::makeAny(nIntValue != 0);
+ aValue.Value <<= (nIntValue != 0);
m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
}
break;
@@ -486,7 +486,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
beans::PropertyValue aValue;
aValue.Name = "styleId";
- aValue.Value = uno::makeAny(sValue);
+ aValue.Value <<= sValue;
pTableEntry->AppendInteropGrabBag(aValue);
}
break;
@@ -545,7 +545,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
beans::PropertyValue aValue;
aValue.Name = "name";
- aValue.Value = uno::makeAny(sStringValue);
+ aValue.Value <<= sStringValue;
pTableEntry->AppendInteropGrabBag(aValue);
}
break;
@@ -556,7 +556,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
TableStyleSheetEntry* pTableEntry = static_cast<TableStyleSheetEntry *>(m_pImpl->m_pCurrentEntry.get());
beans::PropertyValue aValue;
aValue.Name = "basedOn";
- aValue.Value = uno::makeAny(sStringValue);
+ aValue.Value <<= sStringValue;
pTableEntry->AppendInteropGrabBag(aValue);
}
break;
@@ -612,7 +612,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
aStr.append(aBuf.getStr());
aValue.Name = "rsid";
- aValue.Value = uno::makeAny(aStr.makeStringAndClear());
+ aValue.Value <<= aStr.makeStringAndClear();
}
break;
case NS_ooxml::LN_CT_Style_qFormat:
@@ -627,13 +627,13 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_Style_uiPriority:
{
aValue.Name = "uiPriority";
- aValue.Value = uno::makeAny(OUString::number(nIntValue));
+ aValue.Value <<= OUString::number(nIntValue);
}
break;
case NS_ooxml::LN_CT_Style_link:
{
aValue.Name = "link";
- aValue.Value = uno::makeAny(sStringValue);
+ aValue.Value <<= sStringValue;
}
break;
case NS_ooxml::LN_CT_Style_locked:
@@ -744,7 +744,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
pProperties->resolve(*pLatentStyleHandler);
beans::PropertyValue aValue;
aValue.Name = "lsdException";
- aValue.Value = uno::makeAny(comphelper::containerToSequence(pLatentStyleHandler->getAttributes()));
+ aValue.Value <<= comphelper::containerToSequence(pLatentStyleHandler->getAttributes());
m_pImpl->m_pCurrentEntry->aLsdExceptions.push_back(aValue);
}
}
@@ -841,7 +841,7 @@ void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>
std::vector<beans::PropertyValue>& rLsdExceptions = m_pImpl->m_pCurrentEntry->aLsdExceptions;
beans::PropertyValue aValue;
aValue.Name = "lsdExceptions";
- aValue.Value = uno::makeAny( comphelper::containerToSequence(rLsdExceptions) );
+ aValue.Value <<= comphelper::containerToSequence(rLsdExceptions);
rLatentStyles.push_back(aValue);
}
@@ -854,7 +854,7 @@ void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties>
auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(xPropertySet->getPropertyValue("InteropGrabBag").get< uno::Sequence<beans::PropertyValue> >());
beans::PropertyValue aValue;
aValue.Name = "latentStyles";
- aValue.Value = uno::makeAny(aLatentStyles);
+ aValue.Value <<= aLatentStyles;
aGrabBag.push_back(aValue);
xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag)));
}
@@ -1131,7 +1131,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
{
beans::PropertyValue aNew;
aNew.Name = "FollowStyle";
- aNew.Value = uno::makeAny(ConvertStyleName((*it)->sStyleIdentifierD));
+ aNew.Value <<= ConvertStyleName((*it)->sStyleIdentifierD);
aSortedPropVals.Insert(aNew);
break;
}
@@ -1205,7 +1205,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
auto aGrabBag = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(aAny.get< uno::Sequence<beans::PropertyValue> >());
beans::PropertyValue aValue;
aValue.Name = "tableStyles";
- aValue.Value = uno::makeAny(comphelper::containerToSequence(aTableStylesVec));
+ aValue.Value <<= comphelper::containerToSequence(aTableStylesVec);
aGrabBag.push_back(aValue);
xPropertySet->setPropertyValue("InteropGrabBag", uno::makeAny(comphelper::containerToSequence(aGrabBag)));
}
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index fa756e44ed6c..236d984e8791 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -458,7 +458,7 @@ beans::PropertyValue TDefTableHandler::getInteropGrabBag(const OUString& aName)
else
aRet.Name = aName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
m_aInteropGrabBag.clear();
return aRet;
}
@@ -467,7 +467,7 @@ void TDefTableHandler::appendGrabBag(const OUString& aKey, const OUString& aValu
{
beans::PropertyValue aProperty;
aProperty.Name = aKey;
- aProperty.Value = uno::makeAny(aValue);
+ aProperty.Value <<= aValue;
m_aInteropGrabBag.push_back(aProperty);
}
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index e8a7aff4076d..295139583334 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -195,7 +195,7 @@ namespace dmapper {
{
beans::PropertyValue aValue;
aValue.Name = "vAlign";
- aValue.Value = uno::makeAny(aVertOrient);
+ aValue.Value <<= aVertOrient;
m_pCurrentInteropGrabBag->push_back(aValue);
}
}
@@ -369,7 +369,7 @@ namespace dmapper {
{
beans::PropertyValue aValue;
aValue.Name = (nSprmId == NS_ooxml::LN_CT_TblPrBase_tblStyleRowBandSize ? OUString("tblStyleRowBandSize") : OUString("tblStyleColBandSize"));
- aValue.Value = uno::makeAny(nIntValue);
+ aValue.Value <<= nIntValue;
m_pCurrentInteropGrabBag->push_back(aValue);
}
break;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 6664a037bc32..3393e9e345fd 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -194,7 +194,7 @@ void TblStylePrHandler::appendInteropGrabBag(const OUString& aKey, const OUStrin
{
beans::PropertyValue aProperty;
aProperty.Name = aKey;
- aProperty.Value = uno::makeAny(aValue);
+ aProperty.Value <<= aValue;
m_aInteropGrabBag.push_back(aProperty);
}
@@ -203,7 +203,7 @@ beans::PropertyValue TblStylePrHandler::getInteropGrabBag(const OUString& aName)
beans::PropertyValue aRet;
aRet.Name = aName;
- aRet.Value = uno::makeAny(comphelper::containerToSequence(m_aInteropGrabBag));
+ aRet.Value <<= comphelper::containerToSequence(m_aInteropGrabBag);
return aRet;
}
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 82c96f431770..ef83ebe2686c 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -219,22 +219,22 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc
comphelper::SequenceAsHashMap aGrabBagProperties;
// Adding the saved Theme DOM
- aGrabBagProperties["OOXTheme"] = uno::makeAny(pDocument->getThemeDom());
+ aGrabBagProperties["OOXTheme"] <<= pDocument->getThemeDom();
// Adding the saved custom xml DOM
- aGrabBagProperties["OOXCustomXml"] = uno::makeAny(pDocument->getCustomXmlDomList());
- aGrabBagProperties["OOXCustomXmlProps"] = uno::makeAny(pDocument->getCustomXmlDomPropsList());
+ aGrabBagProperties["OOXCustomXml"] <<= pDocument->getCustomXmlDomList();
+ aGrabBagProperties["OOXCustomXmlProps"] <<= pDocument->getCustomXmlDomPropsList();
// Adding the saved ActiveX DOM
- aGrabBagProperties["OOXActiveX"] = uno::makeAny(pDocument->getActiveXDomList());
- aGrabBagProperties["OOXActiveXBin"] = uno::makeAny(pDocument->getActiveXBinList());
+ aGrabBagProperties["OOXActiveX"] <<= pDocument->getActiveXDomList();
+ aGrabBagProperties["OOXActiveXBin"] <<= pDocument->getActiveXBinList();
// Adding the saved Glossary Documnet DOM to the document's grab bag
- aGrabBagProperties["OOXGlossary"] = uno::makeAny(pDocument->getGlossaryDocDom());
- aGrabBagProperties["OOXGlossaryDom"] = uno::makeAny(pDocument->getGlossaryDomList());
+ aGrabBagProperties["OOXGlossary"] <<= pDocument->getGlossaryDocDom();
+ aGrabBagProperties["OOXGlossaryDom"] <<= pDocument->getGlossaryDomList();
// Adding the saved embedding document to document's grab bag
- aGrabBagProperties["OOXEmbeddings"] = uno::makeAny(pDocument->getEmbeddingsList());
+ aGrabBagProperties["OOXEmbeddings"] <<= pDocument->getEmbeddingsList();
putPropertiesToDocumentGrabBag(aGrabBagProperties);
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 94f2fbba4c7e..f3baab8429f3 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -696,11 +696,11 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
if (xDom.is())
{
uno::Sequence< uno::Any > glossaryTuple (5);
- glossaryTuple[0] = uno::makeAny(xDom);
- glossaryTuple[1] = uno::makeAny(gId);
- glossaryTuple[2] = uno::makeAny(gType);
- glossaryTuple[3] = uno::makeAny(gTarget);
- glossaryTuple[4] = uno::makeAny(contentType);
+ glossaryTuple[0] <<= xDom;
+ glossaryTuple[1] <<= gId;
+ glossaryTuple[2] <<= gType;
+ glossaryTuple[3] <<= gTarget;
+ glossaryTuple[4] <<= contentType;
aGlossaryDomList.push_back(glossaryTuple);
counter++;
}
@@ -788,7 +788,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS
if(mxEmbeddings.is())
{
embeddingsTemp.Name = embeddingsTarget;
- embeddingsTemp.Value = uno::makeAny(mxEmbeddings);
+ embeddingsTemp.Value <<= mxEmbeddings;
aEmbeddings.push_back(embeddingsTemp);
mxEmbeddings.clear();
}
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 72833ee4b43b..00a1776af4e7 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -1040,7 +1040,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
}
if (!aName.isEmpty())
{
- aSeq[aName] = uno::makeAny(sal_Int32(nParam));
+ aSeq[aName] <<= sal_Int32(nParam);
m_xDocumentProperties->setDocumentStatistics(aSeq.getAsConstNamedValueList());
}
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 05212b96a12c..719d82ce35ff 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2704,15 +2704,15 @@ RTFError RTFDocumentImpl::popState()
OUString aStaticVal = m_aStates.top().pDestinationText->makeStringAndClear();
uno::Any aAny;
if (m_aStates.top().aPropType == cppu::UnoType<OUString>::get())
- aAny = uno::makeAny(aStaticVal);
+ aAny <<= aStaticVal;
else if (m_aStates.top().aPropType == cppu::UnoType<sal_Int32>::get())
- aAny = uno::makeAny(aStaticVal.toInt32());
+ aAny <<= aStaticVal.toInt32();
else if (m_aStates.top().aPropType == cppu::UnoType<bool>::get())
- aAny = uno::makeAny(aStaticVal.toBoolean());
+ aAny <<= aStaticVal.toBoolean();
else if (m_aStates.top().aPropType == cppu::UnoType<util::DateTime>::get())
- aAny = uno::makeAny(getDateTimeFromUserProp(aStaticVal));
+ aAny <<= getDateTimeFromUserProp(aStaticVal);
else if (m_aStates.top().aPropType == cppu::UnoType<double>::get())
- aAny = uno::makeAny(aStaticVal.toDouble());
+ aAny <<= aStaticVal.toDouble();
xPropertyContainer->addProperty(rKey, beans::PropertyAttribute::REMOVABLE, aAny);
}
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index a3544957b4f2..daa19657a0e0 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -210,7 +210,7 @@ OString Databases::getImageTheme()
beans::PropertyValue aParam ;
aParam.Name = "nodepath";
aParam.Value <<= OUString("org.openoffice.Office.Common");
- lParams[0] = uno::makeAny(aParam);
+ lParams[0] <<= aParam;
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index a2732f3a6007..64b7063c69ea 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -626,7 +626,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
beans::PropertyValue aParam ;
aParam.Name = "nodepath";
aParam.Value <<= OUString("/org.openoffice.Setup/Product");
- lParams[0] = uno::makeAny(aParam);
+ lParams[0] <<= aParam;
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 3172b6009888..3c72187bc5a1 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -349,7 +349,7 @@ bool lcl_divideBy100( uno::Any& rDoubleAny )
if( (rDoubleAny>>=fValue) && (fValue!=0.0) )
{
fValue/=100.0;
- rDoubleAny = uno::makeAny(fValue);
+ rDoubleAny <<= fValue;
bChanged = true;
}
return bChanged;
@@ -945,7 +945,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
{
case XML_TOK_DATESCALE_BASE_TIME_UNIT:
{
- aIncrement.TimeResolution = uno::makeAny( lcl_getTimeUnit(aValue) );
+ aIncrement.TimeResolution <<= lcl_getTimeUnit(aValue);
bSetNewIncrement = true;
}
break;
@@ -954,7 +954,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MajorTimeInterval >>= aInterval;
::sax::Converter::convertNumber( aInterval.Number, aValue );
- aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MajorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -963,7 +963,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MajorTimeInterval >>= aInterval;
aInterval.TimeUnit = lcl_getTimeUnit(aValue);
- aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MajorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -972,7 +972,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MinorTimeInterval >>= aInterval;
::sax::Converter::convertNumber( aInterval.Number, aValue );
- aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MinorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -981,7 +981,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MinorTimeInterval >>= aInterval;
aInterval.TimeUnit = lcl_getTimeUnit(aValue);
- aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MinorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index b1c58a0458a8..ef7d581edd96 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -874,7 +874,7 @@ lcl_TableData lcl_getDataForLocalTable(
Sequence< Any >& rTarget = rComplexAnyLabels[nN];
rTarget.realloc( rSource.getLength() );
for( sal_Int32 i=0; i<rSource.getLength(); i++ )
- rTarget[i] = uno::makeAny( rSource[i] );
+ rTarget[i] <<= rSource[i];
}
}
catch( const uno::Exception & rEx )
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 48a5a9a9f05f..bf3e95b85445 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -373,7 +373,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
{
if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" )
{
- aDeepProperty = uno::makeAny( true );
+ aDeepProperty <<= true;
}
}
}
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index e2edd3f725a3..3f5173d308c5 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -185,7 +185,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
if(xInit.is())
{
Sequence< uno::Any > aArguments(1);
- aArguments[0]=uno::makeAny(xSeries);
+ aArguments[0] <<= xSeries;
xInit->initialize(aArguments);
}
}
@@ -219,8 +219,8 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
if(xInit.is())
{
Sequence< uno::Any > aArguments(2);
- aArguments[0]=uno::makeAny(xSeries);
- aArguments[1]=uno::makeAny(nPointIndex);
+ aArguments[0] <<= xSeries;
+ aArguments[1] <<= nPointIndex;
xInit->initialize(aArguments);
}
}
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index e5d1b6d839d8..80f6c686f611 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -721,19 +721,19 @@ static void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< uno:
if( rCell.eType == SCH_CELL_TYPE_STRING )
{
rComplexLabel.realloc(1);
- rComplexLabel[0] = uno::makeAny( rCell.aString );
+ rComplexLabel[0] <<= rCell.aString;
}
else if( rCell.aComplexString.getLength() && rCell.eType == SCH_CELL_TYPE_COMPLEX_STRING )
{
sal_Int32 nCount = rCell.aComplexString.getLength();
rComplexLabel.realloc( nCount );
for( sal_Int32 nN=0; nN<nCount; nN++)
- rComplexLabel[nN] = uno::makeAny((rCell.aComplexString)[nN]);
+ rComplexLabel[nN] <<= (rCell.aComplexString)[nN];
}
else if( rCell.eType == SCH_CELL_TYPE_FLOAT )
{
rComplexLabel.realloc(1);
- rComplexLabel[0] = uno::makeAny( rCell.fValue );
+ rComplexLabel[0] <<= rCell.fValue;
}
}
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 49237aa6b105..12abe339db8c 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -48,7 +48,7 @@ bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue,
|| nValue == css::chart::ErrorBarStyle::FROM_DATA )
{
nValue = css::chart::ErrorBarStyle::NONE;
- aValue = uno::makeAny(nValue);
+ aValue <<= nValue;
}
}
}
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index cfb2bc0b6f63..6dfe2e723967 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -391,13 +391,13 @@ void XMLDocumentSettingsContext::EndElement()
if ( sProp == "PrinterName" )
{
- aSeqConfigProps[i].Value = uno::makeAny( OUString() );
+ aSeqConfigProps[i].Value <<= OUString();
nFound++;
}
else if ( sProp == "PrinterSetup" )
{
uno::Sequence< sal_Int8 > aEmpty;
- aSeqConfigProps[i].Value = uno::makeAny( aEmpty );
+ aSeqConfigProps[i].Value <<= aEmpty;
nFound++;
}
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index f5c980621518..b0b6cce5817a 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -194,12 +194,12 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
PropertyValue aNameValue;
aNameValue.Name = sSortKey;
- aNameValue.Value = Any((sal_Int16)nKey);
+ aNameValue.Value <<= (sal_Int16)nKey;
aKey[0] = aNameValue;
PropertyValue aSortValue;
aSortValue.Name = sIsSortAscending;
- aSortValue.Value = Any(bSort);
+ aSortValue.Value <<= bSort;
aKey[1] = aSortValue;
aSortKeys.push_back(aKey);
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index cd17da5cbac3..32ff795e6680 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -155,7 +155,7 @@ void XMLIndexBibliographyEntryContext::FillPropertyValues(
// bibliography data field
sal_Int32 nIndex = bCharStyleNameOK ? 2 : 1;
rValues[nIndex].Name = "BibliographyDataField";
- rValues[nIndex].Value = css::uno::Any(nBibliographyInfo);
+ rValues[nIndex].Value <<= nBibliographyInfo;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index ce125aaaeedb..f7db32e331bb 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -177,13 +177,13 @@ void XMLIndexChapterInfoEntryContext::FillPropertyValues(
{
// chapter info field
rValues[nIndex].Name = "ChapterFormat";
- rValues[nIndex].Value = css::uno::Any(nChapterInfo);
+ rValues[nIndex].Value <<= nChapterInfo;
nIndex++;
}
if( bOutlineLevelOK )
{
rValues[nIndex].Name = "ChapterLevel";
- rValues[nIndex].Value = css::uno::Any(nOutlineLevel);
+ rValues[nIndex].Value <<= nOutlineLevel;
}
}
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index f8e8d3e1b9db..aa7b6ec2454a 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -108,7 +108,7 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
// token type
rValues[0].Name = "TokenType";
- rValues[0].Value = css::uno::Any(rEntryType);
+ rValues[0].Value <<= rEntryType;
// char style
if (bCharStyleNameOK)
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 04f579e410ae..c1f552df985b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -846,12 +846,12 @@ namespace
if(pCurrent->first == ODF_FORMDROPDOWN_RESULT)
{
// sal_Int32
- vOutParams[pCurrent->first] = makeAny(pCurrent->second.toInt32());
+ vOutParams[pCurrent->first] <<= pCurrent->second.toInt32();
}
else if(pCurrent->first == ODF_FORMCHECKBOX_RESULT)
{
// bool
- vOutParams[pCurrent->first] = makeAny(pCurrent->second.toBoolean());
+ vOutParams[pCurrent->first] <<= pCurrent->second.toBoolean();
}
else if(pCurrent->first == ODF_FORMDROPDOWN_LISTENTRY)
{
@@ -859,13 +859,13 @@ namespace
vListEntries.push_back(pCurrent->second);
}
else
- vOutParams[pCurrent->first] = makeAny(pCurrent->second);
+ vOutParams[pCurrent->first] <<= pCurrent->second;
}
if(!vListEntries.empty())
{
Sequence<OUString> vListEntriesSeq(vListEntries.size());
copy(vListEntries.begin(), vListEntries.end(), vListEntriesSeq.begin());
- vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
+ vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] <<= vListEntriesSeq;
}
for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
pCurrent != vOutParams.end();
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 31dc8f97ebfb..03c7c961d996 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -494,7 +494,7 @@ void SigningTest::test96097Calc()
aTempFileSaveCopy.EnableKillingFile();
uno::Sequence<beans::PropertyValue> descSaveACopy(2);
descSaveACopy[0].Name = "SaveACopy";
- descSaveACopy[0].Value = uno::makeAny(true);
+ descSaveACopy[0].Value <<= true;
descSaveACopy[1].Name = "FilterName";
descSaveACopy[1].Value <<= OUString("calc8");
xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
@@ -542,7 +542,7 @@ void SigningTest::test96097Doc()
aTempFileSaveCopy.EnableKillingFile();
uno::Sequence<beans::PropertyValue> descSaveACopy(2);
descSaveACopy[0].Name = "SaveACopy";
- descSaveACopy[0].Value = uno::makeAny(true);
+ descSaveACopy[0].Value <<= true;
descSaveACopy[1].Name = "FilterName";
descSaveACopy[1].Value <<= OUString("writer8");
xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 319e08866669..578a3a6db713 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -149,7 +149,7 @@ void XSecController::createXSecComponent( )
cssu::Reference< cssl::XInitialization > xInitialization(m_xSAXEventKeeper, cssu::UNO_QUERY);
cssu::Sequence <cssu::Any> arg(1);
- arg[0] = cssu::makeAny(uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get()));
+ arg[0] <<= uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get());
xInitialization->initialize(arg);
cssu::Reference<cssxc::sax::XSAXEventKeeperStatusChangeBroadcaster>
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index f2db1bdd10ed..40e6f1b28c52 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -74,14 +74,14 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
cssu::Sequence<cssu::Any> args(5);
- args[0] = cssu::makeAny(OUString::number(nSecurityId));
- args[1] = cssu::makeAny(m_xSAXEventKeeper);
- args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector));
+ args[0] <<= OUString::number(nSecurityId);
+ args[1] <<= m_xSAXEventKeeper;
+ args[2] <<= OUString::number(nIdOfSignatureElementCollector);
//for nss, the internal module is used for signing, which needs to be improved later
- args[3] = cssu::makeAny(m_xSecurityContext->getSecurityEnvironment());
+ args[3] <<= m_xSecurityContext->getSecurityEnvironment();
- args[4] = cssu::makeAny(m_xXMLSignature);
+ args[4] <<= m_xXMLSignature;
xInitialization->initialize(args);
sal_Int32 nBlockerId = m_xSAXEventKeeper->addBlocker();
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index d6ce85be5f21..1646552c40f1 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -65,11 +65,11 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
cssu::Sequence<cssu::Any> args(5);
- args[0] = cssu::makeAny(OUString::number(nSecurityId));
- args[1] = cssu::makeAny(m_xSAXEventKeeper);
- args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector));
- args[3] = cssu::makeAny(m_xSecurityContext);
- args[4] = cssu::makeAny(m_xXMLSignature);
+ args[0] <<= OUString::number(nSecurityId);
+ args[1] <<= m_xSAXEventKeeper;
+ args[2] <<= OUString::number(nIdOfSignatureElementCollector);
+ args[3] <<= m_xSecurityContext;
+ args[4] <<= m_xXMLSignature;
xInitialization->initialize(args);
cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster >