From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- .../accessibility/extended/AccessibleBrowseBox.hxx | 4 +- .../extended/AccessibleGridControl.hxx | 4 +- .../extended/AccessibleGridControlBase.hxx | 4 +- .../extended/AccessibleGridControlTableCell.hxx | 4 +- .../extended/accessiblebrowseboxcell.hxx | 4 +- .../extended/accessibleeditbrowseboxcell.hxx | 8 +-- .../accessibility/extended/listboxaccessible.hxx | 4 +- basctl/source/basicide/breakpoint.hxx | 2 +- basctl/source/inc/bastypes.hxx | 4 +- basctl/source/inc/dlgedmod.hxx | 4 +- basctl/source/inc/dlgedpage.hxx | 2 +- basegfx/source/polygon/b2dpolygon.cxx | 2 +- basic/source/inc/codegen.hxx | 4 +- basic/source/inc/sbunoobj.hxx | 6 +- basic/source/inc/symtbl.hxx | 4 +- binaryurp/source/bridge.cxx | 8 +-- binaryurp/source/bridge.hxx | 4 +- binaryurp/source/bridgefactory.hxx | 4 +- binaryurp/source/cache.hxx | 4 +- binaryurp/source/incomingreply.hxx | 4 +- binaryurp/source/incomingrequest.hxx | 4 +- binaryurp/source/marshal.hxx | 4 +- binaryurp/source/outgoingrequests.hxx | 4 +- binaryurp/source/proxy.hxx | 4 +- binaryurp/source/readerstate.hxx | 4 +- binaryurp/source/unmarshal.hxx | 4 +- binaryurp/source/writerstate.hxx | 4 +- bridges/inc/bridges/cpp_uno/shared/bridge.hxx | 4 +- .../bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 4 +- .../bridges/cpp_uno/shared/unointerfaceproxy.hxx | 4 +- .../inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4 +- .../source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 6 +- bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 4 +- bridges/source/cpp_uno/shared/guardedarray.hxx | 4 +- bridges/source/jni_uno/jni_base.h | 12 ++-- canvas/source/opengl/ogl_canvashelper.hxx | 2 +- .../accessibility/AccessibleViewForwarder.hxx | 4 +- chart2/source/controller/dialogs/DataBrowser.hxx | 2 +- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 4 +- chart2/source/inc/DiagramHelper.hxx | 2 +- chart2/source/inc/LifeTime.hxx | 4 +- chart2/source/inc/ModifyListenerCallBack.hxx | 2 +- chart2/source/inc/RelativeSizeHelper.hxx | 2 +- chart2/source/view/inc/VDiagram.hxx | 2 +- codemaker/source/cppumaker/includes.hxx | 4 +- codemaker/source/javamaker/classfile.hxx | 8 +-- comphelper/source/container/enumerablemap.cxx | 2 +- compilerplugins/clang/store/deletedspecial.cxx | 2 +- configmgr/source/access.hxx | 4 +- configmgr/source/broadcaster.hxx | 4 +- configmgr/source/components.hxx | 4 +- configmgr/source/configurationprovider.cxx | 8 +-- configmgr/source/configurationregistry.cxx | 8 +-- configmgr/source/data.hxx | 4 +- configmgr/source/modifications.hxx | 4 +- configmgr/source/partial.hxx | 4 +- configmgr/source/readonlyaccess.cxx | 4 +- configmgr/source/readwriteaccess.cxx | 4 +- configmgr/source/update.cxx | 4 +- configmgr/source/valueparser.hxx | 4 +- configmgr/source/writemodfile.cxx | 2 +- configmgr/source/writemodfile.hxx | 4 +- connectivity/source/cpool/ZPoolCollection.hxx | 4 +- connectivity/source/drivers/mork/MorkParser.hxx | 4 +- .../source/drivers/postgresql/pq_statics.hxx | 4 +- connectivity/source/inc/ParameterSubstitution.hxx | 4 +- connectivity/source/inc/RowFunctionParser.hxx | 4 +- connectivity/source/inc/ado/Aolevariant.hxx | 2 +- .../source/inc/java/ContextClassLoader.hxx | 4 +- connectivity/source/inc/java/LocalRef.hxx | 4 +- connectivity/source/inc/java/lang/Object.hxx | 8 +-- cppcanvas/source/inc/implrenderer.hxx | 4 +- cppcanvas/source/wrapper/implbitmap.hxx | 4 +- cppcanvas/source/wrapper/implbitmapcanvas.hxx | 2 +- cppcanvas/source/wrapper/implcanvas.hxx | 2 +- cppcanvas/source/wrapper/implcustomsprite.hxx | 4 +- cppcanvas/source/wrapper/implpolypolygon.hxx | 4 +- cppcanvas/source/wrapper/implsprite.hxx | 4 +- cppcanvas/source/wrapper/implspritecanvas.hxx | 2 +- cppu/qa/test_reference.cxx | 8 +-- cui/source/customize/eventdlg.hxx | 4 +- cui/source/inc/cuisrchdlg.hxx | 4 +- cui/source/inc/passwdomdlg.hxx | 4 +- cui/source/inc/thesdlg.hxx | 12 ++-- dbaccess/source/core/api/RowSetRow.hxx | 4 +- dbaccess/source/core/api/querydescriptor.hxx | 4 +- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 4 +- dbaccess/source/core/inc/veto.hxx | 4 +- dbaccess/source/core/recovery/storagexmlstream.hxx | 8 +-- .../source/sdbtools/connection/connectiontools.hxx | 4 +- .../sdbtools/connection/datasourcemetadata.hxx | 4 +- .../source/sdbtools/connection/objectnames.hxx | 4 +- dbaccess/source/sdbtools/connection/tablename.hxx | 4 +- dbaccess/source/ui/inc/moduledbu.hxx | 2 +- desktop/source/deployment/gui/dp_gui.h | 4 +- .../deployment/gui/dp_gui_dependencydialog.hxx | 4 +- .../deployment/gui/dp_gui_extensioncmdqueue.hxx | 4 +- .../source/deployment/gui/dp_gui_updatedialog.hxx | 8 +-- .../deployment/gui/dp_gui_updateinstalldialog.hxx | 4 +- .../deployment/manager/dp_activepackages.hxx | 4 +- .../deployment/registry/inc/dp_backenddb.hxx | 4 +- desktop/source/lib/lokinteractionhandler.hxx | 4 +- desktop/source/splash/unxsplash.hxx | 4 +- editeng/source/editeng/editattr.hxx | 2 +- editeng/source/editeng/editdoc.hxx | 2 +- editeng/source/editeng/editobj2.hxx | 2 +- editeng/source/editeng/textconv.hxx | 4 +- extensions/source/inc/componentmodule.hxx | 2 +- extensions/source/plugin/inc/plugin/multiplx.hxx | 4 +- extensions/source/propctrlr/composeduiupdate.hxx | 4 +- extensions/source/propctrlr/eformshelper.hxx | 4 +- extensions/source/propctrlr/eventhandler.hxx | 4 +- .../source/propctrlr/formcomponenthandler.hxx | 4 +- extensions/source/propctrlr/formcontroller.hxx | 4 +- extensions/source/propctrlr/formmetadata.hxx | 4 +- .../source/propctrlr/genericpropertyhandler.hxx | 4 +- extensions/source/propctrlr/handlerhelper.hxx | 4 +- extensions/source/propctrlr/propertyhandler.hxx | 4 +- .../source/propctrlr/propeventtranslation.hxx | 4 +- extensions/source/propctrlr/sqlcommanddesign.hxx | 4 +- extensions/source/propctrlr/xsddatatypes.hxx | 4 +- extensions/source/resource/oooresourceloader.hxx | 4 +- forms/source/component/entrylisthelper.hxx | 4 +- forms/source/inc/FormComponent.hxx | 4 +- forms/source/inc/InterfaceContainer.hxx | 4 +- forms/source/inc/formcontrolfont.hxx | 4 +- forms/source/inc/formnavigation.hxx | 4 +- forms/source/richtext/richtextengine.hxx | 4 +- forms/source/richtext/richtextmodel.hxx | 4 +- forms/source/richtext/richtextunowrapper.hxx | 8 +-- forms/source/runtime/formoperations.hxx | 4 +- forms/source/xforms/datatyperepository.hxx | 4 +- forms/source/xforms/datatypes.hxx | 4 +- formula/source/ui/inc/ModuleHelper.hxx | 2 +- fpicker/source/aqua/SalAquaFilePicker.hxx | 4 +- fpicker/source/aqua/SalAquaFolderPicker.hxx | 4 +- fpicker/source/office/asyncfilepicker.hxx | 4 +- fpicker/source/office/fpsmartcontent.hxx | 4 +- framework/inc/helper/shareablemutex.hxx | 2 +- framework/inc/services/uriabbreviation.hxx | 4 +- framework/inc/uiconfiguration/globalsettings.hxx | 4 +- framework/inc/uielement/rootitemcontainer.hxx | 4 +- framework/inc/uielement/toolbarmerger.hxx | 4 +- include/avmedia/mediawindow.hxx | 4 +- include/basegfx/color/bcolormodifier.hxx | 4 +- include/basegfx/range/b2dconnectedranges.hxx | 4 +- include/basegfx/raster/bpixelraster.hxx | 4 +- include/basegfx/tools/unopolypolygon.hxx | 4 +- include/basic/sbmod.hxx | 4 +- include/canvas/base/cachedprimitivebase.hxx | 4 +- include/canvas/base/canvasbase.hxx | 4 +- include/canvas/base/canvascustomspritehelper.hxx | 4 +- include/canvas/base/graphicdevicebase.hxx | 4 +- include/codemaker/exceptiontree.hxx | 8 +-- include/codemaker/generatedtypeset.hxx | 4 +- include/comphelper/SelectionMultiplex.hxx | 4 +- include/comphelper/accessibleeventnotifier.hxx | 4 +- include/comphelper/accessiblewrapper.hxx | 12 ++-- include/comphelper/asyncnotification.hxx | 4 +- include/comphelper/basicio.hxx | 2 +- include/comphelper/componentmodule.hxx | 4 +- include/comphelper/configuration.hxx | 56 +++++++-------- include/comphelper/logging.hxx | 2 +- include/comphelper/propertycontainerhelper.hxx | 4 +- include/comphelper/proxyaggregation.hxx | 12 ++-- include/comphelper/scopeguard.hxx | 4 +- include/comphelper/solarmutex.hxx | 4 +- include/comphelper/syntaxhighlight.hxx | 4 +- include/comphelper/threadpool.hxx | 4 +- include/comphelper/unique_disposing_ptr.hxx | 4 +- include/connectivity/ParameterCont.hxx | 4 +- include/connectivity/formattedcolumnvalue.hxx | 4 +- include/connectivity/parameters.hxx | 4 +- include/connectivity/sqliterator.hxx | 2 +- include/connectivity/statementcomposer.hxx | 6 +- include/cppcanvas/basegfxfactory.hxx | 6 +- include/cppcanvas/vclfactory.hxx | 6 +- include/drawinglayer/animation/animationtiming.hxx | 4 +- include/editeng/AccessibleEditableTextPara.hxx | 4 +- include/editeng/AccessibleImageBullet.hxx | 4 +- include/editeng/AccessibleStaticTextBase.hxx | 4 +- include/editeng/editeng.hxx | 4 +- include/editeng/editobj.hxx | 2 +- include/editeng/editview.hxx | 4 +- include/editeng/hangulhanja.hxx | 4 +- include/editeng/outliner.hxx | 6 +- include/editeng/svxacorr.hxx | 4 +- include/editeng/txtrange.hxx | 2 +- include/editeng/unoedprx.hxx | 4 +- include/editeng/unolingu.hxx | 8 +-- include/filter/msfilter/escherex.hxx | 4 +- include/filter/msfilter/mscodec.hxx | 8 +-- include/filter/msfilter/msdffimp.hxx | 2 +- include/filter/msfilter/mstoolbar.hxx | 8 +-- include/formula/FormulaCompiler.hxx | 12 ++-- include/formula/token.hxx | 2 +- include/framework/menuconfiguration.hxx | 2 +- include/i18nutil/oneToOneMapping.hxx | 8 +-- include/jvmaccess/unovirtualmachine.hxx | 4 +- include/jvmaccess/virtualmachine.hxx | 8 +-- include/linguistic/hyphdta.hxx | 8 +-- include/linguistic/lngprophelp.hxx | 16 ++--- include/oox/core/contexthandler.hxx | 2 +- include/oox/core/contexthandler2.hxx | 2 +- include/oox/drawingml/chart/chartconverter.hxx | 4 +- include/oox/dump/dumperbase.hxx | 16 ++--- include/oox/helper/binarystreambase.hxx | 4 +- include/oox/helper/storagebase.hxx | 4 +- include/oox/ole/vbaproject.hxx | 4 +- include/registry/writer.hxx | 4 +- include/sfx2/Metadatable.hxx | 4 +- include/sfx2/basedlgs.hxx | 12 ++-- include/sfx2/controlwrapper.hxx | 4 +- include/sfx2/docfac.hxx | 4 +- include/sfx2/dockwin.hxx | 4 +- include/sfx2/docstoragemodifylistener.hxx | 4 +- include/sfx2/itemconnect.hxx | 4 +- include/sfx2/linkmgr.hxx | 4 +- include/sfx2/mnumgr.hxx | 4 +- include/sfx2/opengrf.hxx | 4 +- include/sfx2/printer.hxx | 2 +- include/sfx2/querystatus.hxx | 4 +- include/sfx2/request.hxx | 2 +- include/sfx2/sfxstatuslistener.hxx | 4 +- include/sfx2/shell.hxx | 4 +- include/sfx2/tbxctrl.hxx | 4 +- include/sot/factory.hxx | 4 +- include/sot/object.hxx | 4 +- include/svl/SfxBroadcaster.hxx | 2 +- include/svl/broadcast.hxx | 2 +- include/svl/filerec.hxx | 8 +-- include/svl/inethist.hxx | 4 +- include/svl/itempool.hxx | 2 +- include/svl/itemset.hxx | 2 +- include/svl/listener.hxx | 2 +- include/svl/lstner.hxx | 2 +- include/svl/macitem.hxx | 2 +- include/svl/poolitem.hxx | 6 +- include/svl/sharedstringpool.hxx | 4 +- include/svl/svdde.hxx | 12 ++-- include/svl/undo.hxx | 4 +- include/svl/zforlist.hxx | 4 +- include/svtools/acceleratorexecute.hxx | 4 +- include/svtools/contextmenuhelper.hxx | 4 +- include/svtools/ctrlbox.hxx | 20 +++--- include/svtools/ctrltool.hxx | 4 +- include/svtools/dialogcontrolling.hxx | 8 +-- include/svtools/editbrowsebox.hxx | 4 +- include/svtools/embedhlp.hxx | 2 +- include/svtools/javacontext.hxx | 4 +- include/svtools/javainteractionhandler.hxx | 4 +- include/svtools/ruler.hxx | 4 +- include/svtools/scriptedtext.hxx | 2 +- include/svtools/transfer.hxx | 10 +-- include/svtools/treelist.hxx | 4 +- include/svtools/valueset.hxx | 4 +- include/svtools/xwindowitem.hxx | 2 +- include/svx/AccessibleControlShape.hxx | 4 +- include/svx/AccessibleGraphicShape.hxx | 4 +- include/svx/AccessibleOLEShape.hxx | 4 +- include/svx/AccessibleShape.hxx | 4 +- include/svx/AccessibleShapeInfo.hxx | 2 +- include/svx/ChildrenManager.hxx | 4 +- include/svx/EnhancedCustomShapeFunctionParser.hxx | 4 +- include/svx/fmmodel.hxx | 4 +- include/svx/fmpage.hxx | 2 +- include/svx/langbox.hxx | 4 +- include/svx/obj3d.hxx | 2 +- include/svx/rulritem.hxx | 8 +-- include/svx/sdr/overlay/overlaymanager.hxx | 4 +- include/svx/sdr/overlay/overlayobject.hxx | 4 +- include/svx/sdr/table/tablecontroller.hxx | 4 +- include/svx/sdrmasterpagedescriptor.hxx | 2 +- include/svx/sdrpagewindow.hxx | 4 +- include/svx/shapepropertynotifier.hxx | 8 +-- include/svx/sidebar/SelectionChangeHandler.hxx | 4 +- include/svx/svdmodel.hxx | 6 +- include/svx/svdobj.hxx | 8 +-- include/svx/svdovirt.hxx | 2 +- include/svx/svdpage.hxx | 12 ++-- include/toolkit/awt/animatedimagespeer.hxx | 4 +- include/toolkit/awt/vclxspinbutton.hxx | 4 +- include/toolkit/controls/unocontrols.hxx | 2 +- include/tools/config.hxx | 4 +- include/tools/inetstrm.hxx | 4 +- include/tools/resary.hxx | 4 +- include/tools/resmgr.hxx | 4 +- include/tools/stream.hxx | 12 ++-- include/ucbhelper/commandenvironment.hxx | 4 +- include/unoidl/unoidl.hxx | 4 +- include/unotools/charclass.hxx | 4 +- include/unotools/configmgr.hxx | 4 +- include/unotools/digitgroupingiterator.hxx | 4 +- include/unotools/eventlisteneradapter.hxx | 4 +- include/unotools/lingucfg.hxx | 4 +- include/unotools/localedatawrapper.hxx | 4 +- include/unotools/nativenumberwrapper.hxx | 4 +- include/unotools/numberformatcodewrapper.hxx | 4 +- include/unotools/options.hxx | 4 +- include/unotools/searchopt.hxx | 4 +- include/unotools/sharedunocomponent.hxx | 8 +-- include/unotools/tempfile.hxx | 4 +- include/unotools/transliterationwrapper.hxx | 4 +- include/vcl/btndlg.hxx | 4 +- include/vcl/builder.hxx | 4 +- include/vcl/button.hxx | 36 +++++----- include/vcl/ctrl.hxx | 4 +- include/vcl/dialog.hxx | 12 ++-- include/vcl/dockingarea.hxx | 4 +- include/vcl/dockwin.hxx | 4 +- include/vcl/floatwin.hxx | 4 +- include/vcl/graphicfilter.hxx | 4 +- include/vcl/menubtn.hxx | 4 +- include/vcl/metric.hxx | 4 +- include/vcl/morebtn.hxx | 4 +- include/vcl/opengl/OpenGLHelper.hxx | 2 +- include/vcl/opengl/OpenGLWrapper.hxx | 2 +- include/vcl/outdev.hxx | 6 +- include/vcl/print.hxx | 4 +- include/vcl/quickselectionengine.hxx | 4 +- include/vcl/split.hxx | 4 +- include/vcl/splitwin.hxx | 4 +- include/vcl/svapp.hxx | 16 ++--- include/vcl/svgdata.hxx | 4 +- include/vcl/syschild.hxx | 4 +- include/vcl/toolbox.hxx | 4 +- include/vcl/vclptr.hxx | 8 +-- include/vcl/virdev.hxx | 4 +- include/vcl/wrkwin.hxx | 4 +- include/xmloff/DocumentSettingsContext.hxx | 4 +- include/xmloff/SchXMLExportHelper.hxx | 4 +- include/xmloff/XMLCharContext.hxx | 4 +- include/xmloff/prhdlfac.hxx | 4 +- include/xmloff/prstylei.hxx | 4 +- include/xmloff/txtimp.hxx | 4 +- include/xmloff/txtparae.hxx | 2 +- include/xmloff/xmlimppr.hxx | 4 +- include/xmloff/xmlprmap.hxx | 4 +- include/xmloff/xmlstyle.hxx | 4 +- include/xmloff/xmluconv.hxx | 4 +- include/xmlreader/xmlreader.hxx | 4 +- jvmfwk/source/elements.hxx | 4 +- jvmfwk/source/libxmlutil.hxx | 14 ++-- .../source/hyphenator/hyphen/hyphenimp.hxx | 4 +- .../source/spellcheck/macosxspell/macspellimp.hxx | 4 +- .../source/spellcheck/spell/sspellimp.hxx | 4 +- .../source/thesaurus/libnth/nthesdta.hxx | 4 +- .../source/thesaurus/libnth/nthesimp.hxx | 4 +- linguistic/inc/iprcache.hxx | 8 +-- linguistic/source/convdiclist.hxx | 4 +- linguistic/source/dicimp.hxx | 8 +-- linguistic/source/dlistimp.hxx | 4 +- linguistic/source/gciterator.hxx | 4 +- linguistic/source/hhconvdic.hxx | 4 +- linguistic/source/hyphdsp.hxx | 4 +- linguistic/source/lngopt.hxx | 4 +- linguistic/source/lngsvcmgr.hxx | 4 +- linguistic/source/spelldsp.hxx | 4 +- linguistic/source/thesdsp.hxx | 4 +- .../source/filter/lwpbackgroundoverride.hxx | 2 +- lotuswordpro/source/filter/lwpbreaksoverride.hxx | 2 +- .../source/filter/lwpcharborderoverride.hxx | 2 +- .../source/filter/lwpnumberingoverride.hxx | 2 +- lotuswordpro/source/filter/lwpoverride.hxx | 20 +++--- .../source/filter/lwpparaborderoverride.hxx | 2 +- lotuswordpro/source/filter/lwptaboverride.hxx | 2 +- oox/source/shape/ShapeContextHandler.hxx | 4 +- pyuno/inc/pyuno/pyuno.hxx | 8 +-- registry/tools/options.hxx | 4 +- reportdesign/inc/ModuleHelper.hxx | 2 +- reportdesign/inc/PropertyForward.hxx | 4 +- reportdesign/inc/ReportDefinition.hxx | 4 +- reportdesign/inc/RptModel.hxx | 4 +- reportdesign/inc/RptObject.hxx | 4 +- reportdesign/inc/RptPage.hxx | 2 +- reportdesign/inc/UndoActions.hxx | 8 +-- reportdesign/inc/UndoEnv.hxx | 4 +- reportdesign/inc/conditionalexpression.hxx | 4 +- reportdesign/source/core/inc/FixedLine.hxx | 4 +- reportdesign/source/core/inc/FixedText.hxx | 4 +- reportdesign/source/core/inc/FormatCondition.hxx | 4 +- reportdesign/source/core/inc/FormattedField.hxx | 4 +- reportdesign/source/core/inc/Function.hxx | 4 +- reportdesign/source/core/inc/Functions.hxx | 4 +- reportdesign/source/core/inc/Group.hxx | 4 +- reportdesign/source/core/inc/Groups.hxx | 4 +- reportdesign/source/core/inc/ImageControl.hxx | 4 +- .../source/core/inc/ReportControlModel.hxx | 4 +- reportdesign/source/core/inc/ReportDrawPage.hxx | 4 +- reportdesign/source/core/inc/ReportEngineJFree.hxx | 4 +- reportdesign/source/core/inc/ReportUndoFactory.hxx | 4 +- reportdesign/source/core/inc/RptObjectListener.hxx | 4 +- reportdesign/source/core/inc/Section.hxx | 4 +- reportdesign/source/core/inc/Shape.hxx | 4 +- reportdesign/source/filter/xml/xmlAutoStyle.hxx | 4 +- reportdesign/source/filter/xml/xmlCell.hxx | 4 +- reportdesign/source/filter/xml/xmlColumn.hxx | 4 +- reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 4 +- .../source/filter/xml/xmlControlProperty.hxx | 4 +- .../source/filter/xml/xmlExportDocumentHandler.hxx | 4 +- reportdesign/source/filter/xml/xmlFixedContent.hxx | 4 +- .../source/filter/xml/xmlFormatCondition.hxx | 4 +- .../source/filter/xml/xmlFormattedField.hxx | 4 +- reportdesign/source/filter/xml/xmlHelper.hxx | 4 +- reportdesign/source/filter/xml/xmlImage.hxx | 4 +- .../source/filter/xml/xmlImportDocumentHandler.hxx | 4 +- reportdesign/source/filter/xml/xmlMasterFields.hxx | 4 +- .../source/filter/xml/xmlPropertyHandler.hxx | 4 +- reportdesign/source/filter/xml/xmlReport.hxx | 4 +- .../source/filter/xml/xmlReportElement.hxx | 4 +- .../source/filter/xml/xmlReportElementBase.hxx | 4 +- reportdesign/source/filter/xml/xmlSection.hxx | 4 +- reportdesign/source/filter/xml/xmlStyleImport.hxx | 8 +-- reportdesign/source/filter/xml/xmlSubDocument.hxx | 4 +- reportdesign/source/filter/xml/xmlTable.hxx | 4 +- reportdesign/source/ui/inc/AddField.hxx | 4 +- reportdesign/source/ui/inc/ColorListener.hxx | 4 +- reportdesign/source/ui/inc/DataProviderHandler.hxx | 4 +- reportdesign/source/ui/inc/DateTime.hxx | 4 +- reportdesign/source/ui/inc/DefaultInspection.hxx | 4 +- reportdesign/source/ui/inc/DesignView.hxx | 4 +- reportdesign/source/ui/inc/EndMarker.hxx | 4 +- reportdesign/source/ui/inc/GeometryHandler.hxx | 4 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 4 +- reportdesign/source/ui/inc/Navigator.hxx | 4 +- reportdesign/source/ui/inc/PageNumber.hxx | 4 +- .../source/ui/inc/ReportComponentHandler.hxx | 4 +- .../source/ui/inc/ReportControllerObserver.hxx | 4 +- reportdesign/source/ui/inc/ReportSection.hxx | 4 +- reportdesign/source/ui/inc/ReportWindow.hxx | 4 +- reportdesign/source/ui/inc/RptUndo.hxx | 12 ++-- reportdesign/source/ui/inc/ScrollHelper.hxx | 4 +- reportdesign/source/ui/inc/SectionView.hxx | 4 +- reportdesign/source/ui/inc/SectionWindow.hxx | 4 +- reportdesign/source/ui/inc/StartMarker.hxx | 4 +- reportdesign/source/ui/inc/ViewsWindow.hxx | 4 +- reportdesign/source/ui/inc/dlgedfunc.hxx | 4 +- reportdesign/source/ui/inc/dlgpage.hxx | 4 +- reportdesign/source/ui/inc/metadata.hxx | 4 +- reportdesign/source/ui/inc/propbrw.hxx | 4 +- reportdesign/source/ui/inc/toolboxcontroller.hxx | 4 +- sc/inc/attarray.hxx | 4 +- sc/inc/bulkdatahint.hxx | 4 +- sc/inc/cellvalues.hxx | 8 +-- sc/inc/chart2uno.hxx | 4 +- sc/inc/chartarr.hxx | 2 +- sc/inc/chartlis.hxx | 6 +- sc/inc/chartlock.hxx | 4 +- sc/inc/chartpos.hxx | 4 +- sc/inc/chgtrack.hxx | 12 ++-- sc/inc/column.hxx | 4 +- sc/inc/compare.hxx | 4 +- sc/inc/conditio.hxx | 2 +- sc/inc/dapiuno.hxx | 2 +- sc/inc/document.hxx | 2 +- sc/inc/dpdimsave.hxx | 2 +- sc/inc/dpfilteredcache.hxx | 2 +- sc/inc/drawpage.hxx | 2 +- sc/inc/externalrefmgr.hxx | 6 +- sc/inc/formulacell.hxx | 2 +- sc/inc/linkuno.hxx | 4 +- sc/inc/listenerquery.hxx | 4 +- sc/inc/lookupcache.hxx | 6 +- sc/inc/patattr.hxx | 4 +- sc/inc/postit.hxx | 4 +- sc/inc/progress.hxx | 4 +- sc/inc/scmatrix.hxx | 4 +- sc/inc/token.hxx | 4 +- sc/inc/unitconv.hxx | 2 +- sc/source/core/inc/bcaslot.hxx | 4 +- sc/source/core/inc/jumpmatrix.hxx | 4 +- sc/source/filter/inc/biffhelper.hxx | 4 +- sc/source/filter/inc/xestream.hxx | 4 +- sc/source/ui/inc/docsh.hxx | 4 +- sc/source/ui/inc/reffact.hxx | 24 +++---- sc/source/ui/inc/undobase.hxx | 2 +- sc/source/ui/unoobj/celllistsource.hxx | 4 +- sc/source/ui/unoobj/cellvaluebinding.hxx | 4 +- scripting/source/dlgprov/DialogModelProvider.hxx | 4 +- sd/inc/helper/simplereferencecomponent.hxx | 8 +-- sd/inc/sdpage.hxx | 2 +- sd/inc/stlsheet.hxx | 2 +- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 4 +- sd/source/ui/inc/AccessiblePageShape.hxx | 4 +- sd/source/ui/inc/AccessiblePresentationShape.hxx | 4 +- sd/source/ui/inc/AccessibleViewForwarder.hxx | 4 +- sd/source/ui/inc/MasterPageObserver.hxx | 4 +- sd/source/ui/inc/WindowUpdater.hxx | 4 +- sd/source/ui/inc/filedlg.hxx | 4 +- sd/source/ui/inc/framework/FrameworkHelper.hxx | 4 +- sd/source/ui/inc/framework/ModuleController.hxx | 2 +- sd/source/ui/inc/sdxfer.hxx | 4 +- sd/source/ui/inc/slideshow.hxx | 4 +- sd/source/ui/inc/smarttag.hxx | 8 +-- sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 4 +- sd/source/ui/slideshow/slideshowimpl.hxx | 4 +- .../ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 4 +- .../ui/slidesorter/inc/view/SlsFontProvider.hxx | 4 +- sfx2/source/appl/imestatuswindow.hxx | 4 +- sfx2/source/inc/statcach.hxx | 2 +- sfx2/source/menu/thessubmenu.hxx | 4 +- shell/inc/internal/xml_parser.hxx | 4 +- .../sessioninstall/SyncDbusSessionHelper.hxx | 4 +- shell/source/tools/lngconvex/cmdline.hxx | 4 +- starmath/inc/parse.hxx | 4 +- starmath/source/accessibility.hxx | 22 +++--- starmath/source/cfgitem.hxx | 8 +-- starmath/source/tmpdevice.hxx | 4 +- .../source/invocation_adapterfactory/iafactory.cxx | 4 +- stoc/source/javavm/interact.hxx | 4 +- stoc/source/javavm/javavm.hxx | 4 +- stoc/source/uriproc/UriReference.hxx | 4 +- store/source/object.hxx | 4 +- store/source/storbios.hxx | 4 +- store/source/stordir.hxx | 4 +- store/source/storlckb.hxx | 4 +- store/source/storpage.hxx | 4 +- svl/source/fsstor/fsstorage.cxx | 4 +- svl/source/items/style.cxx | 4 +- svl/source/numbers/zforfind.hxx | 4 +- svl/source/numbers/zforscan.hxx | 4 +- svl/source/undo/undo.cxx | 4 +- svtools/inc/table/tablecontrol.hxx | 4 +- svtools/source/contnr/imivctl.hxx | 4 +- svtools/source/control/scriptedtext.cxx | 2 +- svtools/source/dialogs/addresstemplate.cxx | 4 +- svtools/source/graphic/descriptor.hxx | 4 +- svtools/source/graphic/grfcache.cxx | 4 +- svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 4 +- .../sdr/contact/viewobjectcontactofunocontrol.hxx | 8 +-- svx/source/accessibility/ChildrenManagerImpl.hxx | 4 +- svx/source/engine3d/view3d.cxx | 4 +- svx/source/inc/datanavi.hxx | 4 +- svx/source/inc/delayedevent.hxx | 4 +- svx/source/inc/fmobj.hxx | 2 +- svx/source/inc/fmpgeimp.hxx | 4 +- svx/source/inc/formcontrolling.hxx | 4 +- svx/source/svdraw/svdfmtf.hxx | 4 +- svx/source/table/accessiblecell.hxx | 4 +- svx/source/table/tablertfimporter.cxx | 4 +- svx/source/unogallery/unogalitem.hxx | 4 +- sw/inc/HandleAnchorNodeChg.hxx | 4 +- sw/inc/SwNodeNum.hxx | 4 +- sw/inc/calc.hxx | 4 +- sw/inc/dcontact.hxx | 4 +- sw/inc/dlelstnr.hxx | 4 +- sw/inc/doc.hxx | 2 +- sw/inc/docstyle.hxx | 2 +- sw/inc/dpage.hxx | 2 +- sw/inc/editsh.hxx | 4 +- sw/inc/fchrfmt.hxx | 2 +- sw/inc/finalthreadmanager.hxx | 4 +- sw/inc/fmtautofmt.hxx | 2 +- sw/inc/fmtcntnt.hxx | 2 +- sw/inc/fmtcol.hxx | 8 +-- sw/inc/fmtflcnt.hxx | 2 +- sw/inc/fmtfld.hxx | 2 +- sw/inc/fmtftn.hxx | 4 +- sw/inc/fmtrfmrk.hxx | 2 +- sw/inc/fmturl.hxx | 2 +- sw/inc/frmfmt.hxx | 8 +-- sw/inc/list.hxx | 4 +- sw/inc/ndindex.hxx | 4 +- sw/inc/ndnotxt.hxx | 4 +- sw/inc/ndole.hxx | 4 +- sw/inc/node.hxx | 24 +++---- sw/inc/pam.hxx | 2 +- sw/inc/paratr.hxx | 2 +- sw/inc/redline.hxx | 4 +- sw/inc/swcrsr.hxx | 2 +- sw/inc/swtable.hxx | 6 +- sw/inc/tox.hxx | 2 +- sw/inc/unochart.hxx | 18 ++--- sw/inc/unotextrange.hxx | 2 +- sw/source/core/access/parachangetrackinginfo.hxx | 4 +- sw/source/core/access/textmarkuphelper.hxx | 4 +- sw/source/core/docnode/cancellablejob.hxx | 4 +- sw/source/core/inc/unoflatpara.hxx | 8 +-- sw/source/core/inc/unotextmarkup.hxx | 8 +-- sw/source/core/inc/wrong.hxx | 4 +- sw/source/core/text/inftxt.hxx | 2 +- sw/source/filter/inc/msfilter.hxx | 4 +- sw/source/filter/inc/wrtswtbl.hxx | 2 +- sw/source/filter/ww8/docxexport.hxx | 4 +- sw/source/filter/ww8/escher.hxx | 8 +-- sw/source/filter/ww8/rtfexport.hxx | 4 +- sw/source/filter/ww8/sortedarray.hxx | 4 +- sw/source/filter/ww8/writerhelper.hxx | 4 +- sw/source/filter/ww8/wrtww8.hxx | 80 +++++++++++----------- sw/source/filter/ww8/ww8glsy.hxx | 4 +- sw/source/filter/ww8/ww8par.hxx | 46 ++++++------- sw/source/filter/ww8/ww8par2.hxx | 10 +-- sw/source/filter/ww8/ww8scan.hxx | 48 ++++++------- sw/source/filter/ww8/ww8toolbar.hxx | 60 ++++++++-------- sw/source/uibase/inc/swdtflvr.hxx | 4 +- sw/source/uibase/inc/toxmgr.hxx | 8 +-- sw/source/uibase/inc/uinums.hxx | 2 +- sw/source/uibase/inc/unomailmerge.hxx | 4 +- .../source/bridgetest/currentcontextchecker.hxx | 4 +- ucb/source/ucp/file/filrec.hxx | 4 +- ucb/source/ucp/ftp/ftploaderthread.hxx | 4 +- ucb/source/ucp/webdav-neon/ContentProperties.hxx | 6 +- unotools/source/config/configmgr.cxx | 4 +- unotools/source/config/lingucfg.cxx | 4 +- unotools/source/config/searchopt.cxx | 4 +- unotools/source/misc/componentresmodule.cxx | 4 +- unotools/source/misc/sharedunocomponent.cxx | 4 +- uui/source/iahndl.hxx | 4 +- uui/source/requeststringresolver.hxx | 4 +- vcl/inc/brdwin.hxx | 4 +- vcl/inc/cvtsvm.hxx | 4 +- vcl/inc/generic/glyphcache.hxx | 4 +- vcl/inc/graphite_features.hxx | 2 +- vcl/inc/image.h | 8 +-- vcl/inc/impfont.hxx | 4 +- vcl/inc/impimagetree.hxx | 4 +- vcl/inc/opengl/program.hxx | 2 +- vcl/inc/osx/salframe.h | 4 +- vcl/inc/osx/salprn.h | 8 +-- vcl/inc/outfont.hxx | 4 +- vcl/inc/sallayout.hxx | 12 ++-- vcl/inc/textlayout.hxx | 4 +- vcl/inc/window.h | 4 +- vcl/source/edit/textdoc.hxx | 4 +- vcl/unx/generic/printer/ppdparser.cxx | 4 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 4 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 4 +- vcl/unx/gtk/inc/gtkprintwrapper.hxx | 4 +- vcl/unx/kde/UnxFilePicker.hxx | 4 +- vcl/unx/kde4/KDE4FilePicker.hxx | 4 +- .../source/ooxml/OOXMLFastContextHandler.hxx | 2 +- .../source/ooxml/OOXMLFastDocumentHandler.hxx | 4 +- writerfilter/source/rtftok/rtfvalue.hxx | 2 +- writerperfect/inc/WPFTEncodingDialog.hxx | 4 +- xmlhelp/source/cxxhelp/provider/db.hxx | 4 +- xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 2 +- 636 files changed, 1553 insertions(+), 1553 deletions(-) diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index d008c46a2eee..c00743bb7747 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -278,8 +278,8 @@ protected: } private: - AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION; - AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION; + AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) = delete; + AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 80a9e2763f04..1a02a194207f 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -228,8 +228,8 @@ protected: } private: - AccessibleGridControlAccess( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION; - AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION; + AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete; + AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 5ab0de31e552..142847ce28a0 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -338,8 +338,8 @@ protected: throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - GridControlAccessibleElement( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION; - GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION; + GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete; + GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) = delete; }; // inlines -------------------------------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index e588a5377eab..ac020ebb4ede 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx @@ -52,8 +52,8 @@ namespace accessibility virtual ~AccessibleGridControlCell(); private: - AccessibleGridControlCell( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION; - AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION; + AccessibleGridControlCell( const AccessibleGridControlCell& ) = delete; + AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) = delete; }; typedef ::cppu::ImplHelper2 < css::accessibility::XAccessibleText diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx index 8ff40e48d7a5..8115ad382da6 100644 --- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx @@ -65,8 +65,8 @@ namespace accessibility virtual ~AccessibleBrowseBoxCell(); private: - AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION; - AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION; + AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) = delete; + AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx index db3fd81f6afe..d1d0875af527 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx @@ -87,8 +87,8 @@ namespace accessibility void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION; - EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION; + EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete; + EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) = delete; }; @@ -134,8 +134,8 @@ namespace accessibility virtual void SAL_CALL disposing() SAL_OVERRIDE; private: - EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION; - EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION; + EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete; + EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete; }; } diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx index 7affba94cc28..ed6e0a29d783 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx @@ -71,8 +71,8 @@ namespace accessibility DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); private: - ListBoxAccessibleBase( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION; - ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION; + ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete; + ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) = delete; }; diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 5d1981bcf165..926729795cc0 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -51,7 +51,7 @@ struct BreakPoint class BreakPointList { private: - void operator =(BreakPointList) SAL_DELETED_FUNCTION; + void operator =(BreakPointList) = delete; ::std::vector maBreakPoints; public: diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 7a98027dbfd5..5f7d627d8543 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -301,8 +301,8 @@ bool QueryPassword( const css::uno::Reference< css::script::XLibraryContainer >& class ModuleInfoHelper { - ModuleInfoHelper (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; - ModuleInfoHelper& operator = (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; + ModuleInfoHelper (const ModuleInfoHelper&) = delete; + ModuleInfoHelper& operator = (const ModuleInfoHelper&) = delete; public: static void getObjectName( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ); static sal_Int32 getModuleType( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName ); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index 131d51cafb71..453b92567873 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -34,8 +34,8 @@ class DlgEdModel : public SdrModel friend class DlgEdPage; private: - DlgEdModel( const DlgEdModel& ) SAL_DELETED_FUNCTION; - void operator=(const DlgEdModel& rSrcModel) SAL_DELETED_FUNCTION; + DlgEdModel( const DlgEdModel& ) = delete; + void operator=(const DlgEdModel& rSrcModel) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index 7376f262ed65..3a3d1097d4de 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -34,7 +34,7 @@ class DlgEdForm; class DlgEdPage : public SdrPage { - DlgEdPage& operator=(const DlgEdPage&) SAL_DELETED_FUNCTION; + DlgEdPage& operator=(const DlgEdPage&) = delete; private: DlgEdForm* pDlgEdForm; diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index d2c0a67824fd..f46c37729939 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -637,7 +637,7 @@ public: } } - ImplB2DPolygon& operator=( const ImplB2DPolygon& ) SAL_DELETED_FUNCTION; + ImplB2DPolygon& operator=( const ImplB2DPolygon& ) = delete; sal_uInt32 count() const { diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index 1b928cca5114..d50994be5e09 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -66,8 +66,8 @@ class PCodeBuffConvertor sal_uInt8* m_pCnvtdBuf; S m_nCnvtdSize; - PCodeBuffConvertor(const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION; - PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) SAL_DELETED_FUNCTION; + PCodeBuffConvertor(const PCodeBuffConvertor& ) = delete; + PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& ) = delete; public: PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ), m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); } S GetSize(){ return m_nCnvtdSize; } diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index bead0c9873e6..692e5140aefa 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -192,8 +192,8 @@ class SbUnoProperty : public SbxProperty SbxDataType mRealType; virtual ~SbUnoProperty(); bool mbUnoStruct; - SbUnoProperty( const SbUnoProperty&) SAL_DELETED_FUNCTION; - SbUnoProperty& operator = ( const SbUnoProperty&) SAL_DELETED_FUNCTION; + SbUnoProperty( const SbUnoProperty&) = delete; + SbUnoProperty& operator = ( const SbUnoProperty&) = delete; public: TYPEINFO_OVERRIDE(); @@ -395,7 +395,7 @@ private: VBAConstantsHash aConstHash; bool isInited; VBAConstantHelper():isInited( false ) {} - VBAConstantHelper(const VBAConstantHelper&) SAL_DELETED_FUNCTION; + VBAConstantHelper(const VBAConstantHelper&) = delete; void init(); public: static VBAConstantHelper& instance(); diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 2682eee31d19..e4e84fe6a6a6 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -159,7 +159,7 @@ public: sal_uInt32 Reference(); // reference symbol in code private: - SbiSymDef( const SbiSymDef& ) SAL_DELETED_FUNCTION; + SbiSymDef( const SbiSymDef& ) = delete; }; @@ -202,7 +202,7 @@ public: void Match( SbiProcDef* pForward ); private: - SbiProcDef( const SbiProcDef& ) SAL_DELETED_FUNCTION; + SbiProcDef( const SbiProcDef& ) = delete; }; diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 54214c393dd5..1534faf186e1 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -107,8 +107,8 @@ public: rtl::ByteSequence getTid() throw () { return tid_;} private: - AttachThread(const AttachThread&) SAL_DELETED_FUNCTION; - AttachThread& operator=(const AttachThread&) SAL_DELETED_FUNCTION; + AttachThread(const AttachThread&) = delete; + AttachThread& operator=(const AttachThread&) = delete; uno_ThreadPool threadPool_; rtl::ByteSequence tid_; @@ -138,8 +138,8 @@ public: void clear(); private: - PopOutgoingRequest(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; - PopOutgoingRequest& operator=(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; + PopOutgoingRequest(const PopOutgoingRequest&) = delete; + PopOutgoingRequest& operator=(const PopOutgoingRequest&) = delete; OutgoingRequests & requests_; rtl::ByteSequence tid_; diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 1fe1bd6b5e3c..a35f7d16612b 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -169,8 +169,8 @@ public: bool isCurrentContextMode(); private: - Bridge(const Bridge&) SAL_DELETED_FUNCTION; - Bridge& operator=(const Bridge&) SAL_DELETED_FUNCTION; + Bridge(const Bridge&) = delete; + Bridge& operator=(const Bridge&) = delete; virtual ~Bridge(); diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index ac13ace16574..f7103bdd3aeb 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -75,8 +75,8 @@ public: using BridgeFactoryBase::release; private: - BridgeFactory(const BridgeFactory&) SAL_DELETED_FUNCTION; - BridgeFactory& operator=(const BridgeFactory&) SAL_DELETED_FUNCTION; + BridgeFactory(const BridgeFactory&) = delete; + BridgeFactory& operator=(const BridgeFactory&) = delete; explicit BridgeFactory( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx index 97e246ec2655..9df738f03ba2 100644 --- a/binaryurp/source/cache.hxx +++ b/binaryurp/source/cache.hxx @@ -80,8 +80,8 @@ public: } private: - Cache(const Cache&) SAL_DELETED_FUNCTION; - Cache& operator=(const Cache&) SAL_DELETED_FUNCTION; + Cache(const Cache&) = delete; + Cache& operator=(const Cache&) = delete; typedef std::list LruList; // last recently used list typedef typename LruList::iterator LruListIt; diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx index 7584ded5c3fa..f051387bc41d 100644 --- a/binaryurp/source/incomingreply.hxx +++ b/binaryurp/source/incomingreply.hxx @@ -30,8 +30,8 @@ namespace binaryurp { struct IncomingReply { private: - IncomingReply(const IncomingReply&) SAL_DELETED_FUNCTION; - IncomingReply& operator=(const IncomingReply&) SAL_DELETED_FUNCTION; + IncomingReply(const IncomingReply&) = delete; + IncomingReply& operator=(const IncomingReply&) = delete; public: IncomingReply( bool theException, BinaryAny const & theReturnValue, diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx index 0b8c4d13e249..64b5664bd7b0 100644 --- a/binaryurp/source/incomingrequest.hxx +++ b/binaryurp/source/incomingrequest.hxx @@ -40,8 +40,8 @@ namespace binaryurp { class IncomingRequest { private: - IncomingRequest(const IncomingRequest&) SAL_DELETED_FUNCTION; - IncomingRequest& operator=(const IncomingRequest&) SAL_DELETED_FUNCTION; + IncomingRequest(const IncomingRequest&) = delete; + IncomingRequest& operator=(const IncomingRequest&) = delete; public: IncomingRequest( rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid, diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx index da78a787839a..4a20395423f2 100644 --- a/binaryurp/source/marshal.hxx +++ b/binaryurp/source/marshal.hxx @@ -68,8 +68,8 @@ public: std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid); private: - Marshal(const Marshal&) SAL_DELETED_FUNCTION; - Marshal& operator=(const Marshal&) SAL_DELETED_FUNCTION; + Marshal(const Marshal&) = delete; + Marshal& operator=(const Marshal&) = delete; void writeValue( std::vector< unsigned char > * buffer, diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx index e3c92bd00b91..f774dab7c438 100644 --- a/binaryurp/source/outgoingrequests.hxx +++ b/binaryurp/source/outgoingrequests.hxx @@ -45,8 +45,8 @@ public: void pop(rtl::ByteSequence const & tid) throw (); private: - OutgoingRequests(const OutgoingRequests&) SAL_DELETED_FUNCTION; - OutgoingRequests& operator=(const OutgoingRequests&) SAL_DELETED_FUNCTION; + OutgoingRequests(const OutgoingRequests&) = delete; + OutgoingRequests& operator=(const OutgoingRequests&) = delete; typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map; diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx index 7a758dd3e23d..7f90f116c137 100644 --- a/binaryurp/source/proxy.hxx +++ b/binaryurp/source/proxy.hxx @@ -63,8 +63,8 @@ public: OUString * oid); private: - Proxy(const Proxy&) SAL_DELETED_FUNCTION; - Proxy& operator=(const Proxy&) SAL_DELETED_FUNCTION; + Proxy(const Proxy&) = delete; + Proxy& operator=(const Proxy&) = delete; ~Proxy(); diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx index 1ce1d5a4b783..879b0851279f 100644 --- a/binaryurp/source/readerstate.hxx +++ b/binaryurp/source/readerstate.hxx @@ -32,8 +32,8 @@ namespace binaryurp { struct ReaderState { private: - ReaderState(const ReaderState&) SAL_DELETED_FUNCTION; - ReaderState& operator=(const ReaderState&) SAL_DELETED_FUNCTION; + ReaderState(const ReaderState&) = delete; + ReaderState& operator=(const ReaderState&) = delete; public: ReaderState() {} diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx index 3c523aa3f637..0cbb1193c9ed 100644 --- a/binaryurp/source/unmarshal.hxx +++ b/binaryurp/source/unmarshal.hxx @@ -65,8 +65,8 @@ public: void done() const; private: - Unmarshal(const Unmarshal&) SAL_DELETED_FUNCTION; - Unmarshal& operator=(const Unmarshal&) SAL_DELETED_FUNCTION; + Unmarshal(const Unmarshal&) = delete; + Unmarshal& operator=(const Unmarshal&) = delete; void check(sal_Int32 size) const; diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx index 7ae457c46c8e..94207959a5a8 100644 --- a/binaryurp/source/writerstate.hxx +++ b/binaryurp/source/writerstate.hxx @@ -32,8 +32,8 @@ namespace binaryurp { struct WriterState { private: - WriterState(const WriterState&) SAL_DELETED_FUNCTION; - WriterState& operator=(const WriterState&) SAL_DELETED_FUNCTION; + WriterState(const WriterState&) = delete; + WriterState& operator=(const WriterState&) = delete; public: WriterState(): typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {} diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx index 3e13b2a919aa..9cfa92bcddef 100644 --- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/bridge.hxx @@ -77,8 +77,8 @@ public: uno_Mapping * getUno2Cpp() { return &aUno2Cpp; } private: - Bridge(Bridge &) SAL_DELETED_FUNCTION; - void operator =(const Bridge&) SAL_DELETED_FUNCTION; + Bridge(Bridge &) = delete; + void operator =(const Bridge&) = delete; Bridge( uno_ExtEnvironment * pCppEnv_, uno_ExtEnvironment * pUnoEnv_, diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx index 67ebce4f7d65..4546dbe33b7a 100644 --- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx @@ -66,8 +66,8 @@ public: static CppInterfaceProxy * castInterfaceToProxy(void * pInterface); private: - CppInterfaceProxy(CppInterfaceProxy &) SAL_DELETED_FUNCTION; - void operator =(const CppInterfaceProxy&) SAL_DELETED_FUNCTION; + CppInterfaceProxy(CppInterfaceProxy &) = delete; + void operator =(const CppInterfaceProxy&) = delete; CppInterfaceProxy( Bridge * pBridge_, uno_Interface * pUnoI_, diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx index 6e8e240c6421..f678765b7826 100644 --- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx @@ -73,8 +73,8 @@ public: com::sun::star::uno::XInterface * getCppI() { return pCppI; } private: - UnoInterfaceProxy(UnoInterfaceProxy &) SAL_DELETED_FUNCTION; - void operator =(const UnoInterfaceProxy&) SAL_DELETED_FUNCTION; + UnoInterfaceProxy(UnoInterfaceProxy &) = delete; + void operator =(const UnoInterfaceProxy&) = delete; UnoInterfaceProxy( Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_, diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 09246c8e705f..b5d7aaa4f345 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -120,8 +120,8 @@ private: class BaseOffset; - VtableFactory(VtableFactory &) SAL_DELETED_FUNCTION; - void operator =(const VtableFactory&) SAL_DELETED_FUNCTION; + VtableFactory(VtableFactory &) = delete; + void operator =(const VtableFactory&) = delete; bool createBlock(Block &block, sal_Int32 slotCount) const; diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index ab601ddff75b..bf9a7bf94d73 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -47,16 +47,16 @@ namespace CPPU_CURRENT_NAMESPACE { namespace { struct Fake_type_info { - virtual ~Fake_type_info() SAL_DELETED_FUNCTION; + virtual ~Fake_type_info() = delete; char const * name; }; struct Fake_class_type_info: Fake_type_info { - virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION; + virtual ~Fake_class_type_info() = delete; }; struct Fake_si_class_type_info: Fake_class_type_info { - virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION; + virtual ~Fake_si_class_type_info() = delete; void const * base; }; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 6c556cc2a072..ccdf99300207 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -292,8 +292,8 @@ struct ExceptionType } // Copy assignment is forbidden and not implemented. - ExceptionType (const ExceptionType &) SAL_DELETED_FUNCTION; - ExceptionType & operator= (const ExceptionType &) SAL_DELETED_FUNCTION; + ExceptionType (const ExceptionType &) = delete; + ExceptionType & operator= (const ExceptionType &) = delete; }; struct RaiseInfo diff --git a/bridges/source/cpp_uno/shared/guardedarray.hxx b/bridges/source/cpp_uno/shared/guardedarray.hxx index 842536cd21d2..ad5d6bdaa4c1 100644 --- a/bridges/source/cpp_uno/shared/guardedarray.hxx +++ b/bridges/source/cpp_uno/shared/guardedarray.hxx @@ -33,8 +33,8 @@ public: T * release() { T * p = pointer; pointer = 0; return p; } private: - GuardedArray(GuardedArray &) SAL_DELETED_FUNCTION; - void operator =(GuardedArray) SAL_DELETED_FUNCTION; + GuardedArray(GuardedArray &) = delete; + void operator =(GuardedArray) = delete; T * pointer; }; diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 62474ead2e4a..0855f8b3daed 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -58,8 +58,8 @@ class JNI_context JNIEnv * m_env; jobject m_class_loader; - JNI_context( JNI_context & ) SAL_DELETED_FUNCTION; - void operator = ( JNI_context ) SAL_DELETED_FUNCTION; + JNI_context( JNI_context & ) = delete; + void operator = ( JNI_context ) = delete; void java_exc_occurred() const; public: @@ -121,8 +121,8 @@ class JNI_guarded_context : private ::jvmaccess::VirtualMachine::AttachGuard, public JNI_context { - JNI_guarded_context( JNI_guarded_context & ) SAL_DELETED_FUNCTION; - void operator = ( JNI_guarded_context ) SAL_DELETED_FUNCTION; + JNI_guarded_context( JNI_guarded_context & ) = delete; + void operator = ( JNI_guarded_context ) = delete; public: inline explicit JNI_guarded_context( @@ -229,8 +229,8 @@ class TypeDescr { typelib_TypeDescription * m_td; - TypeDescr( TypeDescr & ) SAL_DELETED_FUNCTION; - void operator = ( TypeDescr ) SAL_DELETED_FUNCTION; + TypeDescr( TypeDescr & ) = delete; + void operator = ( TypeDescr ) = delete; public: inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref ); diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx index d33e82923d76..fdc8698c9173 100644 --- a/canvas/source/opengl/ogl_canvashelper.hxx +++ b/canvas/source/opengl/ogl_canvashelper.hxx @@ -197,7 +197,7 @@ namespace oglcanvas o3tl::ThreadSafeRefCountingPolicy > RecordVectorT; private: - CanvasHelper( const CanvasHelper& ) SAL_DELETED_FUNCTION; + CanvasHelper( const CanvasHelper& ) = delete; void setupGraphicsState( Action& o_action, const css::rendering::ViewState& viewState, diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index a1cbca5c9355..ce5f20cde68d 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -42,8 +42,8 @@ public: virtual Size LogicToPixel( const Size& rSize ) const SAL_OVERRIDE; private: - AccessibleViewForwarder( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; - AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; + AccessibleViewForwarder( AccessibleViewForwarder& ) = delete; + AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) = delete; AccessibleChartView* m_pAccChartView; VclPtr m_pWindow; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index a04101b0595a..60cc12b30696 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -183,7 +183,7 @@ private: DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void ); DECL_LINK_TYPED( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); - DataBrowser( const DataBrowser & ) SAL_DELETED_FUNCTION; + DataBrowser( const DataBrowser & ) = delete; }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 611db51fff52..01aab488f4fc 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -59,8 +59,8 @@ private: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; - ChartTypeUnoDlg(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION; - void operator =(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION; + ChartTypeUnoDlg(const ChartTypeUnoDlg&) = delete; + void operator =(const ChartTypeUnoDlg&) = delete; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; }; diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 2272d9a20bc0..fa168fb87327 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -346,7 +346,7 @@ public: , bool bConvertAlsoFromAutoPositioning ); private: - DiagramHelper() SAL_DELETED_FUNCTION; + DiagramHelper() = delete; }; diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 715b57351eb4..687f15a2d4e4 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -203,8 +203,8 @@ private: bool m_bLongLastingCallRegistered; private: - LifeTimeGuard( const LifeTimeGuard& ) SAL_DELETED_FUNCTION; - LifeTimeGuard& operator= ( const LifeTimeGuard& ) SAL_DELETED_FUNCTION; + LifeTimeGuard( const LifeTimeGuard& ) = delete; + LifeTimeGuard& operator= ( const LifeTimeGuard& ) = delete; }; template diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index 60fff63eb7ba..ad1b2b3d2083 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -43,7 +43,7 @@ public: SAL_DLLPRIVATE void stopListening(); private: //methods - ModifyListenerCallBack( const ModifyListenerCallBack& ) SAL_DELETED_FUNCTION; + ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete; private: //member ModifyListenerCallBack_impl* pModifyListener_impl; diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index a6fa1a665dd5..dfc2df420c10 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -41,7 +41,7 @@ public: const ::com::sun::star::awt::Size & rNewReferenceSize ); private: - RelativeSizeHelper() SAL_DELETED_FUNCTION; + RelativeSizeHelper() = delete; }; } // namespace chart diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 8b4b0e9bc3d4..89eecfa41f31 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -78,7 +78,7 @@ private: //methods void adjustAspectRatio3d( const ::com::sun::star::awt::Size& rAvailableSize ); private: //members - VDiagram(const VDiagram& rD) SAL_DELETED_FUNCTION; + VDiagram(const VDiagram& rD) = delete; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx index c28cfb13c497..e08923c2765b 100644 --- a/codemaker/source/cppumaker/includes.hxx +++ b/codemaker/source/cppumaker/includes.hxx @@ -65,8 +65,8 @@ public: FileStream & out, OString const & entityName, bool hpp); private: - Includes(Includes &) SAL_DELETED_FUNCTION; - void operator =(const Includes&) SAL_DELETED_FUNCTION; + Includes(Includes &) = delete; + void operator =(const Includes&) = delete; bool isInterfaceType(OString const & entityName) const; diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index b048a47d08f5..949203dea553 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -130,8 +130,8 @@ public: Position getPosition() const; private: - Code(Code &) SAL_DELETED_FUNCTION; - void operator =(const Code&) SAL_DELETED_FUNCTION; + Code(Code &) = delete; + void operator =(const Code&) = delete; explicit Code(ClassFile & classFile); @@ -181,8 +181,8 @@ public: private: typedef std::map< rtl::OString, sal_uInt16 > Map; - ClassFile(ClassFile &) SAL_DELETED_FUNCTION; - void operator =(const ClassFile&) SAL_DELETED_FUNCTION; + ClassFile(ClassFile &) = delete; + void operator =(const ClassFile&) = delete; sal_uInt16 nextConstantPoolIndex(sal_uInt16 width); sal_uInt16 addUtf8Info(rtl::OString const & value); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 0f9f679e04ca..6f409e8ca96c 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -110,7 +110,7 @@ namespace comphelper { } private: - MapData& operator=( const MapData& _source ) SAL_DELETED_FUNCTION; + MapData& operator=( const MapData& _source ) = delete; }; diff --git a/compilerplugins/clang/store/deletedspecial.cxx b/compilerplugins/clang/store/deletedspecial.cxx index 6c2d58807a86..b1329229e2fc 100644 --- a/compilerplugins/clang/store/deletedspecial.cxx +++ b/compilerplugins/clang/store/deletedspecial.cxx @@ -17,7 +17,7 @@ // Second-guess that certain private special member function declarations for // which no definition can be found are left undefined to prevent them from // being implicitly declared. Such situations are better expressed by marking -// the function as SAL_DELETED_FUNCTION (it e.g. helps compilers determine +// the function as = delete (it e.g. helps compilers determine // whether class members are unused if all of a class's member definitions are // seen in a compilation unit). (Default constructors for classes with multiple // constructors are exempted as they would not be implicitly declared. diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index e3cb69199faf..f9006657a17d 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -474,8 +474,8 @@ protected: bool isDisposed() const { return disposed_;} private: - Access(const Access&) SAL_DELETED_FUNCTION; - Access& operator=(const Access&) SAL_DELETED_FUNCTION; + Access(const Access&) = delete; + Access& operator=(const Access&) = delete; struct ModifiedChild { rtl::Reference< ChildAccess > child; diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx index e808dd84f9e1..e0a5fc4ce962 100644 --- a/configmgr/source/broadcaster.hxx +++ b/configmgr/source/broadcaster.hxx @@ -78,8 +78,8 @@ public: void send(); private: - Broadcaster(const Broadcaster&) SAL_DELETED_FUNCTION; - Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION; + Broadcaster(const Broadcaster&) = delete; + Broadcaster& operator=(const Broadcaster&) = delete; struct DisposeNotification { css::uno::Reference< css::lang::XEventListener > listener; diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 43e682e7757e..b28da71f4111 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -102,8 +102,8 @@ public: getExternalValue(OUString const & descriptor); private: - Components(const Components&) SAL_DELETED_FUNCTION; - Components& operator=(const Components&) SAL_DELETED_FUNCTION; + Components(const Components&) = delete; + Components& operator=(const Components&) = delete; typedef void FileParser( OUString const &, int, Data &, Partial const *, Modifications *, diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 31b87b69edd7..58c3da6e73b8 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -110,8 +110,8 @@ public: } private: - Service(const Service&) SAL_DELETED_FUNCTION; - Service& operator=(const Service&) SAL_DELETED_FUNCTION; + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; virtual ~Service() {} @@ -376,8 +376,8 @@ public: Factory() {} private: - Factory(const Factory&) SAL_DELETED_FUNCTION; - Factory& operator=(const Factory&) SAL_DELETED_FUNCTION; + Factory(const Factory&) = delete; + Factory& operator=(const Factory&) = delete; virtual ~Factory() {} diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index d1f640e3c112..6fa5450ca5c3 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -75,8 +75,8 @@ public: explicit Service(css::uno::Reference< css::uno::XComponentContext > const & context); private: - Service(const Service&) SAL_DELETED_FUNCTION; - Service& operator=(const Service&) SAL_DELETED_FUNCTION; + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; virtual ~Service() {} @@ -158,8 +158,8 @@ public: service_(service), value_(value) {} private: - RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION; - RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION; + RegistryKey(const RegistryKey&) = delete; + RegistryKey& operator=(const RegistryKey&) = delete; virtual ~RegistryKey() {} diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx index 681bf55aa261..e0293b518390 100644 --- a/configmgr/source/data.hxx +++ b/configmgr/source/data.hxx @@ -85,8 +85,8 @@ struct Data { OUString const & url); private: - Data(const Data&) SAL_DELETED_FUNCTION; - Data& operator=(const Data&) SAL_DELETED_FUNCTION; + Data(const Data&) = delete; + Data& operator=(const Data&) = delete; typedef config_map< rtl::Reference< ExtensionXcu > > ExtensionXcuAdditions; diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx index 098992d08fd5..dc97fd3bee07 100644 --- a/configmgr/source/modifications.hxx +++ b/configmgr/source/modifications.hxx @@ -52,8 +52,8 @@ public: Node const & getRoot() const { return root_;} private: - Modifications(const Modifications&) SAL_DELETED_FUNCTION; - Modifications& operator=(const Modifications&) SAL_DELETED_FUNCTION; + Modifications(const Modifications&) = delete; + Modifications& operator=(const Modifications&) = delete; Node root_; }; diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx index d9864a6f4841..e7641e2c974b 100644 --- a/configmgr/source/partial.hxx +++ b/configmgr/source/partial.hxx @@ -43,8 +43,8 @@ public: Containment contains(Path const & path) const; private: - Partial(const Partial&) SAL_DELETED_FUNCTION; - Partial& operator=(const Partial&) SAL_DELETED_FUNCTION; + Partial(const Partial&) = delete; + Partial& operator=(const Partial&) = delete; struct Node { typedef boost::unordered_map< OUString, Node, OUStringHash > Children; diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index afaef972f3ff..8948ce93043e 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -51,8 +51,8 @@ public: context_(context) {} private: - Service(const Service&) SAL_DELETED_FUNCTION; - Service& operator=(const Service&) SAL_DELETED_FUNCTION; + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; virtual ~Service() {} diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx index e6c4fa07dc5d..d1cc4134562e 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -53,8 +53,8 @@ public: context_(context) {} private: - Service(const Service&) SAL_DELETED_FUNCTION; - Service& operator=(const Service&) SAL_DELETED_FUNCTION; + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; virtual ~Service() {} diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 5d4028559fed..44b9840b612e 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -68,8 +68,8 @@ public: } private: - Service(const Service&) SAL_DELETED_FUNCTION; - Service& operator=(const Service&) SAL_DELETED_FUNCTION; + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; virtual ~Service() {} diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index f2c3b3c2e5bb..092d910dcd05 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -68,8 +68,8 @@ public: OString separator_; private: - ValueParser(const ValueParser&) SAL_DELETED_FUNCTION; - ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION; + ValueParser(const ValueParser&) = delete; + ValueParser& operator=(const ValueParser&) = delete; template< typename T > css::uno::Any convertItems(); diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 056041dea512..d56b284004e1 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -152,7 +152,7 @@ void writeData_(TempFile &handle, char const * begin, sal_Int32 length) { handle.writeString(begin, length); } -void writeValueContent_(TempFile &, bool) SAL_DELETED_FUNCTION; +void writeValueContent_(TempFile &, bool) = delete; // silence loplugin:salbool void writeValueContent_(TempFile &handle, sal_Bool value) { if (value) { diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx index 5a80959ac359..ffd1fda316cd 100644 --- a/configmgr/source/writemodfile.hxx +++ b/configmgr/source/writemodfile.hxx @@ -44,8 +44,8 @@ struct TempFile { void writeString(char const *begin, sal_Int32 length); private: - TempFile(const TempFile&) SAL_DELETED_FUNCTION; - TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION; + TempFile(const TempFile&) = delete; + TempFile& operator=(const TempFile&) = delete; }; void writeData(TempFile &handle, OString const & text); diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 0ed726c14fe3..522245087ff4 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -77,8 +77,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2> m_xDesktop; private: - OPoolCollection(const OPoolCollection&) SAL_DELETED_FUNCTION; - int operator= (const OPoolCollection&) SAL_DELETED_FUNCTION; + OPoolCollection(const OPoolCollection&) = delete; + int operator= (const OPoolCollection&) = delete; explicit OPoolCollection( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index 411c7544e978..972f9141d3b9 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -160,8 +160,8 @@ protected: // Data enum { NPColumns, NPValues, NPRows } nowParsing_; private: - MorkParser(const MorkParser &) SAL_DELETED_FUNCTION; - MorkParser &operator=(const MorkParser &) SAL_DELETED_FUNCTION; + MorkParser(const MorkParser &) = delete; + MorkParser &operator=(const MorkParser &) = delete; }; diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index ce70eb696d56..300f3574dff3 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -252,8 +252,8 @@ struct Statics BaseTypeMap baseTypeMap; Statics(){} private: - Statics( const Statics & ) SAL_DELETED_FUNCTION; - Statics & operator = ( const Statics & ) SAL_DELETED_FUNCTION; + Statics( const Statics & ) = delete; + Statics & operator = ( const Statics & ) = delete; }; Statics & getStatics(); diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index ecb2c59e3734..6dc66d6b99a1 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -38,8 +38,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ParameterSubstitution( const ParameterSubstitution& ) SAL_DELETED_FUNCTION; - ParameterSubstitution& operator=( const ParameterSubstitution& ) SAL_DELETED_FUNCTION; + ParameterSubstitution( const ParameterSubstitution& ) = delete; + ParameterSubstitution& operator=( const ParameterSubstitution& ) = delete; public: static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index a4f8d7d429b7..5eb3c36ccab9 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -121,8 +121,8 @@ private: // supposed to be a singleton FunctionParser(); - FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION; - FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION; + FunctionParser(const FunctionParser&) = delete; + FunctionParser& operator=( const FunctionParser& ) = delete; }; diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 59c7735a7900..9d8f2d608c04 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -77,7 +77,7 @@ namespace connectivity OLEVariant(const VARIANT& varSrc); OLEVariant(const OLEVariant& varSrc) ; OLEVariant(bool x) ; - OLEVariant(sal_Bool) SAL_DELETED_FUNCTION; + OLEVariant(sal_Bool) = delete; OLEVariant(sal_Int8 n) ; OLEVariant(sal_Int16 n) ; OLEVariant(sal_Int32 n) ; diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index 6d96a48e3e72..e426e6ca8ce2 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -64,8 +64,8 @@ namespace connectivity { namespace jdbc } private: - ContextClassLoaderScope(ContextClassLoaderScope &) SAL_DELETED_FUNCTION; - void operator =(ContextClassLoaderScope &) SAL_DELETED_FUNCTION; + ContextClassLoaderScope(ContextClassLoaderScope &) = delete; + void operator =(ContextClassLoaderScope &) = delete; void pop( bool clearExceptions ); diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index 765cbe9318b9..2e0369a384c0 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -76,8 +76,8 @@ namespace connectivity { namespace jdbc bool is() const { return m_object != NULL; } private: - LocalRef(LocalRef &) SAL_DELETED_FUNCTION; - void operator =(LocalRef &) SAL_DELETED_FUNCTION; + LocalRef(LocalRef &) = delete; + void operator =(LocalRef &) = delete; protected: JNIEnv& m_environment; diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 0efa942752a2..f3b169e23950 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -44,8 +44,8 @@ namespace connectivity class SDBThreadAttach { jvmaccess::VirtualMachine::AttachGuard m_aGuard; - SDBThreadAttach(SDBThreadAttach&) SAL_DELETED_FUNCTION; - SDBThreadAttach& operator= (SDBThreadAttach&) SAL_DELETED_FUNCTION; + SDBThreadAttach(SDBThreadAttach&) = delete; + SDBThreadAttach& operator= (SDBThreadAttach&) = delete; public: SDBThreadAttach(); ~SDBThreadAttach(); @@ -66,8 +66,8 @@ namespace connectivity class java_lang_Object { - java_lang_Object& operator= (java_lang_Object&) SAL_DELETED_FUNCTION; - java_lang_Object(java_lang_Object&) SAL_DELETED_FUNCTION; + java_lang_Object& operator= (java_lang_Object&) = delete; + java_lang_Object(java_lang_Object&) = delete; protected: // The Java handle to this class diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index dbf205ddf749..9347e3793a4b 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -206,8 +206,8 @@ static float GetSwapFloat( SvStream& rSt ) void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState); private: - ImplRenderer(const ImplRenderer&) SAL_DELETED_FUNCTION; - ImplRenderer& operator=( const ImplRenderer& ) SAL_DELETED_FUNCTION; + ImplRenderer(const ImplRenderer&) = delete; + ImplRenderer& operator=( const ImplRenderer& ) = delete; static void updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly, const ActionFactoryParameters& rParms, diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index 2a21bbd12ce4..f6c75cb4d04d 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.hxx @@ -55,8 +55,8 @@ namespace cppcanvas virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE; private: - ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION; - ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION; + ImplBitmap(const ImplBitmap&) = delete; + ImplBitmap& operator=( const ImplBitmap& ) = delete; const css::uno::Reference< css::rendering::XBitmap > mxBitmap; BitmapCanvasSharedPtr mpBitmapCanvas; diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 08ea31f52fa0..cf176ee8ab7f 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -47,7 +47,7 @@ namespace cppcanvas //ImplBitmapCanvas(const ImplBitmapCanvas&); private: - ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION; + ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) = delete; const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas; const css::uno::Reference< css::rendering::XBitmap > mxBitmap; diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index 7c8920cb65e9..f7b971d699aa 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -75,7 +75,7 @@ namespace cppcanvas //ImplCanvas(const ImplCanvas&); private: - ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION; + ImplCanvas& operator=( const ImplCanvas& ) = delete; mutable css::rendering::ViewState maViewState; boost::optional maClipPolyPolygon; diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index 4e6674dcffbc..fcf12d7eb5ee 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -44,8 +44,8 @@ namespace cppcanvas virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE; private: - ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION; - ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION; + ImplCustomSprite(const ImplCustomSprite&) = delete; + ImplCustomSprite& operator=( const ImplCustomSprite& ) = delete; mutable CanvasSharedPtr mpLastCanvas; const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite; diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index 606c92e915c0..4db158ac8eab 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -61,8 +61,8 @@ namespace cppcanvas css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE; private: - ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION; - ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION; + ImplPolyPolygon(const ImplPolyPolygon&) = delete; + ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) = delete; const css::uno::Reference< css::rendering::XPolyPolygon2D > mxPolyPoly; diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index e5aeb29c0283..d06931592250 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -57,8 +57,8 @@ namespace cppcanvas css::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE; private: - ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION; - ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION; + ImplSprite(const ImplSprite&) = delete; + ImplSprite& operator=( const ImplSprite& ) = delete; css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice; const css::uno::Reference< css::rendering::XSprite > mxSprite; diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 51374bfcf904..3ba92ee69e74 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -73,7 +73,7 @@ namespace cppcanvas typedef std::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr; private: - ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION; + ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) = delete; const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas; TransformationArbiterSharedPtr mpTransformArbiter; diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 4de516f7840c..055e166749b3 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -89,12 +89,12 @@ private: // intended cases: struct Base1: public css::uno::XInterface { - virtual ~Base1() SAL_DELETED_FUNCTION; + virtual ~Base1() = delete; }; -struct Base2: public Base1 { virtual ~Base2() SAL_DELETED_FUNCTION; }; -struct Base3: public Base1 { virtual ~Base3() SAL_DELETED_FUNCTION; }; +struct Base2: public Base1 { virtual ~Base2() = delete; }; +struct Base3: public Base1 { virtual ~Base3() = delete; }; struct Derived: public Base2, public Base3 { - virtual ~Derived() SAL_DELETED_FUNCTION; + virtual ~Derived() = delete; }; // The special case using the conversion operator instead: diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index c1f283f52b57..d415ce84db84 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -39,8 +39,8 @@ class SvxEventConfigPage : public _SvxMacroTabPage DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); - SvxEventConfigPage (const SvxEventConfigPage &) SAL_DELETED_FUNCTION; - SvxEventConfigPage & operator= (const SvxEventConfigPage &) SAL_DELETED_FUNCTION; + SvxEventConfigPage (const SvxEventConfigPage &) = delete; + SvxEventConfigPage & operator= (const SvxEventConfigPage &) = delete; public: diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index be75242a8238..06ffc6862e20 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -39,8 +39,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog sal_Int32 nInitialTlFlags; VclPtr pPage; - SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; - SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; + SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) = delete; + SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) = delete; public: SvxJSearchOptionsDialog(vcl::Window *pParent, diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 59fd9e479a78..75a9f9566104 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -32,8 +32,8 @@ class PasswordToOpenModifyDialog : public SfxModalDialog { std::unique_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; - PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION; - PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION; + PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete; + PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) = delete; public: PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a598f2e53575..a80177783dd3 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -37,8 +37,8 @@ class LookUpComboBox : public ComboBox Idle m_aModifyIdle; VclPtr m_pDialog; - LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION; - LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION; + LookUpComboBox( const LookUpComboBox & ) = delete; + LookUpComboBox& operator = ( const LookUpComboBox & ) = delete; public: LookUpComboBox(vcl::Window *pParent); @@ -78,8 +78,8 @@ class ThesaurusAlternativesCtrl typedef std::map< const SvTreeListEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; - ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION; - ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION; + ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) = delete; + ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) = delete; public: ThesaurusAlternativesCtrl(vcl::Window* pParent); @@ -102,8 +102,8 @@ class ReplaceEdit : public Edit { VclPtr