[Libreoffice-commits] core.git: accessibility/source avmedia/source basic/source canvas/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cpputools/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source linguistic/source oox/source pyuno/source sc/qa scripting/source sc/source sdext/source sd/qa sd/source sfx2/source shell/source slideshow/source solenv/CompilerTest_compilerplugins_clang.mk sot/source starmath/source stoc/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source ucb/source unotools/source vbahelper/source vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/source xmlsecurity/qa xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 28 10:18:48 UTC 2017
accessibility/source/extended/textwindowaccessibility.cxx | 14 -
accessibility/source/standard/vclxaccessibleedit.cxx | 4
avmedia/source/viewer/mediawindow_impl.cxx | 6
basic/source/uno/namecont.cxx | 4
canvas/source/cairo/cairo_canvasbitmap.cxx | 4
canvas/source/factory/cf_service.cxx | 4
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 20 +-
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 6
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 6
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 4
chart2/source/model/main/BaseCoordinateSystem.cxx | 2
chart2/source/model/main/Diagram.cxx | 4
comphelper/source/misc/sequenceashashmap.cxx | 4
compilerplugins/clang/test/unoany.cxx | 27 +++
compilerplugins/clang/unoany.cxx | 74 +++++++++
connectivity/source/cpool/ZPoolCollection.cxx | 5
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 2
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 6
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 12 -
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 18 +-
connectivity/source/drivers/postgresql/pq_resultset.cxx | 9 -
connectivity/source/drivers/postgresql/pq_statement.cxx | 18 +-
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 4
connectivity/source/drivers/postgresql/pq_updateableresultset.hxx | 11 -
connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx | 2
cppuhelper/source/typemanager.cxx | 2
cpputools/source/unoexe/unoexe.cxx | 2
cui/source/customize/cfg.cxx | 2
cui/source/options/optgdlg.cxx | 10 -
cui/source/options/optinet2.cxx | 4
dbaccess/source/core/api/CacheSet.cxx | 2
dbaccess/source/core/dataaccess/ContentHelper.cxx | 4
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
desktop/source/app/desktopcontext.cxx | 2
desktop/source/app/opencl.cxx | 2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 8 -
desktop/source/deployment/misc/dp_update.cxx | 2
desktop/source/migration/migration.cxx | 12 -
editeng/source/items/frmitems.cxx | 40 ++---
editeng/source/items/paraitem.cxx | 2
editeng/source/items/textitem.cxx | 18 +-
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 4
extensions/source/update/feed/updatefeed.cxx | 6
filter/source/config/cache/filtercache.cxx | 9 -
filter/source/msfilter/mstoolbar.cxx | 14 -
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/errorbroadcaster.cxx | 4
forms/source/component/formcontrolfont.cxx | 6
forms/source/component/navigationbar.cxx | 4
fpicker/source/office/fpsmartcontent.cxx | 2
framework/source/dispatch/loaddispatcher.cxx | 2
framework/source/fwe/xml/statusbardocumenthandler.cxx | 2
framework/source/layoutmanager/helpers.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 10 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 12 -
framework/source/services/frame.cxx | 2
framework/source/tabwin/tabwinfactory.cxx | 4
framework/source/uiconfiguration/globalsettings.cxx | 8 -
framework/source/uiconfiguration/imagemanagerimpl.cxx | 48 +++---
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 12 -
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 8 -
framework/source/uiconfiguration/windowstateconfiguration.cxx | 36 ++--
framework/source/uielement/addonstoolbarmanager.cxx | 2
framework/source/uielement/complextoolbarcontroller.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 4
framework/source/uielement/statusbarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 6
framework/source/uifactory/uielementfactorymanager.cxx | 6
linguistic/source/gciterator.cxx | 2
oox/source/docprop/docprophandler.cxx | 4
oox/source/drawingml/color.cxx | 2
oox/source/drawingml/customshapegeometry.cxx | 28 +--
oox/source/drawingml/customshapepresetdata.cxx | 22 +-
oox/source/drawingml/diagram/diagram.cxx | 4
oox/source/drawingml/diagram/layoutnodecontext.cxx | 2
oox/source/drawingml/effectproperties.cxx | 2
oox/source/drawingml/effectpropertiescontext.cxx | 32 ++--
oox/source/drawingml/fillproperties.cxx | 8 -
oox/source/drawingml/misccontexts.cxx | 2
oox/source/drawingml/shape.cxx | 39 ++--
oox/source/drawingml/shape3dproperties.cxx | 52 +++---
oox/source/drawingml/texteffectscontext.cxx | 2
oox/source/export/drawingml.cxx | 6
oox/source/helper/grabbagstack.cxx | 2
oox/source/ole/oleobjecthelper.cxx | 4
oox/source/ppt/animationspersist.cxx | 4
oox/source/ppt/animvariantcontext.cxx | 10 -
oox/source/ppt/commonbehaviorcontext.cxx | 2
oox/source/ppt/commontimenodecontext.cxx | 10 -
oox/source/ppt/conditioncontext.cxx | 4
oox/source/ppt/presentationfragmenthandler.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 26 +--
oox/source/shape/ShapeContextHandler.cxx | 8 -
oox/source/shape/WpsContext.cxx | 4
oox/source/vml/vmlshape.cxx | 20 +-
oox/source/vml/vmltextbox.cxx | 10 -
pyuno/source/module/pyuno_runtime.cxx | 4
sc/qa/extras/sccellrangeobj.cxx | 2
sc/qa/extras/sccondformats.cxx | 8 -
sc/source/core/data/dpoutput.cxx | 6
sc/source/core/data/validat.cxx | 6
sc/source/core/tool/interpr4.cxx | 2
sc/source/filter/excel/xltoolbar.cxx | 2
sc/source/filter/xml/xmlsorti.cxx | 8 -
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 14 -
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 4
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 4
sc/source/ui/drawfunc/fuins2.cxx | 8 -
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/servuno.cxx | 8 -
sc/source/ui/unoobj/styleuno.cxx | 12 -
sc/source/ui/vba/vbachartobjects.cxx | 2
sc/source/ui/vba/vbaformat.cxx | 80 +++++-----
sc/source/ui/vba/vbaformatconditions.cxx | 6
sc/source/ui/vba/vbaglobals.cxx | 4
sc/source/ui/vba/vbarange.cxx | 8 -
sc/source/ui/vba/vbaworkbook.cxx | 20 +-
sc/source/ui/view/cellsh1.cxx | 4
scripting/source/protocolhandler/scripthandler.cxx | 2
sd/qa/unit/tiledrendering/tiledrendering.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 4
sd/source/filter/sdpptwrp.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 8 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 6
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/framework/factories/FullScreenPane.cxx | 10 -
sd/source/ui/func/fuhhconv.cxx | 4
sd/source/ui/presenter/PresenterHelper.cxx | 8 -
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 12 -
sd/source/ui/tools/ConfigurationAccess.cxx | 12 -
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 2
sdext/source/minimizer/configurationaccess.cxx | 68 ++++----
sdext/source/pdfimport/wrapper/wrapper.cxx | 4
sdext/source/presenter/PresenterConfigurationAccess.cxx | 12 -
sdext/source/presenter/PresenterWindowManager.cxx | 6
sfx2/source/control/emojicontrol.cxx | 4
sfx2/source/control/recentdocsviewitem.cxx | 4
sfx2/source/control/unoctitm.cxx | 8 -
sfx2/source/dialog/dinfdlg.cxx | 16 +-
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 16 +-
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/doc/doctemplates.cxx | 26 +--
sfx2/source/doc/sfxbasemodel.cxx | 8 -
sfx2/source/inet/inettbc.cxx | 8 -
sfx2/source/notify/globalevents.cxx | 2
sfx2/source/sidebar/Theme.cxx | 2
sfx2/source/view/viewprn.cxx | 4
sfx2/source/view/viewsh.cxx | 2
shell/source/cmdmail/cmdmailsuppl.cxx | 4
slideshow/source/engine/shapes/viewmediashape.cxx | 8 -
slideshow/source/engine/slide/targetpropertiescreator.cxx | 6
solenv/CompilerTest_compilerplugins_clang.mk | 13 -
sot/source/sdstor/ucbstorage.cxx | 2
starmath/source/unomodel.cxx | 2
stoc/source/security/access_controller.cxx | 2
svl/source/fsstor/oinputstreamcontainer.cxx | 8 -
svl/source/items/grabbagitem.cxx | 2
svl/source/items/imageitm.cxx | 10 -
svl/source/items/slstitm.cxx | 2
svl/source/misc/ownlist.cxx | 2
svtools/source/java/javacontext.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svx/source/form/fmshimp.cxx | 10 -
svx/source/form/fmvwimp.cxx | 2
svx/source/gallery2/galmisc.cxx | 2
svx/source/items/customshapeitem.cxx | 2
svx/source/items/drawitem.cxx | 2
svx/source/items/pageitem.cxx | 3
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdograf.cxx | 2
svx/source/tbxctrls/PaletteManager.cxx | 2
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 6
svx/source/tbxctrls/layctrl.cxx | 8 -
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 10 -
svx/source/tbxctrls/tbunocontroller.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
svx/source/unogallery/unogaltheme.cxx | 2
svx/source/unogallery/unogalthemeprovider.cxx | 2
svx/source/xoutdev/xattr.cxx | 18 +-
svx/source/xoutdev/xattrbmp.cxx | 6
sw/qa/core/uwriter.cxx | 4
sw/qa/extras/globalfilter/globalfilter.cxx | 2
sw/source/core/access/accdoc.cxx | 6
sw/source/core/access/accpara.cxx | 2
sw/source/core/attr/format.cxx | 2
sw/source/core/crsr/bookmrk.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/textboxhelper.cxx | 2
sw/source/core/unocore/unocoll.cxx | 4
sw/source/core/unocore/unodraw.cxx | 2
sw/source/core/unocore/unostyle.cxx | 8 -
sw/source/core/unocore/unotbl.cxx | 4
sw/source/filter/ww8/ww8par3.cxx | 14 -
sw/source/filter/ww8/ww8toolbar.cxx | 4
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/vba/vbaglobals.cxx | 4
sw/source/ui/vba/vbaselection.cxx | 13 -
sw/source/uibase/dbui/dbmgr.cxx | 2
sw/source/uibase/shells/annotsh.cxx | 4
sw/source/uibase/shells/drwtxtsh.cxx | 4
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/table/chartins.cxx | 8 -
sw/source/uibase/uiview/viewling.cxx | 6
sw/source/uibase/utlui/uitool.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/controls/roadmapcontrol.cxx | 5
ucb/source/core/FileAccess.cxx | 4
ucb/source/core/ucbcmds.cxx | 2
ucb/source/ucp/gio/gio_content.cxx | 6
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 10 -
ucb/source/ucp/package/pkgcontent.cxx | 21 +-
ucb/source/ucp/tdoc/tdoc_content.cxx | 4
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6
unotools/source/config/lingucfg.cxx | 12 -
vbahelper/source/msforms/vbacontrol.cxx | 4
vbahelper/source/msforms/vbalistbox.cxx | 2
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 2
vbahelper/source/msforms/vbauserform.cxx | 2
vbahelper/source/vbahelper/vbashape.cxx | 4
vcl/source/app/svmain.cxx | 2
vcl/source/filter/FilterConfigCache.cxx | 2
vcl/source/filter/FilterConfigItem.cxx | 6
vcl/source/gdi/oldprintadaptor.cxx | 4
vcl/source/gdi/print3.cxx | 42 ++---
vcl/source/uitest/uno/uiobject_uno.cxx | 2
vcl/source/window/mouse.cxx | 8 -
vcl/source/window/window.cxx | 10 -
vcl/unx/generic/gdi/salgdi.cxx | 6
vcl/unx/gtk/a11y/atktextattributes.cxx | 26 +--
writerfilter/source/dmapper/BorderHandler.cxx | 4
writerfilter/source/dmapper/CellColorHandler.cxx | 2
writerfilter/source/dmapper/CellMarginHandler.cxx | 14 -
writerfilter/source/dmapper/DomainMapper.cxx | 10 -
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 32 ++--
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 14 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 20 +-
writerfilter/source/dmapper/LatentStyleHandler.cxx | 2
writerfilter/source/dmapper/MeasureHandler.cxx | 12 -
writerfilter/source/dmapper/SettingsTable.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 28 +--
writerfilter/source/dmapper/TDefTableHandler.cxx | 4
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 4
writerfilter/source/dmapper/TblStylePrHandler.cxx | 4
writerfilter/source/filter/WriterFilter.cxx | 16 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 12 -
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/chart/SchXMLAxisContext.cxx | 12 -
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2
xmloff/source/chart/SchXMLSeriesHelper.cxx | 6
xmloff/source/chart/SchXMLTableContext.cxx | 6
xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 4
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 4
xmloff/source/text/XMLIndexBibliographyEntryContext.cxx | 2
xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx | 4
xmloff/source/text/XMLIndexSimpleEntryContext.cxx | 2
xmloff/source/text/txtimp.cxx | 8 -
xmlsecurity/qa/unit/signing/signing.cxx | 4
xmlsecurity/source/helper/xsecctl.cxx | 2
xmlsecurity/source/helper/xsecsign.cxx | 10 -
xmlsecurity/source/helper/xsecverify.cxx | 10 -
285 files changed, 1122 insertions(+), 1049 deletions(-)
New commits:
commit 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Feb 24 11:22:18 2017 +0200
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89
Reviewed-on: https://gerrit.libreoffice.org/34714
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 198fd2a..0a61a1a 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 363b03d..dce7497 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 9e92ddd..584c2b2 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 221c2d3..15d27b7 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 932dd33..d3cdef8 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 28b6df7..e0fc9e9 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 4eac71e..3712494 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 1d67914..96f4f01 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 36878f8..9b20ac8 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 63f8860..6884f4e 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 72d2ca8..16070e5 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 31b458a..f8bbbff 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 909760b..a41830d 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 e22dc88..1bbb029 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 40e42a6..cda6691 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 5aa5889..f32e0c2 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 fcff9a6..38694dc 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 06ce4ac..b55c8e6 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 b1d70c67..9c51ad1 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 0000000..8c7ba7e
--- /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 0000000..6fdf3b4
--- /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 1f30e6b..22ac35d 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 5dffd41..167ff3c 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 8878a6a..f7e2b97 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 d3df89a..3d96f77 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 db26ab3..4369330 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 f9d74ae..8bcc770 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 dafe25b..51b7989 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 4dc51f9..d4351d3 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 c6f0b9a..12c525f 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 2d0e558..9c21521 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 1675960..638bf73 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 44bf14e..ed811f0 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 3320b3b..32a2fcb 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 561ba07..e2067c3 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 1d68fa9..88ff6ec 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 9bcf188..81e2698 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 f15c752..fbeaef4 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 59b1e88..88fa127 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 dac5005..fc06709 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 6d20196..203e12a 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 2f2e1d4..6e91d86 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 d4ddee4..55a2dce 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 fc3a079..6e2c626 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 405e4d4..f20da27 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 9061aea..570ff22 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 f8b6695..3fd113b 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 130dfaa..8eafaf6 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 d9dedb6..c7c875e 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 07bd926..aaaf929 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 5f78a42..61bbcb7 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 3064ce6..1a343a6b 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 fe880be..28c092c 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 d01ec37..1065eb1 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 8cb47f6..61ff445 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 c5923d0..40707db 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 f060289..b73b96c 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 cadf6c0..30029e9 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 4b617e2..4762f80 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 c8777e7..7188e34 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 b04a4ca..1805d4b 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 18863a2..2122c39 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 92404dd..a108baa 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 425b578..1243f2d 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 4f69df8..98edc79 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 f18f850..d77774c 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 87e3f23..a1d3f8b 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 94df703..8cc4316 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 d970bea..fccf597 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 5cd3fc0..6d8c085 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 65955e0..d383773 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 9194f45..13ee801 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 f156dfa..6257c12 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 6296fed..ced85e9 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 51c6cc1..0d2fa66 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 a4bf6e4..9105f94 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 53fc6dd..efbe34c 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 518ef1a..d72a165 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 )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list