[Libreoffice-commits] core.git: 65 commits - accessibility/inc basctl/source basic/source bridges/inc bridges/source canvas/source chart2/source codemaker/source comphelper/source compilerplugins/clang connectivity/source cppcanvas/source cui/source dbaccess/source desktop/source editeng/source extensions/source forms/source formula/source fpicker/source framework/inc include/avmedia include/basegfx include/canvas include/codemaker include/comphelper include/connectivity include/cppcanvas include/cppu include/cppuhelper include/drawinglayer include/editeng include/filter include/formula include/framework include/jvmaccess include/linguistic include/oox include/osl include/registry include/rtl include/salhelper include/sfx2 include/sot include/svl include/svtools include/svx include/toolkit include/tools include/ucbhelper include/unotools include/vcl include/xmloff jvmfwk/source lingucomponent/source linguistic/inc linguistic/source lotuswordpro/source oox/source pyuno/inc registry/tools reportdes ign/inc reportdesign/source sc/inc scripting/source sc/source sdext/source sd/inc sd/source sfx2/source shell/inc shell/source slideshow/source starmath/source stoc/source store/source svl/unx svtools/inc svtools/source svx/inc svx/source sw/inc sw/source testtools/source ucb/source unotools/source uui/source vbahelper/source vcl/inc vcl/unx writerfilter/source xmlhelp/source xmlsecurity/inc
Stephan Bergmann
sbergman at redhat.com
Sat Feb 7 03:36:48 PST 2015
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 5
accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx | 5
accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx | 5
accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx | 10
accessibility/inc/accessibility/extended/listboxaccessible.hxx | 5
basctl/source/basicide/breakpoint.hxx | 4
basctl/source/inc/bastypes.hxx | 6
basctl/source/inc/dlgedmod.hxx | 4
basic/source/inc/codegen.hxx | 6
basic/source/inc/sbunoobj.hxx | 6
basic/source/inc/symtbl.hxx | 4
bridges/inc/bridges/cpp_uno/shared/bridge.hxx | 4
bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 4
bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx | 4
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4
bridges/source/cpp_uno/shared/guardedarray.hxx | 4
bridges/source/jni_uno/jni_base.h | 12
canvas/source/opengl/ogl_canvashelper.hxx | 3
chart2/source/controller/accessibility/AccessibleViewForwarder.hxx | 4
chart2/source/controller/dialogs/DataBrowser.hxx | 3
chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 6
chart2/source/controller/main/ShapeToolbarController.hxx | 4
chart2/source/inc/CharacterProperties.hxx | 17 -
chart2/source/inc/DiagramHelper.hxx | 3
chart2/source/inc/FillProperties.hxx | 13
chart2/source/inc/LifeTime.hxx | 6
chart2/source/inc/LinePropertiesHelper.hxx | 19 -
chart2/source/inc/ModifyListenerCallBack.hxx | 3
chart2/source/inc/RegressionCurveHelper.hxx | 61 +---
chart2/source/inc/RelativeSizeHelper.hxx | 3
chart2/source/inc/ResourceManager.hxx | 13
chart2/source/inc/SceneProperties.hxx | 13
chart2/source/inc/StatisticsHelper.hxx | 33 --
chart2/source/inc/UserDefinedProperties.hxx | 11
chart2/source/model/main/DataPointProperties.hxx | 13
chart2/source/model/main/DataSeriesProperties.hxx | 13
chart2/source/tools/ResourceManager.cxx | 11
chart2/source/view/inc/VDiagram.hxx | 2
chart2/source/view/inc/VLegendSymbolFactory.hxx | 10
codemaker/source/cppumaker/includes.hxx | 4
codemaker/source/javamaker/classfile.hxx | 8
comphelper/source/property/propertycontainerhelper.cxx | 1
compilerplugins/clang/store/deletedspecial.cxx | 151 ++++++++++
connectivity/source/cpool/ZPoolCollection.hxx | 5
connectivity/source/drivers/mork/MorkParser.hxx | 4
connectivity/source/drivers/postgresql/pq_statics.hxx | 4
connectivity/source/inc/ParameterSubstitution.hxx | 4
connectivity/source/inc/RowFunctionParser.hxx | 5
connectivity/source/inc/java/ContextClassLoader.hxx | 4
connectivity/source/inc/java/LocalRef.hxx | 4
connectivity/source/inc/java/lang/Object.hxx | 9
cppcanvas/source/inc/implrenderer.hxx | 5
cppcanvas/source/mtfrenderer/bitmapaction.hxx | 18 -
cppcanvas/source/mtfrenderer/lineaction.hxx | 16 -
cppcanvas/source/mtfrenderer/pointaction.hxx | 18 -
cppcanvas/source/mtfrenderer/polypolyaction.hxx | 24 -
cppcanvas/source/mtfrenderer/textaction.hxx | 16 -
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx | 16 -
cppcanvas/source/wrapper/implbitmap.hxx | 5
cppcanvas/source/wrapper/implbitmapcanvas.hxx | 3
cppcanvas/source/wrapper/implcanvas.hxx | 3
cppcanvas/source/wrapper/implcustomsprite.hxx | 5
cppcanvas/source/wrapper/implpolypolygon.hxx | 5
cppcanvas/source/wrapper/implsprite.hxx | 5
cppcanvas/source/wrapper/implspritecanvas.hxx | 3
cui/source/customize/eventdlg.hxx | 5
cui/source/inc/cuisrchdlg.hxx | 5
cui/source/inc/passwdomdlg.hxx | 5
cui/source/inc/thesdlg.hxx | 16 -
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 | 5
dbaccess/source/core/recovery/storagexmlstream.hxx | 10
dbaccess/source/sdbtools/connection/connectiontools.hxx | 5
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 5
dbaccess/source/sdbtools/connection/objectnames.hxx | 5
dbaccess/source/sdbtools/connection/tablename.hxx | 5
dbaccess/source/ui/inc/moduledbu.hxx | 3
desktop/source/app/configinit.hxx | 5
desktop/source/deployment/gui/dp_gui.h | 4
desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 4
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 8
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 1
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 5
desktop/source/deployment/manager/dp_activepackages.hxx | 4
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 4
desktop/source/splash/unxsplash.hxx | 6
editeng/source/editeng/editattr.hxx | 2
editeng/source/editeng/editdoc.hxx | 2
editeng/source/editeng/editobj2.hxx | 3
editeng/source/editeng/textconv.hxx | 5
editeng/source/outliner/paralist.cxx | 11
extensions/source/inc/componentmodule.hxx | 3
extensions/source/plugin/inc/plugin/multiplx.hxx | 4
extensions/source/propctrlr/composeduiupdate.hxx | 5
extensions/source/propctrlr/eformshelper.hxx | 5
extensions/source/propctrlr/eventhandler.hxx | 5
extensions/source/propctrlr/formcomponenthandler.hxx | 5
extensions/source/propctrlr/formcontroller.hxx | 5
extensions/source/propctrlr/formmetadata.hxx | 5
extensions/source/propctrlr/genericpropertyhandler.hxx | 5
extensions/source/propctrlr/handlerhelper.hxx | 5
extensions/source/propctrlr/propertyhandler.hxx | 5
extensions/source/propctrlr/propeventtranslation.hxx | 5
extensions/source/propctrlr/sqlcommanddesign.hxx | 5
extensions/source/propctrlr/xsddatatypes.hxx | 5
extensions/source/resource/oooresourceloader.hxx | 5
forms/source/component/entrylisthelper.hxx | 5
forms/source/inc/FormComponent.hxx | 5
forms/source/inc/InterfaceContainer.hxx | 4
forms/source/inc/formcontrolfont.hxx | 5
forms/source/inc/formnavigation.hxx | 5
forms/source/inc/forms_module.hxx | 3
forms/source/richtext/richtextengine.hxx | 5
forms/source/richtext/richtextmodel.hxx | 5
forms/source/richtext/richtextunowrapper.hxx | 10
forms/source/richtext/rtattributehandler.hxx | 13
forms/source/runtime/formoperations.hxx | 5
forms/source/xforms/datatyperepository.hxx | 4
forms/source/xforms/datatypes.hxx | 5
formula/source/ui/inc/ModuleHelper.hxx | 3
fpicker/source/office/asyncfilepicker.hxx | 5
fpicker/source/office/fpsmartcontent.hxx | 4
framework/inc/helper/shareablemutex.hxx | 3
framework/inc/services/uriabbreviation.hxx | 4
framework/inc/uiconfiguration/globalsettings.hxx | 5
framework/inc/uielement/menubarmerger.hxx | 36 --
framework/inc/uielement/rootitemcontainer.hxx | 4
framework/inc/uielement/statusbarmerger.hxx | 20 -
framework/inc/uielement/toolbarmerger.hxx | 5
include/avmedia/mediawindow.hxx | 6
include/basegfx/range/b2dconnectedranges.hxx | 5
include/basegfx/raster/bpixelraster.hxx | 5
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 | 15
include/comphelper/asyncnotification.hxx | 4
include/comphelper/componentmodule.hxx | 4
include/comphelper/configuration.hxx | 24 -
include/comphelper/documentinfo.hxx | 10
include/comphelper/propertycontainerhelper.hxx | 6
include/comphelper/proxyaggregation.hxx | 15
include/connectivity/ParameterCont.hxx | 4
include/connectivity/parameters.hxx | 5
include/connectivity/sqliterator.hxx | 3
include/cppcanvas/basegfxfactory.hxx | 5
include/cppcanvas/vclfactory.hxx | 5
include/cppu/Enterable.hxx | 4
include/cppu/unotype.hxx | 6
include/cppuhelper/component.hxx | 5
include/cppuhelper/interfacecontainer.h | 20 -
include/cppuhelper/propertysetmixin.hxx | 12
include/cppuhelper/propshlp.hxx | 14
include/cppuhelper/weakagg.hxx | 5
include/drawinglayer/animation/animationtiming.hxx | 4
include/editeng/AccessibleEditableTextPara.hxx | 6
include/editeng/AccessibleImageBullet.hxx | 8
include/editeng/AccessibleStaticTextBase.hxx | 7
include/editeng/editeng.hxx | 4
include/editeng/editobj.hxx | 2
include/editeng/editview.hxx | 4
include/editeng/hangulhanja.hxx | 5
include/editeng/outliner.hxx | 7
include/editeng/svxacorr.hxx | 4
include/editeng/txtrange.hxx | 2
include/editeng/unoedprx.hxx | 5
include/editeng/unolingu.hxx | 10
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 | 10
include/formula/token.hxx | 4
include/framework/menuconfiguration.hxx | 2
include/jvmaccess/classpath.hxx | 8
include/jvmaccess/unovirtualmachine.hxx | 4
include/jvmaccess/virtualmachine.hxx | 8
include/linguistic/hyphdta.hxx | 10
include/linguistic/lngprophelp.hxx | 22 -
include/oox/core/binarycodec.hxx | 11
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/olehelper.hxx | 21 -
include/oox/ole/vbahelper.hxx | 13
include/oox/ole/vbaproject.hxx | 4
include/oox/vml/vmlformatting.hxx | 23 -
include/osl/conditn.hxx | 19 -
include/osl/diagnose.hxx | 5
include/osl/file.hxx | 16 -
include/osl/module.hxx | 4
include/osl/mutex.hxx | 32 --
include/osl/thread.hxx | 8
include/registry/writer.hxx | 4
include/rtl/bootstrap.hxx | 4
include/rtl/uri.hxx | 12
include/salhelper/condition.hxx | 12
include/salhelper/refobj.hxx | 6
include/salhelper/simplereferenceobject.hxx | 4
include/salhelper/timer.hxx | 8
include/sfx2/basedlgs.hxx | 12
include/sfx2/controlwrapper.hxx | 5
include/sfx2/docfac.hxx | 5
include/sfx2/dockwin.hxx | 4
include/sfx2/docstoragemodifylistener.hxx | 5
include/sfx2/itemconnect.hxx | 5
include/sfx2/linkmgr.hxx | 4
include/sfx2/mnumgr.hxx | 5
include/sfx2/opengrf.hxx | 5
include/sfx2/querystatus.hxx | 5
include/sfx2/request.hxx | 2
include/sfx2/sfxstatuslistener.hxx | 5
include/sfx2/shell.hxx | 4
include/sfx2/tbxctrl.hxx | 4
include/sot/factory.hxx | 4
include/sot/object.hxx | 5
include/svl/SfxBroadcaster.hxx | 2
include/svl/broadcast.hxx | 2
include/svl/filerec.hxx | 10
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 | 5
include/svl/svdde.hxx | 12
include/svl/undo.hxx | 4
include/svl/zforlist.hxx | 6
include/svtools/acceleratorexecute.hxx | 4
include/svtools/bindablecontrolhelper.hxx | 10
include/svtools/contextmenuhelper.hxx | 6
include/svtools/ctrlbox.hxx | 25 -
include/svtools/ctrltool.hxx | 5
include/svtools/dialogcontrolling.hxx | 8
include/svtools/editbrowsebox.hxx | 5
include/svtools/embedhlp.hxx | 2
include/svtools/imageresourceaccess.hxx | 14
include/svtools/javacontext.hxx | 5
include/svtools/javainteractionhandler.hxx | 4
include/svtools/ruler.hxx | 5
include/svtools/scriptedtext.hxx | 3
include/svtools/transfer.hxx | 13
include/svtools/treelist.hxx | 4
include/svtools/valueset.hxx | 5
include/svtools/xwindowitem.hxx | 3
include/svx/AccessibleControlShape.hxx | 11
include/svx/AccessibleGraphicShape.hxx | 11
include/svx/AccessibleOLEShape.hxx | 11
include/svx/AccessibleShape.hxx | 10
include/svx/AccessibleShapeInfo.hxx | 4
include/svx/ChildrenManager.hxx | 6
include/svx/EnhancedCustomShapeFunctionParser.hxx | 5
include/svx/fmmodel.hxx | 4
include/svx/rulritem.hxx | 8
include/svx/sdr/table/tablecontroller.hxx | 4
include/svx/sdrmasterpagedescriptor.hxx | 3
include/svx/sdrpagewindow.hxx | 4
include/svx/svdmodel.hxx | 7
include/svx/svdobj.hxx | 8
include/svx/svdovirt.hxx | 2
include/svx/svdpage.hxx | 7
include/toolkit/awt/vclxspinbutton.hxx | 4
include/toolkit/controls/unocontrols.hxx | 2
include/tools/config.hxx | 4
include/tools/inetstrm.hxx | 30 -
include/tools/resary.hxx | 4
include/tools/resmgr.hxx | 5
include/tools/stream.hxx | 14
include/ucbhelper/commandenvironment.hxx | 4
include/unotools/desktopterminationobserver.hxx | 12
include/unotools/digitgroupingiterator.hxx | 6
include/unotools/eventlisteneradapter.hxx | 4
include/unotools/lingucfg.hxx | 5
include/unotools/nativenumberwrapper.hxx | 5
include/unotools/numberformatcodewrapper.hxx | 5
include/unotools/options.hxx | 4
include/unotools/searchopt.hxx | 7
include/unotools/sharedunocomponent.hxx | 10
include/unotools/tempfile.hxx | 7
include/unotools/transliterationwrapper.hxx | 5
include/vcl/btndlg.hxx | 5
include/vcl/button.hxx | 45 +-
include/vcl/ctrl.hxx | 5
include/vcl/dialog.hxx | 15
include/vcl/dockingarea.hxx | 5
include/vcl/dockwin.hxx | 5
include/vcl/floatwin.hxx | 5
include/vcl/graphicfilter.hxx | 4
include/vcl/menubtn.hxx | 5
include/vcl/metric.hxx | 4
include/vcl/morebtn.hxx | 5
include/vcl/print.hxx | 4
include/vcl/quickselectionengine.hxx | 5
include/vcl/split.hxx | 5
include/vcl/splitwin.hxx | 7
include/vcl/svapp.hxx | 12
include/vcl/syschild.hxx | 4
include/vcl/toolbox.hxx | 5
include/vcl/virdev.hxx | 5
include/vcl/wrkwin.hxx | 4
include/xmloff/DocumentSettingsContext.hxx | 5
include/xmloff/SchXMLExportHelper.hxx | 5
include/xmloff/XMLCharContext.hxx | 4
include/xmloff/prhdlfac.hxx | 4
include/xmloff/prstylei.hxx | 4
include/xmloff/txtparae.hxx | 2
include/xmloff/xmlimppr.hxx | 5
include/xmloff/xmlprmap.hxx | 4
include/xmloff/xmlstyle.hxx | 4
jvmfwk/source/elements.hxx | 4
jvmfwk/source/libxmlutil.hxx | 14
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 5
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 5
lingucomponent/source/thesaurus/libnth/nthesdta.cxx | 5
lingucomponent/source/thesaurus/libnth/nthesdta.hxx | 8
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 5
linguistic/inc/iprcache.hxx | 10
linguistic/source/convdiclist.hxx | 5
linguistic/source/dicimp.hxx | 10
linguistic/source/dlistimp.hxx | 5
linguistic/source/gciterator.cxx | 1
linguistic/source/gciterator.hxx | 6
linguistic/source/hhconvdic.hxx | 5
linguistic/source/hyphdsp.hxx | 5
linguistic/source/lngopt.hxx | 5
linguistic/source/lngprophelp.cxx | 17 -
linguistic/source/lngsvcmgr.hxx | 5
linguistic/source/spelldsp.hxx | 5
linguistic/source/thesdsp.hxx | 5
lotuswordpro/source/filter/lwpbackgroundoverride.hxx | 2
lotuswordpro/source/filter/lwpbreaksoverride.hxx | 2
lotuswordpro/source/filter/lwpcharborderoverride.hxx | 2
lotuswordpro/source/filter/lwpnumberingoverride.hxx | 2
lotuswordpro/source/filter/lwpoverride.hxx | 20 -
lotuswordpro/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 | 6
reportdesign/inc/ModuleHelper.hxx | 3
reportdesign/inc/PropertyForward.hxx | 4
reportdesign/inc/ReportDefinition.hxx | 4
reportdesign/inc/RptModel.hxx | 4
reportdesign/inc/RptObject.hxx | 4
reportdesign/inc/UndoActions.hxx | 8
reportdesign/inc/UndoEnv.hxx | 4
reportdesign/inc/conditionalexpression.hxx | 5
reportdesign/source/core/api/ReportDefinition.cxx | 47 ---
reportdesign/source/core/api/Section.cxx | 2
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
reportdesign/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 | 6
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
reportdesign/source/filter/xml/xmlControlProperty.hxx | 4
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 1
reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx | 5
reportdesign/source/filter/xml/xmlFixedContent.hxx | 4
reportdesign/source/filter/xml/xmlFormatCondition.hxx | 4
reportdesign/source/filter/xml/xmlFormattedField.hxx | 4
reportdesign/source/filter/xml/xmlHelper.hxx | 4
reportdesign/source/filter/xml/xmlImage.hxx | 4
reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 4
reportdesign/source/filter/xml/xmlMasterFields.hxx | 4
reportdesign/source/filter/xml/xmlPropertyHandler.hxx | 4
reportdesign/source/filter/xml/xmlReport.hxx | 4
reportdesign/source/filter/xml/xmlReportElement.hxx | 4
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 4
reportdesign/source/filter/xml/xmlSection.cxx | 1
reportdesign/source/filter/xml/xmlSection.hxx | 5
reportdesign/source/filter/xml/xmlStyleImport.cxx | 5
reportdesign/source/filter/xml/xmlStyleImport.hxx | 12
reportdesign/source/filter/xml/xmlSubDocument.hxx | 4
reportdesign/source/filter/xml/xmlTable.hxx | 4
reportdesign/source/ui/dlg/dlgpage.cxx | 1
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
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 4
reportdesign/source/ui/inc/ReportControllerObserver.hxx | 4
reportdesign/source/ui/inc/ReportSection.hxx | 5
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 | 6
reportdesign/source/ui/inc/metadata.hxx | 4
reportdesign/source/ui/inc/propbrw.hxx | 4
reportdesign/source/ui/inc/toolboxcontroller.hxx | 4
reportdesign/source/ui/report/ReportSection.cxx | 1
sc/inc/attarray.hxx | 6
sc/inc/bulkdatahint.hxx | 4
sc/inc/cellvalues.hxx | 8
sc/inc/chart2uno.hxx | 6
sc/inc/chartarr.hxx | 2
sc/inc/chartlis.hxx | 9
sc/inc/chartlock.hxx | 6
sc/inc/chartpos.hxx | 5
sc/inc/chgtrack.hxx | 15
sc/inc/column.hxx | 4
sc/inc/compare.hxx | 6
sc/inc/dapiuno.hxx | 2
sc/inc/document.hxx | 2
sc/inc/dpdimsave.hxx | 2
sc/inc/dpfilteredcache.hxx | 3
sc/inc/externalrefmgr.hxx | 7
sc/inc/formulacell.hxx | 2
sc/inc/linkuno.hxx | 6
sc/inc/listenerquery.hxx | 4
sc/inc/lookupcache.hxx | 9
sc/inc/patattr.hxx | 5
sc/inc/postit.hxx | 4
sc/inc/progress.hxx | 5
sc/inc/reftokenhelper.hxx | 32 --
sc/inc/scmatrix.hxx | 5
sc/inc/tabprotection.hxx | 15
sc/inc/token.hxx | 5
sc/inc/unitconv.hxx | 3
sc/source/core/inc/bcaslot.hxx | 5
sc/source/core/inc/jumpmatrix.hxx | 5
sc/source/filter/inc/biffhelper.hxx | 4
sc/source/filter/inc/xestream.hxx | 4
sc/source/filter/inc/xestyle.hxx | 17 -
sc/source/filter/oox/workbooksettings.cxx | 4
sc/source/filter/oox/worksheetsettings.cxx | 6
sc/source/filter/xml/XMLConverter.hxx | 13
sc/source/ui/inc/cliputil.hxx | 11
sc/source/ui/inc/docsh.hxx | 5
sc/source/ui/inc/undobase.hxx | 2
sc/source/ui/unoobj/celllistsource.hxx | 5
sc/source/ui/unoobj/cellvaluebinding.hxx | 5
scripting/source/dlgprov/DialogModelProvider.hxx | 4
scripting/source/inc/util/scriptingconstants.hxx | 4
sd/inc/helper/simplereferencecomponent.hxx | 20 -
sd/inc/stlsheet.hxx | 2
sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 6
sd/source/ui/inc/AccessiblePageShape.hxx | 10
sd/source/ui/inc/AccessiblePresentationShape.hxx | 11
sd/source/ui/inc/AccessibleViewForwarder.hxx | 4
sd/source/ui/inc/MasterPageObserver.hxx | 6
sd/source/ui/inc/WindowUpdater.hxx | 6
sd/source/ui/inc/filedlg.hxx | 5
sd/source/ui/inc/framework/FrameworkHelper.hxx | 4
sd/source/ui/inc/framework/ModuleController.hxx | 3
sd/source/ui/inc/sdxfer.hxx | 6
sd/source/ui/inc/slideshow.hxx | 5
sd/source/ui/inc/smarttag.hxx | 8
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 6
sd/source/ui/slideshow/slideshowimpl.hxx | 4
sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 7
sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx | 6
sdext/source/presenter/PresenterHelper.hxx | 33 --
sfx2/source/appl/imestatuswindow.hxx | 4
sfx2/source/doc/doctemplateslocal.hxx | 2
sfx2/source/inc/statcach.hxx | 2
sfx2/source/menu/thessubmenu.hxx | 6
sfx2/source/sidebar/DeckLayouter.cxx | 79 ++++-
sfx2/source/sidebar/DeckLayouter.hxx | 72 ----
shell/inc/internal/xml_parser.hxx | 6
shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 5
shell/source/tools/lngconvex/cmdline.hxx | 8
slideshow/source/engine/slide/targetpropertiescreator.hxx | 13
slideshow/source/engine/transitions/parametricpolypolygonfactory.hxx | 13
slideshow/source/inc/activitiesfactory.hxx | 26 -
slideshow/source/inc/animationfactory.hxx | 30 -
slideshow/source/inc/animationnodefactory.hxx | 15
slideshow/source/inc/transitionfactory.hxx | 4
starmath/source/accessibility.cxx | 21 -
starmath/source/accessibility.hxx | 30 -
stoc/source/javavm/interact.hxx | 4
stoc/source/javavm/javavm.hxx | 4
stoc/source/uriproc/UriReference.hxx | 4
store/source/object.hxx | 13
store/source/storbios.hxx | 6
store/source/stordir.hxx | 6
store/source/storlckb.hxx | 6
store/source/storpage.hxx | 6
svl/unx/source/svdde/ddedummy.cxx | 10
svtools/inc/table/tablecontrol.hxx | 5
svtools/source/graphic/descriptor.hxx | 4
svtools/source/misc/acceleratorexecute.cxx | 10
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 5
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 10
svx/source/accessibility/ChildrenManagerImpl.hxx | 6
svx/source/form/fmcontrollayout.cxx | 19 -
svx/source/inc/datanavi.hxx | 4
svx/source/inc/delayedevent.hxx | 5
svx/source/inc/fmcontrollayout.hxx | 22 -
svx/source/inc/fmobj.hxx | 2
svx/source/inc/fmpgeimp.hxx | 5
svx/source/inc/formcontrolling.hxx | 5
svx/source/svdraw/svdmodel.cxx | 13
svx/source/table/accessiblecell.hxx | 5
svx/source/unogallery/unogalitem.hxx | 6
sw/inc/HandleAnchorNodeChg.hxx | 6
sw/inc/SwNodeNum.hxx | 4
sw/inc/calc.hxx | 5
sw/inc/dcontact.hxx | 5
sw/inc/dlelstnr.hxx | 5
sw/inc/doc.hxx | 3
sw/inc/docstyle.hxx | 3
sw/inc/editsh.hxx | 5
sw/inc/fchrfmt.hxx | 2
sw/inc/finalthreadmanager.hxx | 4
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtcntnt.hxx | 2
sw/inc/fmtcol.hxx | 10
sw/inc/fmtflcnt.hxx | 3
sw/inc/fmtfld.hxx | 2
sw/inc/fmtftn.hxx | 5
sw/inc/fmtrfmrk.hxx | 3
sw/inc/fmturl.hxx | 2
sw/inc/frmfmt.hxx | 9
sw/inc/list.hxx | 5
sw/inc/ndnotxt.hxx | 4
sw/inc/ndole.hxx | 6
sw/inc/node.hxx | 25 -
sw/inc/paratr.hxx | 2
sw/inc/redline.hxx | 4
sw/inc/swtable.hxx | 7
sw/inc/tox.hxx | 2
sw/inc/unochart.hxx | 23 -
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/docnode/swthreadjoiner.cxx | 12
sw/source/core/inc/swthreadjoiner.hxx | 15
sw/source/core/inc/unoflatpara.hxx | 8
sw/source/core/inc/unotextmarkup.hxx | 8
sw/source/core/inc/wrong.hxx | 5
sw/source/core/text/inftxt.hxx | 2
sw/source/filter/inc/msfilter.hxx | 6
sw/source/filter/inc/wrtswtbl.hxx | 2
sw/source/filter/ww8/docxexport.hxx | 6
sw/source/filter/ww8/escher.hxx | 10
sw/source/filter/ww8/rtfexport.hxx | 6
sw/source/filter/ww8/sortedarray.hxx | 5
sw/source/filter/ww8/writerhelper.cxx | 3
sw/source/filter/ww8/writerhelper.hxx | 7
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 105 ++----
sw/source/filter/ww8/ww8glsy.hxx | 5
sw/source/filter/ww8/ww8par.hxx | 58 +--
sw/source/filter/ww8/ww8par2.hxx | 13
sw/source/filter/ww8/ww8scan.hxx | 60 +--
sw/source/filter/ww8/ww8toolbar.hxx | 60 +--
sw/source/uibase/inc/swdtflvr.hxx | 6
sw/source/uibase/inc/toxmgr.hxx | 12
sw/source/uibase/inc/uinums.hxx | 2
sw/source/uibase/inc/unomailmerge.hxx | 5
testtools/source/bridgetest/currentcontextchecker.hxx | 4
ucb/source/ucp/file/filrec.hxx | 4
ucb/source/ucp/ftp/ftploaderthread.hxx | 9
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 12
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 6
unotools/source/ucbhelper/XTempFile.hxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 4
unotools/source/ucbhelper/ucblockbytes.hxx | 2
uui/source/iahndl.hxx | 4
uui/source/requeststringresolver.hxx | 4
vbahelper/source/msforms/vbacontrol.hxx | 13
vcl/inc/brdwin.hxx | 5
vcl/inc/cvtsvm.hxx | 5
vcl/inc/generic/glyphcache.hxx | 5
vcl/inc/graphite_features.hxx | 2
vcl/inc/image.h | 12
vcl/inc/impfont.hxx | 5
vcl/inc/outfont.hxx | 4
vcl/inc/sallayout.hxx | 15
vcl/inc/textlayout.hxx | 5
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 6
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 5
vcl/unx/kde/UnxFilePicker.hxx | 5
vcl/unx/kde4/KDE4FilePicker.hxx | 5
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 4
writerfilter/source/rtftok/rtfvalue.hxx | 2
xmlhelp/source/cxxhelp/provider/db.hxx | 5
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 3
623 files changed, 1935 insertions(+), 2722 deletions(-)
New commits:
commit 5b24b4b9d5132a8137d8d80c320cd2551ecef736
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:35:19 2015 +0100
loplugin:deletedspecial
Change-Id: Ifee378401dd93967aabe14daa673232a9a24982d
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 827550f..d47526c 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -112,8 +112,7 @@ private:
DECL_LINK( SignatureVerifyResultListener, XMLSignatureVerifyResult* );
DECL_LINK( StartVerifySignatureElement, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >* );
- // Not allowed:
- XMLSignatureHelper(const XMLSignatureHelper&);
+ XMLSignatureHelper(const XMLSignatureHelper&) SAL_DELETED_FUNCTION;
public:
XMLSignatureHelper(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& mrCtx );
commit eaa9a73185e7bf9d222a3efab4eff9af05714250
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:35:09 2015 +0100
loplugin:deletedspecial
Change-Id: I806c9799f6eac357e5f200b53df3a9c1e6ecd841
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index 24296f3..f39cc20 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -47,9 +47,8 @@ public:
virtual void EndElement() SAL_OVERRIDE;
private:
- XMLDocumentSettingsContext(); // never implemented
- XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ); // never implemented
- XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ); // never implemented
+ XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
+ XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 5149c7a..3585d64 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -56,9 +56,8 @@ public:
void SetDestinationShellID( const OUString& rShellID );
private:
- SchXMLExportHelper(); // not defined
- SchXMLExportHelper(SchXMLExportHelper &); // not defined
- void operator =(SchXMLExportHelper &); // not defined
+ SchXMLExportHelper(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
+ void operator =(SchXMLExportHelper &) SAL_DELETED_FUNCTION;
private:
SchXMLExportHelper_Impl* m_pImpl;
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index d92193c..a07c813 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -25,8 +25,8 @@
class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
{
- XMLCharContext(const XMLCharContext&);
- void operator =(const XMLCharContext&);
+ XMLCharContext(const XMLCharContext&) SAL_DELETED_FUNCTION;
+ void operator =(const XMLCharContext&) SAL_DELETED_FUNCTION;
protected:
sal_Int16 m_nControl;
sal_uInt16 m_nCount;
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index 1b1822b..89517c3 100644
--- a/include/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
@@ -41,8 +41,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer
struct Impl;
Impl* mpImpl;
- XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ); // disabled
- XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ); // disabled
+ XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
+ XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION;
public:
XMLPropertyHandlerFactory();
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 185e6bf..583f355 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -54,8 +54,8 @@ private:
static OldFillStyleDefinitionSet maFooterSet;
static OldFillStyleDefinitionSet maParaSet;
- SAL_DLLPRIVATE XMLPropStyleContext(XMLPropStyleContext &); // not defined
- SAL_DLLPRIVATE void operator =(XMLPropStyleContext &); // not defined
+ XMLPropStyleContext(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
+ void operator =(XMLPropStyleContext &) SAL_DELETED_FUNCTION;
protected:
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 75be14a..376fe42 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -672,7 +672,7 @@ public:
void PopTextListsHelper();
private:
- XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of unique_ptr
+ XMLTextParagraphExport(XMLTextParagraphExport &) SAL_DELETED_FUNCTION;
};
inline const XMLTextListAutoStylePool&
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 33679a1..f4b271f 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -57,9 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer
SvXMLImport& rImport; // access to error handling
- SAL_DLLPRIVATE SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &);
- // not defined
- SAL_DLLPRIVATE void operator =(SvXMLImportPropertyMapper &); // not defined
+ SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
+ void operator =(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION;
protected:
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index dda84bd..569adfa 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -39,8 +39,8 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO
Impl* mpImpl;
- XMLPropertySetMapper( const XMLPropertySetMapper& ); // disabled.
- XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ); // disabled.
+ XMLPropertySetMapper( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
+ XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION;
public:
/** The last element of the XMLPropertyMapEntry-array must contain NULL-values.
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 73bcfc6..bc8d4b6 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -186,8 +186,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap();
- SAL_DLLPRIVATE SvXMLStylesContext(SvXMLStylesContext &); // not defined
- SAL_DLLPRIVATE void operator =(SvXMLStylesContext &); // not defined
+ SvXMLStylesContext(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
+ void operator =(SvXMLStylesContext &) SAL_DELETED_FUNCTION;
protected:
commit 61fe89e0b5a327a325284967782e9bbee5ca903a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:34:52 2015 +0100
loplugin:deletedspecial
Change-Id: I035d584af8a802d08dd4e50070b4d290210e20b6
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index fb96ec4..a0ee6b8 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -31,9 +31,8 @@ namespace helpdatafileproxy {
{
class Noncopyable
{
- // not implemented
- Noncopyable(const Noncopyable&);
- void operator=(const Noncopyable&);
+ Noncopyable(const Noncopyable&) SAL_DELETED_FUNCTION;
+ void operator=(const Noncopyable&) SAL_DELETED_FUNCTION;
protected:
Noncopyable() {}
~Noncopyable() {}
commit 61c50286fa2b6cf455bbd067ed6e8a31105b5475
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:34:38 2015 +0100
loplugin:deletedspecial
Change-Id: I6e5fb5562d73239eae32a4ef668aa88551608be2
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 190bf28..3021526 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -239,7 +239,7 @@ protected:
bool inPositionV;
private:
- void operator =(OOXMLFastContextHandler &); // not defined
+ void operator =(OOXMLFastContextHandler &) SAL_DELETED_FUNCTION;
/// Handles AlternateContent. Returns true, if children of the current element should be ignored.
bool prepareMceContext(Token_t nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs);
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 5a142d3..bc5bc08 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -88,8 +88,8 @@ public:
void setIsSubstream( bool bSubstream );
private:
- OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &); // not defined
- void operator =(OOXMLFastDocumentHandler &); // not defined
+ OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION;
+ void operator =(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index dcd5bba..970c232 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -58,7 +58,7 @@ public:
RTFShape& getShape() const;
bool equals(RTFValue& rOther);
private:
- RTFValue& operator=(RTFValue const& rOther);
+ RTFValue& operator=(RTFValue const& rOther) SAL_DELETED_FUNCTION;
int m_nValue;
OUString m_sValue;
std::shared_ptr<RTFSprms> m_pAttributes;
commit add9dae7035a86204def97a953c75e26f313c51c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:34:15 2015 +0100
loplugin:deletedspecial
Change-Id: I9ea64443350ed2e1341b99270fa8b29189f07eb2
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index d537592..fc51c15 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -72,9 +72,8 @@ protected:
SAL_DLLPRIVATE long ImplGetButtonSize();
private:
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ButtonDialog( const ButtonDialog & );
- SAL_DLLPRIVATE ButtonDialog& operator=( const ButtonDialog& );
+ ButtonDialog( const ButtonDialog & ) SAL_DELETED_FUNCTION;
+ ButtonDialog& operator=( const ButtonDialog& ) SAL_DELETED_FUNCTION;
private:
boost::ptr_vector<ImplBtnDlgItem> maItemList;
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3ea832d..3ab556d 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -43,9 +43,8 @@ private:
/// Command URL (like .uno:Save) in case the button should handle it.
OUString maCommand;
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE Button (const Button &);
- SAL_DLLPRIVATE Button & operator= (const Button &);
+ Button (const Button &) SAL_DELETED_FUNCTION;
+ Button & operator= (const Button &) SAL_DELETED_FUNCTION;
public:
SAL_DLLPRIVATE sal_uInt16 ImplGetButtonState() const;
SAL_DLLPRIVATE sal_uInt16& ImplGetButtonState();
@@ -219,9 +218,8 @@ protected:
private:
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE OKButton (const OKButton &);
- SAL_DLLPRIVATE OKButton & operator= (const OKButton &);
+ OKButton (const OKButton &) SAL_DELETED_FUNCTION;
+ OKButton & operator= (const OKButton &) SAL_DELETED_FUNCTION;
public:
explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON );
@@ -237,9 +235,8 @@ protected:
private:
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE CancelButton (const CancelButton &);
- SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &);
+ CancelButton (const CancelButton &) SAL_DELETED_FUNCTION;
+ CancelButton & operator= (const CancelButton &) SAL_DELETED_FUNCTION;
public:
explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -265,9 +262,8 @@ protected:
private:
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE HelpButton( const HelpButton & );
- SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & );
+ HelpButton( const HelpButton & ) SAL_DELETED_FUNCTION;
+ HelpButton & operator= ( const HelpButton & ) SAL_DELETED_FUNCTION;
public:
explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -310,9 +306,8 @@ private:
SAL_DLLPRIVATE Size ImplGetRadioImageSize() const;
SAL_DLLPRIVATE long ImplGetImageToTextDistance() const;
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE RadioButton(const RadioButton &);
- SAL_DLLPRIVATE RadioButton& operator= (const RadioButton &);
+ RadioButton(const RadioButton &) SAL_DELETED_FUNCTION;
+ RadioButton& operator= (const RadioButton &) SAL_DELETED_FUNCTION;
protected:
using Control::ImplInitSettings;
@@ -437,9 +432,8 @@ private:
SAL_DLLPRIVATE long ImplGetImageToTextDistance() const;
SAL_DLLPRIVATE Size ImplGetCheckImageSize() const;
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE CheckBox(const CheckBox &);
- SAL_DLLPRIVATE CheckBox& operator= (const CheckBox &);
+ CheckBox(const CheckBox &) SAL_DELETED_FUNCTION;
+ CheckBox& operator= (const CheckBox &) SAL_DELETED_FUNCTION;
protected:
using Control::ImplInitSettings;
@@ -523,9 +517,8 @@ protected:
private:
SAL_DLLPRIVATE void ImplInitStyle();
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ImageButton( const ImageButton & );
- SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & );
+ ImageButton( const ImageButton & ) SAL_DELETED_FUNCTION;
+ ImageButton & operator= ( const ImageButton & ) SAL_DELETED_FUNCTION;
public:
ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -535,9 +528,8 @@ public:
class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
{
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ImageRadioButton( const ImageRadioButton & );
- SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & );
+ ImageRadioButton( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
+ ImageRadioButton & operator= ( const ImageRadioButton & ) SAL_DELETED_FUNCTION;
public:
explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -546,9 +538,8 @@ public:
class VCL_DLLPUBLIC TriStateBox : public CheckBox
{
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE TriStateBox( const TriStateBox & );
- SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & );
+ TriStateBox( const TriStateBox & ) SAL_DELETED_FUNCTION;
+ TriStateBox & operator= ( const TriStateBox & ) SAL_DELETED_FUNCTION;
public:
explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 1158234..d85c858 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -46,9 +46,8 @@ private:
SAL_DLLPRIVATE void ImplInitControlData();
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE Control (const Control &);
- SAL_DLLPRIVATE Control & operator= (const Control &);
+ Control (const Control &) SAL_DELETED_FUNCTION;
+ Control & operator= (const Control &) SAL_DELETED_FUNCTION;
protected:
Control( WindowType nType );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 11b8625..0b00ebe 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -53,9 +53,8 @@ private:
SAL_DLLPRIVATE void ImplInitDialogData();
SAL_DLLPRIVATE void ImplInitSettings();
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE Dialog (const Dialog &);
- SAL_DLLPRIVATE Dialog & operator= (const Dialog &);
+ SAL_DLLPRIVATE Dialog (const Dialog &) SAL_DELETED_FUNCTION;
+ SAL_DLLPRIVATE Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION;
DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
@@ -126,9 +125,8 @@ public:
// - ModelessDialog -
class VCL_DLLPUBLIC ModelessDialog : public Dialog
{
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ModelessDialog (const ModelessDialog &);
- SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &);
+ ModelessDialog (const ModelessDialog &) SAL_DELETED_FUNCTION;
+ ModelessDialog & operator= (const ModelessDialog &) SAL_DELETED_FUNCTION;
public:
explicit ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
@@ -149,9 +147,8 @@ protected:
private:
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ModalDialog (const ModalDialog &);
- SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &);
+ SAL_DLLPRIVATE ModalDialog (const ModalDialog &) SAL_DELETED_FUNCTION;
+ SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_DIALOG_HXX
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index c0b7518..7fa2ad5 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -31,9 +31,8 @@ class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window
private:
ImplData* mpImplData;
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE DockingAreaWindow (const DockingAreaWindow &);
- SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &);
+ DockingAreaWindow (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
+ DockingAreaWindow & operator= (const DockingAreaWindow &) SAL_DELETED_FUNCTION;
public:
explicit DockingAreaWindow( vcl::Window* pParent );
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 1ae7479..9cc9ec9 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -271,9 +271,8 @@ private:
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE DockingWindow (const DockingWindow &);
- SAL_DLLPRIVATE DockingWindow & operator= (const DockingWindow &);
+ DockingWindow (const DockingWindow &) SAL_DELETED_FUNCTION;
+ DockingWindow & operator= (const DockingWindow &) SAL_DELETED_FUNCTION;
protected:
using Window::ImplInit;
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 5ad30a7..d017b21 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -95,9 +95,8 @@ private:
SAL_DLLPRIVATE void ImplCallPopupModeEnd();
DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE FloatingWindow (const FloatingWindow &);
- SAL_DLLPRIVATE FloatingWindow & operator= (const FloatingWindow &);
+ FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION;
+ FloatingWindow & operator= (const FloatingWindow &) SAL_DELETED_FUNCTION;
protected:
using Window::ImplInit;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8ae868f..9ae0af8 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -162,8 +162,8 @@ class VCL_DLLPUBLIC GraphicDescriptor
bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo );
bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo );
bool ImpDetectMOV( SvStream& rStm, bool bExtendedInfo );
- GraphicDescriptor( const GraphicDescriptor& );
- GraphicDescriptor& operator=( const GraphicDescriptor& );
+ GraphicDescriptor( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
+ GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION;
public:
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 83087ab..41e03c6 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -47,9 +47,8 @@ private:
SAL_DLLPRIVATE void ImplInitMenuButtonData();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE MenuButton( const MenuButton & );
- SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & );
+ MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION;
+ MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION;
protected:
using Window::ImplInit;
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index e9872a9..e204969 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -212,8 +212,8 @@ private:
sal_uInt32 mnRefCount;
// prevent assignment and copy construction
- FontCharMap( const FontCharMap& );
- void operator=( const FontCharMap& );
+ FontCharMap( const FontCharMap& ) SAL_DELETED_FUNCTION;
+ void operator=( const FontCharMap& ) SAL_DELETED_FUNCTION;
};
inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index f773391..4dbd6da5 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -39,9 +39,8 @@ private:
MapUnit meUnit;
bool mbState;
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE MoreButton( const MoreButton & );
- SAL_DLLPRIVATE MoreButton& operator=( const MoreButton & );
+ MoreButton( const MoreButton & ) SAL_DELETED_FUNCTION;
+ MoreButton& operator=( const MoreButton & ) SAL_DELETED_FUNCTION;
SAL_DLLPRIVATE void ShowState();
protected:
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 45226f0..b0dd3f0 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -244,8 +244,8 @@ private:
private:
SAL_DLLPRIVATE bool EndJob();
- SAL_DLLPRIVATE Printer( const Printer& rPrinter );
- SAL_DLLPRIVATE Printer& operator =( const Printer& rPrinter );
+ Printer( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
+ Printer& operator =( const Printer& rPrinter ) SAL_DELETED_FUNCTION;
public:
SAL_DLLPRIVATE void ImplStartPage();
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 138a788..3c33172 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -80,9 +80,8 @@ namespace vcl
bool bEnabled;
private:
- QuickSelectionEngine(); // never implemented
- QuickSelectionEngine( const QuickSelectionEngine& ); // never implemented
- QuickSelectionEngine& operator=( const QuickSelectionEngine& ); // never implemented
+ QuickSelectionEngine( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
+ QuickSelectionEngine& operator=( const QuickSelectionEngine& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index c24556e..fbc8332 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -53,9 +53,8 @@ private:
SAL_DLLPRIVATE void ImplRestoreSplitter();
SAL_DLLPRIVATE void ImplInitHorVer(bool bNew);
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE Splitter (const Splitter &);
- SAL_DLLPRIVATE Splitter& operator= (const Splitter &);
+ Splitter (const Splitter &) SAL_DELETED_FUNCTION;
+ Splitter& operator= (const Splitter &) SAL_DELETED_FUNCTION;
protected:
using Window::ImplInit;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 83f6406..715b083 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -66,8 +66,6 @@ private:
mbCalc:1,
mbRecalc:1,
mbInvalidate:1,
- mbSizeable:1,
- mbBorder:1,
mbAutoHide:1,
mbFadeIn:1,
mbFadeOut:1,
@@ -121,9 +119,8 @@ private:
long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos );
static SAL_DLLPRIVATE void ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE SplitWindow (const SplitWindow &);
- SAL_DLLPRIVATE SplitWindow & operator= (const SplitWindow &);
+ SplitWindow (const SplitWindow &) SAL_DELETED_FUNCTION;
+ SplitWindow & operator= (const SplitWindow &) SAL_DELETED_FUNCTION;
public:
SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 );
virtual ~SplitWindow();
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index cedca2a..9fc2d91 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1513,8 +1513,8 @@ private:
class VCL_DLLPUBLIC SolarMutexGuard
{
private:
- SolarMutexGuard( const SolarMutexGuard& );
- const SolarMutexGuard& operator = ( const SolarMutexGuard& );
+ SolarMutexGuard( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
+ const SolarMutexGuard& operator = ( const SolarMutexGuard& ) SAL_DELETED_FUNCTION;
comphelper::SolarMutex& m_solarMutex;
public:
@@ -1536,8 +1536,8 @@ class VCL_DLLPUBLIC SolarMutexGuard
class VCL_DLLPUBLIC SolarMutexClearableGuard SAL_FINAL
{
- SolarMutexClearableGuard( const SolarMutexClearableGuard& );
- const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& );
+ SolarMutexClearableGuard( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
+ const SolarMutexClearableGuard& operator = ( const SolarMutexClearableGuard& ) SAL_DELETED_FUNCTION;
bool m_bCleared;
public:
/** Acquires mutex
@@ -1573,8 +1573,8 @@ protected:
class VCL_DLLPUBLIC SolarMutexResettableGuard SAL_FINAL
{
- SolarMutexResettableGuard( const SolarMutexResettableGuard& );
- const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& );
+ SolarMutexResettableGuard( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
+ const SolarMutexResettableGuard& operator = ( const SolarMutexResettableGuard& ) SAL_DELETED_FUNCTION;
bool m_bCleared;
public:
/** Acquires mutex
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 9a8c57d..87e16fc 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -34,8 +34,8 @@ private:
SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv );
// Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE SystemChildWindow (const SystemChildWindow &);
- SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &);
+ SystemChildWindow (const SystemChildWindow &) SAL_DELETED_FUNCTION;
+ SystemChildWindow & operator= (const SystemChildWindow &) SAL_DELETED_FUNCTION;
public:
explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index d4baf3e..672b229 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -240,9 +240,8 @@ private:
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* );
DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, void* );
- // Copy assignment is forbidden and not implemented.
- SAL_DLLPRIVATE ToolBox (const ToolBox &);
- SAL_DLLPRIVATE ToolBox& operator= (const ToolBox &);
+ ToolBox (const ToolBox &) SAL_DELETED_FUNCTION;
+ ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION;
public:
SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL );
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 5776f5f..06dbae6 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -50,9 +50,8 @@ private:
const basebmp::RawMemorySharedArray &pBuffer,
const bool bTopDown );
- // Copy assignment is forbidden and not implemented.
- VirtualDevice (const VirtualDevice &);
- VirtualDevice & operator= (const VirtualDevice &);
+ VirtualDevice (const VirtualDevice &) SAL_DELETED_FUNCTION;
+ VirtualDevice & operator= (const VirtualDevice &) SAL_DELETED_FUNCTION;
/** Used for alpha VDev, to set areas to opaque
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 5b3a266..637bfc8 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -53,8 +53,8 @@ private:
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken );
private:
- SAL_DLLPRIVATE WorkWindow( const WorkWindow& rWin );
- SAL_DLLPRIVATE WorkWindow& operator =( const WorkWindow& rWin );
+ WorkWindow( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
+ WorkWindow& operator =( const WorkWindow& rWin ) SAL_DELETED_FUNCTION;
protected:
explicit WorkWindow( WindowType nType );
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 119f24c..e859e35 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -111,9 +111,8 @@ private:
WinBits nStyle, sal_uInt16 nTypeStyle,
const ::com::sun::star::uno::Any& );
- // Copy assignment is forbidden and not implemented.
- ImplBorderWindow (const ImplBorderWindow &);
- ImplBorderWindow& operator= (const ImplBorderWindow &);
+ ImplBorderWindow (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
+ ImplBorderWindow& operator= (const ImplBorderWindow &) SAL_DELETED_FUNCTION;
public:
ImplBorderWindow( vcl::Window* pParent,
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
index 5f2b699..437839d 100644
--- a/vcl/inc/cvtsvm.hxx
+++ b/vcl/inc/cvtsvm.hxx
@@ -89,9 +89,8 @@ public:
~SVMConverter() {}
private:
- // Not implemented
- SVMConverter( const SVMConverter& );
- SVMConverter& operator=( const SVMConverter& );
+ SVMConverter( const SVMConverter& ) SAL_DELETED_FUNCTION;
+ SVMConverter& operator=( const SVMConverter& ) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_INC_CVTSVM_HXX
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 382e70c..c8d3552 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -303,9 +303,8 @@ private:
ServerFont& mrServerFont;
com::sun::star::uno::Reference<com::sun::star::i18n::XBreakIterator> mxBreak;
- // enforce proper copy semantic
- SAL_DLLPRIVATE ServerFontLayout( const ServerFontLayout& );
- SAL_DLLPRIVATE ServerFontLayout& operator=( const ServerFontLayout& );
+ ServerFontLayout( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
+ ServerFontLayout& operator=( const ServerFontLayout& ) SAL_DELETED_FUNCTION;
};
diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 2b8b81b..e957b50 100644
--- a/vcl/inc/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
@@ -57,7 +57,7 @@ namespace grutils
size_t numFeatures() const { return mnNumSettings; }
gr_feature_val * values() const { return mpSettings; };
private:
- GrFeatureParser(const GrFeatureParser & copy);
+ GrFeatureParser(const GrFeatureParser & copy) SAL_DELETED_FUNCTION;
void setLang(const gr_face * face, const OString & lang);
bool isCharId(const OString & id, size_t offset, size_t length);
gr_uint32 getCharId(const OString & id, size_t offset, size_t length);
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index b9767ce..ced9deb 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -49,9 +49,9 @@ private:
void ImplUpdateDisplayBmp( OutputDevice* pOutDev );
void ImplUpdateDisabledBmpEx( int nPos );
-private: // prevent assignment and copy construction
- ImplImageBmp( const ImplImageBmp& );
- void operator=( const ImplImageBmp& );
+private:
+ ImplImageBmp( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
+ void operator=( const ImplImageBmp& ) SAL_DELETED_FUNCTION;
};
// - ImageTypes -
@@ -137,9 +137,9 @@ struct ImplImage
ImplImage();
~ImplImage();
-private: // prevent assignment and copy construction
- ImplImage( const ImplImage&);
- void operator=( const ImplImage&);
+private:
+ ImplImage( const ImplImage&) SAL_DELETED_FUNCTION;
+ void operator=( const ImplImage&) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_INC_IMAGE_H
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 8efb30b..3a02b1d 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -168,9 +168,8 @@ private:
friend void intrusive_ptr_add_ref(ImplFontCharMap* pImplFontCharMap);
friend void intrusive_ptr_release(ImplFontCharMap* pImplFontCharMap);
- // prevent assignment and copy construction
- explicit ImplFontCharMap( const ImplFontCharMap& );
- void operator=( const ImplFontCharMap& );
+ ImplFontCharMap( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
+ void operator=( const ImplFontCharMap& ) SAL_DELETED_FUNCTION;
static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false);
bool isDefaultMap() const;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 69de06a..4533be7 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -297,8 +297,8 @@ public:
sal_Int32 Count() const { return mnLines; }
private:
- ImplMultiTextLineInfo( const ImplMultiTextLineInfo& );
- ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& );
+ ImplMultiTextLineInfo( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
+ ImplMultiTextLineInfo& operator=( const ImplMultiTextLineInfo& ) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_INC_OUTFONT_HXX
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 545181a..698263a 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -208,9 +208,8 @@ protected:
static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical );
private:
- // enforce proper copy semantic
- SAL_DLLPRIVATE SalLayout( const SalLayout& );
- SAL_DLLPRIVATE SalLayout& operator=( const SalLayout& );
+ SalLayout( const SalLayout& ) SAL_DELETED_FUNCTION;
+ SalLayout& operator=( const SalLayout& ) SAL_DELETED_FUNCTION;
protected:
int mnMinCharPos;
@@ -257,9 +256,8 @@ private:
virtual void DropGlyph( int ) SAL_OVERRIDE {}
virtual void Simplify( bool ) SAL_OVERRIDE {}
- // enforce proper copy semantic
- SAL_DLLPRIVATE MultiSalLayout( const MultiSalLayout& );
- SAL_DLLPRIVATE MultiSalLayout& operator=( const MultiSalLayout& );
+ MultiSalLayout( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
+ MultiSalLayout& operator=( const MultiSalLayout& ) SAL_DELETED_FUNCTION;
private:
SalLayout* mpLayouts[ MAX_FALLBACK ];
@@ -363,9 +361,8 @@ protected:
private:
mutable Point maBasePoint;
- // enforce proper copy semantic
- SAL_DLLPRIVATE GenericSalLayout( const GenericSalLayout& );
- SAL_DLLPRIVATE GenericSalLayout& operator=( const GenericSalLayout& );
+ GenericSalLayout( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
+ GenericSalLayout& operator=( const GenericSalLayout& ) SAL_DELETED_FUNCTION;
};
#undef SalGraphics
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 3ba4d60..3510df2 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -97,9 +97,8 @@ namespace vcl
MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL );
private:
- ControlTextRenderer(); // never implemented
- ControlTextRenderer( const ControlTextRenderer& ); // never implemented
- ControlTextRenderer& operator=( const ControlTextRenderer& ); // never implemented
+ ControlTextRenderer( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
+ ControlTextRenderer& operator=( const ControlTextRenderer& ) SAL_DELETED_FUNCTION;
private:
::std::unique_ptr< ReferenceDeviceTextLayout > m_pImpl;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 1b12143..bac2d01 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -167,9 +167,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
// FilePicker Event functions
private:
- // prevent copy and assignment
- SalGtkFilePicker( const SalGtkFilePicker& );
- SalGtkFilePicker& operator=( const SalGtkFilePicker& );
+ SalGtkFilePicker( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
+ SalGtkFilePicker& operator=( const SalGtkFilePicker& ) SAL_DELETED_FUNCTION;
bool FilterNameExists( const OUString& rTitle );
bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
@@ -205,7 +204,6 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
GtkWidget *m_pToggles[ TOGGLE_LAST ];
bool mbToggleVisibility[TOGGLE_LAST];
- bool mbToggleChecked[TOGGLE_LAST];
enum {
PLAY,
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index f309ddd..0744bcd 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -65,9 +65,8 @@ class SalGtkFolderPicker :
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- // prevent copy and assignment
- SalGtkFolderPicker( const SalGtkFolderPicker& );
- SalGtkFolderPicker& operator=( const SalGtkFolderPicker& );
+ SalGtkFolderPicker( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
+ SalGtkFolderPicker& operator=( const SalGtkFolderPicker& ) SAL_DELETED_FUNCTION;
};
#endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index e1b54c3..d32db2d 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -147,9 +147,8 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- // prevent copy and assignment
- UnxFilePicker( const UnxFilePicker& );
- UnxFilePicker& operator=( const UnxFilePicker& );
+ UnxFilePicker( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
+ UnxFilePicker& operator=( const UnxFilePicker& ) SAL_DELETED_FUNCTION;
protected:
void initFilePicker();
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 7ac1d2e..5292a3e 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -219,9 +219,8 @@ Q_SIGNALS:
void checkProtocolSignal();
private:
- // prevent copy and assignment
- KDE4FilePicker( const KDE4FilePicker& );
- KDE4FilePicker& operator=( const KDE4FilePicker& );
+ KDE4FilePicker( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
+ KDE4FilePicker& operator=( const KDE4FilePicker& ) SAL_DELETED_FUNCTION;
//add a custom control widget to the file dialog
void addCustomControl(sal_Int16 controlId);
commit 2cebd4d0860c7bf3d601023b942fdbe1a522d33a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:33:55 2015 +0100
loplugin:deletedspecial
Change-Id: Id3f938a5794e29b14c6adca0065465f3412c5fe2
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index efd9304..baac836 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -118,25 +118,20 @@ public:
};
-class ScVbaControlFactory
+namespace ScVbaControlFactory
{
-public:
- static css::uno::Reference< ov::msforms::XControl > createShapeControl(
+ css::uno::Reference< ov::msforms::XControl > createShapeControl(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::drawing::XControlShape >& xControlShape,
const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
- static css::uno::Reference< ov::msforms::XControl > createUserformControl(
+ css::uno::Reference< ov::msforms::XControl > createUserformControl(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::awt::XControl >& xControl,
const css::uno::Reference< css::awt::XControl >& xDialog,
const css::uno::Reference< css::frame::XModel >& xModel,
double fOffsetX, double fOffsetY ) throw (css::uno::RuntimeException);
-
-private:
- ScVbaControlFactory();
- ~ScVbaControlFactory();
-};
+}
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROL_HXX
commit 9888b279e56c440c3a2030ff5f1b0d7ab8b6ca1b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:33:44 2015 +0100
loplugin:deletedspecial
Change-Id: I6c1061403dab476d19c374c2797fabc00d492645
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 5b0c262..437d0f2 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -87,8 +87,8 @@ private:
::com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xWindowParam;
const OUString m_aContextParam;
StringHashMap m_aTypedCustomHandlers;
- UUIInteractionHelper(UUIInteractionHelper &); // not implemented
- void operator =(const UUIInteractionHelper&); // not implemented
+ UUIInteractionHelper(UUIInteractionHelper &) SAL_DELETED_FUNCTION;
+ void operator =(const UUIInteractionHelper&) SAL_DELETED_FUNCTION;
public:
UUIInteractionHelper(
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index f705370..f7062ab 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -49,8 +49,8 @@ public:
private:
UUIInteractionHelper * m_pImpl;
- UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &); // not implemented
- void operator =(UUIInteractionRequestStringResolver); // not implemented
+ UUIInteractionRequestStringResolver(UUIInteractionRequestStringResolver &) SAL_DELETED_FUNCTION;
+ void operator =(UUIInteractionRequestStringResolver) SAL_DELETED_FUNCTION;
UUIInteractionRequestStringResolver(
com::sun::star::uno::Reference<
commit 5516df0aee8139bdc3ccba6f3f16c084d8ad85ee
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:33:27 2015 +0100
loplugin:deletedspecial
Change-Id: I53a088b74b95230aa3842bcac0bb1fd09e39cc12
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index d476f81..2baa8df 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -43,21 +43,17 @@ namespace utl
/** a class which allows non-UNO components to observe the desktop (aka application)
for it's shutdown
*/
- class UNOTOOLS_DLLPUBLIC DesktopTerminationObserver
+ namespace DesktopTerminationObserver
{
- public:
/** registers a listener which should be notified when the desktop terminates
(which means the application is shutting down)
*/
- static void registerTerminationListener( ITerminationListener* _pListener );
+ UNOTOOLS_DLLPUBLIC void registerTerminationListener( ITerminationListener* _pListener );
/** revokes a termination listener
*/
- static void revokeTerminationListener( ITerminationListener* _pListener );
-
- private:
- DesktopTerminationObserver(); // never implemented, only static methods
- };
+ UNOTOOLS_DLLPUBLIC void revokeTerminationListener( ITerminationListener* _pListener );
+ }
} // namespace utl
diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx
index d5a5bc1..c2ad320 100644
--- a/include/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
@@ -115,10 +115,8 @@ class DigitGroupingIterator
setDigits();
}
- // not implemented, prevent usage
- DigitGroupingIterator();
- DigitGroupingIterator( const DigitGroupingIterator & );
- DigitGroupingIterator & operator=( const DigitGroupingIterator & );
+ DigitGroupingIterator( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
+ DigitGroupingIterator & operator=( const DigitGroupingIterator & ) SAL_DELETED_FUNCTION;
public:
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 2715f01..7783824 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -36,8 +36,8 @@ namespace utl
friend class OEventListenerImpl;
private:
- UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource ); // never implemented
- UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ); // never implemented
+ OEventListenerAdapter( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
+ const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ) SAL_DELETED_FUNCTION;
protected:
OEventListenerAdapterImpl* m_pImpl;
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 82c56f4..cceae1b 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -154,9 +154,8 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const;
- // disallow copy-constructor and assignment-operator for now
- SvtLinguConfig( const SvtLinguConfig & );
- SvtLinguConfig & operator = ( const SvtLinguConfig & );
+ SvtLinguConfig( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
+ SvtLinguConfig & operator = ( const SvtLinguConfig & ) SAL_DELETED_FUNCTION;
public:
SvtLinguConfig();
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index bdd0e10..7c65a82 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -31,9 +31,8 @@ namespace com { namespace sun { namespace star {
class UNOTOOLS_DLLPUBLIC NativeNumberWrapper
{
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier > xNNS;
- // not implemented, prevent usage
- NativeNumberWrapper( const NativeNumberWrapper& );
- NativeNumberWrapper& operator=( const NativeNumberWrapper& );
+ NativeNumberWrapper( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
+ NativeNumberWrapper& operator=( const NativeNumberWrapper& ) SAL_DELETED_FUNCTION;
public:
NativeNumberWrapper(
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 9d5a311..066e388 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -34,9 +34,8 @@ class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC;
::com::sun::star::lang::Locale aLocale;
- // not implemented, prevent usage
- NumberFormatCodeWrapper( const NumberFormatCodeWrapper& );
- NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& );
+ NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
+ NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ) SAL_DELETED_FUNCTION;
public:
NumberFormatCodeWrapper(
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index a176aaf..6c3390c 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -81,8 +81,8 @@ public:
virtual ~Options() = 0;
private:
- UNOTOOLS_DLLPRIVATE Options(Options &); // not defined
- UNOTOOLS_DLLPRIVATE void operator =(Options &); // not defined
+ Options(Options &) SAL_DELETED_FUNCTION;
+ void operator =(Options &) SAL_DELETED_FUNCTION;
protected:
virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 nHint=0 ) SAL_OVERRIDE;
diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index d9b3cf3..83bbed4 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -28,11 +28,8 @@ class UNOTOOLS_DLLPUBLIC SvtSearchOptions
{
SvtSearchOptions_Impl *pImpl;
- // disallow copy-constructor and assignment-operator for now
- SvtSearchOptions( const SvtSearchOptions & );
- SvtSearchOptions & operator = ( const SvtSearchOptions & );
-
-protected:
+ SvtSearchOptions( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
+ SvtSearchOptions & operator = ( const SvtSearchOptions & ) SAL_DELETED_FUNCTION;
public:
SvtSearchOptions();
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 5130fa7..ff932b6 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -64,9 +64,8 @@ namespace utl
~DisposableComponent();
private:
- DisposableComponent(); // never implemented
- DisposableComponent( const DisposableComponent& ); // never implemented
- DisposableComponent& operator=( const DisposableComponent& ); // never implemented
+ DisposableComponent( const DisposableComponent& ) SAL_DELETED_FUNCTION;
+ DisposableComponent& operator=( const DisposableComponent& ) SAL_DELETED_FUNCTION;
};
//= CloseableComponent
@@ -105,9 +104,8 @@ namespace utl
~CloseableComponent();
private:
- CloseableComponent(); // never implemented
- CloseableComponent( const CloseableComponent& ); // never implemented
- CloseableComponent& operator=( const CloseableComponent& ); // never implemented
+ CloseableComponent( const CloseableComponent& ) SAL_DELETED_FUNCTION;
+ CloseableComponent& operator=( const CloseableComponent& ) SAL_DELETED_FUNCTION;
};
//= SharedUNOComponent
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 0af9aa5..51d901a 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -50,11 +50,8 @@ class UNOTOOLS_DLLPUBLIC TempFile
bool bIsDirectory;
bool bKillingFileEnabled;
- // prevent copy c'tor
- TempFile( const TempFile& );
- TempFile& operator=(const TempFile&);
-
-protected:
+ TempFile( const TempFile& ) SAL_DELETED_FUNCTION;
+ TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
public:
/**
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 715ea5f..7d0dce0 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -42,9 +42,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
sal_uInt32 nType;
mutable bool bFirstCall;
- // not implemented, prevent usage
- TransliterationWrapper( const TransliterationWrapper& );
- TransliterationWrapper& operator=( const TransliterationWrapper& );
+ TransliterationWrapper( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
+ TransliterationWrapper& operator=( const TransliterationWrapper& ) SAL_DELETED_FUNCTION;
void loadModuleImpl() const;
void setLanguageLocaleImpl( sal_uInt16 nLang );
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 3a76a2b..a2ed5e5 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -135,7 +135,7 @@ public:
static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static();
private:
- OTempFileService( OTempFileService & );
+ OTempFileService( OTempFileService & ) SAL_DELETED_FUNCTION;
virtual ~OTempFileService ();
};
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 271b80c..1fcf878 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1515,7 +1515,7 @@ UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStrea
if( !xInputStream.is() )
return NULL;
- UcbLockBytesRef xLockBytes = new UcbLockBytes();
+ UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
xLockBytes->setDontClose_Impl();
xLockBytes->setInputStream_Impl( xInputStream );
xLockBytes->terminate_Impl();
@@ -1527,7 +1527,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre
if( !xStream.is() )
return NULL;
- UcbLockBytesRef xLockBytes = new UcbLockBytes();
+ UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr);
xLockBytes->setDontClose_Impl();
xLockBytes->setStream_Impl( xStream );
xLockBytes->terminate_Impl();
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 3c8e319..e19c919 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -105,7 +105,7 @@ class UcbLockBytes : public virtual SvLockBytes
DECL_LINK( DataAvailHdl, void * );
- UcbLockBytes( UcbLockBytesHandler* pHandler=NULL );
+ UcbLockBytes( UcbLockBytesHandler* pHandler );
protected:
virtual ~UcbLockBytes (void);
commit f3dbc6f9011144df3af7f42f0df1895d75140baf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:33:07 2015 +0100
loplugin:deletedspecial
Change-Id: I1d5d4fbd996792a3b0d97bb82d5320cbdcaa543e
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 3501422..7c5f4f9 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -39,8 +39,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment :
CommandEnvironment_Impl* m_pImpl;
private:
- UCBHELPER_DLLPRIVATE CommandEnvironment( const CommandEnvironment& ); // n.i.
- UCBHELPER_DLLPRIVATE CommandEnvironment& operator=( const CommandEnvironment& ); // n.i.
+ CommandEnvironment( const CommandEnvironment& ) SAL_DELETED_FUNCTION;
+ CommandEnvironment& operator=( const CommandEnvironment& ) SAL_DELETED_FUNCTION;
public:
/**
commit 8c349ca491b155717f0c918fd18df7d1ea7fb0d1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:32:54 2015 +0100
loplugin:deletedspecial
Change-Id: I2f0cbeebce5d3bb087128bae32816a89f1f1d222
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 6591ca9..6d7b8cc 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -33,9 +33,9 @@ class ReconnectingFile
bool m_bDisconnect;
- ReconnectingFile( ReconnectingFile& );
+ ReconnectingFile( ReconnectingFile& ) SAL_DELETED_FUNCTION;
- ReconnectingFile& operator=( ReconnectingFile& );
+ ReconnectingFile& operator=( ReconnectingFile& ) SAL_DELETED_FUNCTION;
public:
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index 701c973..f955ca9 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -47,13 +47,8 @@ namespace ftp {
private:
-
- /** Don't enable assignment and copy construction.
- * Not defined:
- */
-
- FTPLoaderThread(const FTPLoaderThread&);
- FTPLoaderThread& operator=(const FTPLoaderThread&);
+ FTPLoaderThread(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
+ FTPLoaderThread& operator=(const FTPLoaderThread&) SAL_DELETED_FUNCTION;
oslThreadKey m_threadKey;
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 79e4e2b..18084a7 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -45,10 +45,6 @@
using namespace com::sun::star;
using namespace tdoc_ucp;
-using ::comphelper::DocumentInfo;
-
-
-
// OfficeDocumentsCloseListener Implementation.
@@ -227,7 +223,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
OSL_ENSURE( xStorage.is(), "Got no document storage!" );
rtl:: OUString aDocId = getDocumentId( Event.Source );
- rtl:: OUString aTitle = DocumentInfo::getDocumentTitle(
+ rtl:: OUString aTitle = comphelper::DocumentInfo::getDocumentTitle(
uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
m_aDocs[ aDocId ] = StorageInfo( aTitle, xStorage, xModel );
@@ -366,7 +362,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
(*it).second.xStorage = xStorage;
// Adjust title.
- (*it).second.aTitle = DocumentInfo::getDocumentTitle( xModel );
+ (*it).second.aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
break;
}
++it;
@@ -392,7 +388,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
if ( (*it).second.xModel == xModel )
{
// Adjust title.
- rtl:: OUString aTitle = DocumentInfo::getDocumentTitle( xModel );
+ rtl:: OUString aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
(*it).second.aTitle = aTitle;
// Adjust storage.
@@ -484,7 +480,7 @@ void OfficeDocumentsManager::buildDocumentsList()
{
// new document
OUString aDocId = getDocumentId( xModel );
- OUString aTitle = DocumentInfo::getDocumentTitle( xModel );
+ OUString aTitle = comphelper::DocumentInfo::getDocumentTitle( xModel );
uno::Reference< document::XStorageBasedDocument >
xDoc( xModel, uno::UNO_QUERY );
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index a805c61..3f844b6 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -161,7 +161,7 @@ private:
static com::sun::star::uno::Any m_aEmptyAny;
- ContentProperties & operator=( const ContentProperties & ); // n.i.
+ ContentProperties & operator=( const ContentProperties & ) SAL_DELETED_FUNCTION;
const PropertyValue * get( const OUString & rName ) const;
};
@@ -171,8 +171,8 @@ class CachableContentProperties
private:
ContentProperties m_aProps;
- CachableContentProperties & operator=( const CachableContentProperties & ); // n.i.
- CachableContentProperties( const CachableContentProperties & ); // n.i.
+ CachableContentProperties & operator=( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
+ CachableContentProperties( const CachableContentProperties & ) SAL_DELETED_FUNCTION;
public:
CachableContentProperties( const ContentProperties & rProps );
commit 510f52506619652f8842075673f1722eb4c3b3a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:32:30 2015 +0100
loplugin:deletedspecial
Change-Id: I4e264af4bb8d5fcd53666922fc4ef24a863ac8f3
diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index ddffd49..d4b5030 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -68,8 +68,8 @@ public:
bool IsPersistenceEnabled() const { return mbPersistence; }
private:
- TOOLS_DLLPRIVATE Config( const Config& rConfig );
- TOOLS_DLLPRIVATE Config& operator = ( const Config& rConfig );
+ Config( const Config& rConfig ) SAL_DELETED_FUNCTION;
+ Config& operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index e2dfc72..6801293 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -38,9 +38,8 @@ enum INetStreamStatus
class TOOLS_DLLPUBLIC INetIStream
{
- // Not implemented.
- INetIStream (const INetIStream& rStrm);
- INetIStream& operator= (const INetIStream& rStrm);
+ INetIStream (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
+ INetIStream& operator= (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
protected:
virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) = 0;
@@ -54,9 +53,8 @@ public:
class INetOStream
{
- // Not implemented.
- INetOStream (const INetOStream& rStrm);
- INetOStream& operator= (const INetOStream& rStrm);
+ INetOStream (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
+ INetOStream& operator= (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
protected:
virtual int PutData (
@@ -98,9 +96,8 @@ class INetMessageIStream : public INetIStream
virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
- // Not implemented.
- INetMessageIStream (const INetMessageIStream& rStrm);
- INetMessageIStream& operator= (const INetMessageIStream& rStrm);
+ INetMessageIStream (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
+ INetMessageIStream& operator= (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
protected:
virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize);
@@ -128,9 +125,8 @@ class INetMessageOStream : public INetOStream
virtual int PutData (const sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
- // Not implemented.
- INetMessageOStream (const INetMessageOStream& rStrm);
- INetMessageOStream& operator= (const INetMessageOStream& rStrm);
+ INetMessageOStream (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
+ INetMessageOStream& operator= (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
protected:
virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize);
@@ -150,9 +146,8 @@ class INetMessageIOStream
: public INetMessageIStream,
public INetMessageOStream
{
- // Not implemented.
- INetMessageIOStream (const INetMessageIOStream& rStrm);
- INetMessageIOStream& operator= (const INetMessageIOStream& rStrm);
+ INetMessageIOStream (const INetMessageIOStream& rStrm) SAL_DELETED_FUNCTION;
+ INetMessageIOStream& operator= (const INetMessageIOStream& rStrm) SAL_DELETED_FUNCTION;
public:
INetMessageIOStream (sal_uIntPtr nBufferSize = 2048);
@@ -184,9 +179,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream : public INetMessageIOStream
static INetMessageEncoding GetMsgEncoding (
const OUString& rContentType);
- // Not implemented.
- INetMIMEMessageStream (const INetMIMEMessageStream& rStrm);
- INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm);
+ INetMIMEMessageStream (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
+ INetMIMEMessageStream& operator= (const INetMIMEMessageStream& rStrm) SAL_DELETED_FUNCTION;
protected:
virtual int GetMsgLine (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 90b6ba9..e03ec16 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -31,8 +31,8 @@ class TOOLS_DLLPUBLIC ResStringArray
struct Impl;
Impl* mpImpl;
- ResStringArray( const ResStringArray& ); // disabled
- ResStringArray& operator=( const ResStringArray& ); // disabled
+ ResStringArray( const ResStringArray& ) SAL_DELETED_FUNCTION;
+ ResStringArray& operator=( const ResStringArray& ) SAL_DELETED_FUNCTION;
public:
ResStringArray( const ResId& rResId );
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index cb5d3a3..70393f0 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -122,9 +122,8 @@ private:
static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); }
- // no copying
- ResMgr(const ResMgr&);
- ResMgr& operator=(const ResMgr&);
+ ResMgr(const ResMgr&) SAL_DELETED_FUNCTION;
+ ResMgr& operator=(const ResMgr&) SAL_DELETED_FUNCTION;
public:
static void DestroyAllResMgr(); ///< Called upon app shutdown
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 72679f2..4e022cad 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -240,8 +240,8 @@ private:
// helper methods
TOOLS_DLLPRIVATE void ImpInit();
- SvStream ( const SvStream& rStream ); // not implemented
- SvStream& operator=( const SvStream& rStream ); // not implemented
+ SvStream ( const SvStream& rStream ) SAL_DELETED_FUNCTION;
+ SvStream& operator=( const SvStream& rStream ) SAL_DELETED_FUNCTION;
protected:
sal_uInt64 m_nBufFilePos; ///< File position of pBuf[0]
@@ -638,9 +638,8 @@ private:
sal_uInt16 nLockCounter;
bool bIsOpen;
- // Forbidden and not implemented.
- SvFileStream (const SvFileStream&);
- SvFileStream & operator= (const SvFileStream&);
+ SvFileStream (const SvFileStream&) SAL_DELETED_FUNCTION;
+ SvFileStream & operator= (const SvFileStream&) SAL_DELETED_FUNCTION;
bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
@@ -674,9 +673,8 @@ public:
class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
{
- // Forbidden and not implemented.
- SvMemoryStream (const SvMemoryStream&);
- SvMemoryStream & operator= (const SvMemoryStream&);
+ SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION;
+ SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION;
sal_Size GetBufSize() const { return nSize; }
commit 1daa046c998dcec41d4907b260a6b3abfcfa62a8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:32:17 2015 +0100
loplugin:deletedspecial
Change-Id: I2e21490b975472952b7ffef3e6b865343f8aac7e
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index ea6c862..1c999a9 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
@@ -80,8 +80,8 @@ namespace toolkit
void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) SAL_OVERRIDE;
private:
- VCLXSpinButton( const VCLXSpinButton& ); // never implemented
- VCLXSpinButton& operator=( const VCLXSpinButton& ); // never implemented
+ VCLXSpinButton( const VCLXSpinButton& ) SAL_DELETED_FUNCTION;
+ VCLXSpinButton& operator=( const VCLXSpinButton& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 5952cd6..079f706 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -244,7 +244,7 @@ protected:
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE;
private:
- GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented
+ GraphicControlModel& operator=( const GraphicControlModel& ) SAL_DELETED_FUNCTION;
};
commit 16f52ab232fbd11298d6c0d9cfed0dabc4a77dd1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:32:02 2015 +0100
loplugin:deletedspecial
Change-Id: I9cdb0d7cb2bb9207923f2beedef0bbe44451fb6f
diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx
index 226733d..cd4feef 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -48,8 +48,8 @@ public:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- CurrentContextChecker(CurrentContextChecker &); // not defined
- void operator =(CurrentContextChecker &); // not defined
+ CurrentContextChecker(CurrentContextChecker &) SAL_DELETED_FUNCTION;
+ void operator =(CurrentContextChecker &) SAL_DELETED_FUNCTION;
bool performCheck(
::com::sun::star::uno::Reference<
commit ec3aae40ec0b0b39dc255041919fda77a343f831
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Feb 7 12:31:51 2015 +0100
loplugin:deletedspecial
Change-Id: Ia2b137e0167966a3d0b60f3c642a106834da8f1c
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index fbd6402..ac9d4b0 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -64,10 +64,8 @@ private:
// and that re-creation of fly frames is necessary.
bool mbAnchorNodeChanged;
- // no copy-constructor
- SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& );
- // no assignment-operator
- void operator=( const SwHandleAnchorNodeChg );
+ SwHandleAnchorNodeChg( const SwHandleAnchorNodeChg& ) SAL_DELETED_FUNCTION;
+ void operator=( const SwHandleAnchorNodeChg ) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 5efa72f..81e9680 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -87,8 +87,8 @@ private:
static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
- SwNodeNum( const SwNodeNum& ); // no copy constructor
- SwNodeNum& operator=( const SwNodeNum& ); // no assignment operator
+ SwNodeNum( const SwNodeNum& ) SAL_DELETED_FUNCTION;
+ SwNodeNum& operator=( const SwNodeNum& ) SAL_DELETED_FUNCTION;
virtual bool IsCountPhantoms() const SAL_OVERRIDE;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 4f51aef..d103f3e 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -180,9 +180,8 @@ class SwCalc
OUString GetColumnName( const OUString& rName );
OUString GetDBName( const OUString& rName );
- // dont call this methods
- SwCalc( const SwCalc& );
- SwCalc& operator=( const SwCalc& );
+ SwCalc( const SwCalc& ) SAL_DELETED_FUNCTION;
+ SwCalc& operator=( const SwCalc& ) SAL_DELETED_FUNCTION;
public:
SwCalc( SwDoc& rD );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 6b63023..9747c93 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -380,9 +380,8 @@ class SwDrawContact : public SwContact
void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
- /// no copy-constructor and no assignment operator
- SwDrawContact( const SwDrawContact& );
- SwDrawContact& operator=( const SwDrawContact& );
+ SwDrawContact( const SwDrawContact& ) SAL_DELETED_FUNCTION;
+ SwDrawContact& operator=( const SwDrawContact& ) SAL_DELETED_FUNCTION;
protected:
/// virtuelle Methoden von SwClient
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 99ca286..74e5db3 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -57,9 +57,8 @@ class SwLinguServiceEventListener :
com::sun::star::uno::Reference<
com::sun::star::linguistic2::XProofreadingIterator > xGCIterator;
- /// disallow use of copy-constructor and assignment operator
- SwLinguServiceEventListener(const SwLinguServiceEventListener &);
- SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &);
+ SwLinguServiceEventListener(const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
+ SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) SAL_DELETED_FUNCTION;
public:
SwLinguServiceEventListener();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1b9b317..1fe0fd9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -414,8 +414,7 @@ private:
const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ) const;
- // gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves.
- SwDoc( const SwDoc &);
+ SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
// Database fields:
void AddUsedDBToList( std::vector<OUString>& rDBNameList,
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 448f486..acf16d9 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -229,9 +229,8 @@ public:
protected:
virtual ~SwDocStyleSheetPool();
- /// For not-so-clever compilers.
private:
- SwDocStyleSheetPool( const SwDocStyleSheetPool& );
+ SwDocStyleSheetPool( const SwDocStyleSheetPool& ) SAL_DELETED_FUNCTION;
};
#endif
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 34c4409..7c2e9e3 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -943,9 +943,8 @@ public:
virtual ~SwEditShell();
private:
- /// For METWARE: no copying and no assignment.
- SwEditShell(const SwEditShell &);
- const SwEditShell &operator=(const SwEditShell &);
+ SwEditShell(const SwEditShell &) SAL_DELETED_FUNCTION;
+ const SwEditShell &operator=(const SwEditShell &) SAL_DELETED_FUNCTION;
};
inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 40c259b..d70f43a 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -46,7 +46,7 @@ protected:
private:
/// @@@ public copy ctor, but no copy assignment?
- SwFmtCharFmt & operator= (const SwFmtCharFmt &);
+ SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 17e4c76..c2d489c 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -73,8 +73,8 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- FinalThreadManager(FinalThreadManager &); // not defined
- void operator =(FinalThreadManager &); // not defined
+ FinalThreadManager(FinalThreadManager &) SAL_DELETED_FUNCTION;
+ void operator =(FinalThreadManager &) SAL_DELETED_FUNCTION;
virtual ~FinalThreadManager();
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 90650b8..6a8381d 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -37,7 +37,7 @@ public:
SwFmtAutoFmt( const SwFmtAutoFmt& rAttr );
private:
/// @@@ public copy ctor, but no copy assignment?
- SwFmtAutoFmt & operator= (const SwFmtAutoFmt &);
+ SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index cb8aac0..c81bbc7 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
{
SwNodeIndex *pStartNode;
- SwFmtCntnt &operator=( const SwFmtCntnt & ); ///< Copying not allowed.
+ SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION;
public:
SwFmtCntnt( const SwStartNode* pStartNode = 0 );
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index d04ee73..ce65a1c 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -44,10 +44,8 @@ protected:
{ SetAuto( false ); }
private:
-
- /// For now don't copy and don't assign.
- SwFmtColl(const SwFmtColl & );
- const SwFmtColl &operator=(const SwFmtColl &);
+ SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION;
+ const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION;
};
/// Represents the style of a paragraph.
@@ -56,7 +54,7 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
friend class SwDoc;
friend class ::sw::DocumentStylePoolManager;
- SwTxtFmtColl(const SwTxtFmtColl & rRef);
+ SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION;
bool mbStayAssignedToListLevelOfOutlineStyle;
@@ -194,7 +192,7 @@ public:
SwCollCondition( const SwCollCondition& rCpy );
private:
/// @@@ public copy ctor, but no copy assignment?
- SwCollCondition & operator= (const SwCollCondition &);
+ SwCollCondition & operator= (const SwCollCondition &) SAL_DELETED_FUNCTION;
public:
bool operator==( const SwCollCondition& rCmp ) const;
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index ea57e38..136038d 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -34,8 +34,7 @@ class SwFmtFlyCnt : public SfxPoolItem
friend class SwTxtFlyCnt;
SwTxtFlyCnt* pTxtAttr;
SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format.
- /// protected CopyCtor
- SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt);
+ SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
public:
SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 9cc505d..c4f5e97 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -51,7 +51,7 @@ class SW_DLLPUBLIC SwFmtFld
SwTxtFld* mpTxtFld; // the TextAttribute
// @@@ copy construction allowed, but copy assignment is not? @@@
- SwFmtFld& operator=(const SwFmtFld& rFld);
+ SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION;
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 0e2b52c..51e6a21 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -47,9 +47,8 @@ class SW_DLLPUBLIC SwFmtFtn
css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
- /// Protected CopyCtor.
- SwFmtFtn& operator=(const SwFmtFtn& rFtn);
- SwFmtFtn( const SwFmtFtn& );
+ SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION;
+ SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION;
public:
SwFmtFtn( bool bEndNote = false );
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 4825699..cfa8efd 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -40,8 +40,7 @@ class SwFmtRefMark
friend class SwTxtRefMark;
SwTxtRefMark* pTxtAttr;
- /// Protected CopyCtor.
- SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark);
+ SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION;
OUString aRefName;
css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 55a09ac..f7bbdff 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
bool bIsServerMap; ///< A ServerSideImageMap with the URL.
- SwFmtURL& operator=( const SwFmtURL& );
+ SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION;
public:
SwFmtURL();
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 84baec5..9fbbccf 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -160,8 +160,8 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
Point m_aLastFlyFrmPrtRectPos;
- SwFlyFrmFmt( const SwFlyFrmFmt &rCpy );
- SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy );
+ SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+ SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
protected:
SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
@@ -236,9 +236,8 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
mutable const SdrObject * pSdrObjCached;
mutable OUString sSdrObjCachedComment;
- /// Both not existent.
- SwDrawFrmFmt( const SwDrawFrmFmt &rCpy );
- SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy );
+ SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+ SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
SwFrmFmt::tLayoutDir meLayoutDir;
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index dfa6eaa..a0a4195 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -53,9 +53,8 @@ class SwList
bool IsListLevelMarked( const int nListLevel ) const;
private:
- // no copy constructor and no assignment operator
- SwList( const SwList& );
- SwList& operator=( const SwList& );
+ SwList( const SwList& ) SAL_DELETED_FUNCTION;
+ SwList& operator=( const SwList& ) SAL_DELETED_FUNCTION;
SwListImpl* mpListImpl;
};
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 33d52c8..584fd5c 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -41,8 +41,8 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
// graphics-attributes (only called by SwCntntNode).
virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
- SwNoTxtNode( const SwNoTxtNode& ); // Not allowed.
- SwNoTxtNode &operator=( const SwNoTxtNode& ); // Not allowed.
+ SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
+ SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
protected:
SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 6cd24fc..3091cc0 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -41,8 +41,7 @@ class SW_DLLPUBLIC SwOLEObj
svt::EmbeddedObjectRef xOLERef;
OUString aName;
- SwOLEObj( const SwOLEObj& rObj ); /// Not allowed.
- SwOLEObj();
+ SwOLEObj( const SwOLEObj& rObj ) SAL_DELETED_FUNCTION;
void SetNode( SwOLENode* pNode );
@@ -89,8 +88,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
- /// aOLEObj has a private Copy-Ctor. We need one too:
- SwOLENode( const SwOLENode & );
+ SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
using SwNoTxtNode::GetGraphic;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 2b22819..c6e1731 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -288,9 +288,8 @@ public:
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
private:
- /// Private constructor because copying is never allowed!!
- SwNode( const SwNode & rNodes );
- SwNode & operator= ( const SwNode & rNodes );
+ SwNode( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
+ SwNode & operator= ( const SwNode & rNodes ) SAL_DELETED_FUNCTION;
};
/// Starts a section of nodes in the document model.
@@ -321,9 +320,8 @@ public:
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL ) const SAL_OVERRIDE;
private:
- /// Private constructor because copying is never allowed!!
- SwStartNode( const SwStartNode & rNode );
- SwStartNode & operator= ( const SwStartNode & rNode );
+ SwStartNode( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
+ SwStartNode & operator= ( const SwStartNode & rNode ) SAL_DELETED_FUNCTION;
};
/// Ends a section of nodes in the document model.
@@ -342,9 +340,8 @@ protected:
DECL_FIXEDMEMPOOL_NEWDEL(SwEndNode)
private:
- /// Private constructor because copying is never allowed!!
- SwEndNode( const SwEndNode & rNode );
- SwEndNode & operator= ( const SwEndNode & rNode );
+ SwEndNode( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
+ SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
};
// SwCntntNode
@@ -484,9 +481,8 @@ public:
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
private:
- /// Private constructor because copying is never allowed!!
- SwCntntNode( const SwCntntNode & rNode );
- SwCntntNode & operator= ( const SwCntntNode & rNode );
+ SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
+ SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
};
// SwTableNode
@@ -523,9 +519,8 @@ public:
void RemoveRedlines();
private:
- /// Private constructor because copying is never allowed!!
- SwTableNode( const SwTableNode & rNode );
- SwTableNode & operator= ( const SwTableNode & rNode );
+ SwTableNode( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
+ SwTableNode & operator= ( const SwTableNode & rNode ) SAL_DELETED_FUNCTION;
};
class SwSectionNode
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 23096b3..ae82499 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -68,7 +68,7 @@ public:
SwFmtDrop( const SwFmtDrop & );
private:
// @@@ public copy ctor, but no copy assignment?
- SwFmtDrop & operator= (const SwFmtDrop &);
+ SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION;
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 6ff3358..b789ce6 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -35,8 +35,8 @@ class SwView;
class SW_DLLPUBLIC SwRedlineExtraData
{
- SwRedlineExtraData( const SwRedlineExtraData& );
- SwRedlineExtraData& operator=( const SwRedlineExtraData& );
+ SwRedlineExtraData( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
+ SwRedlineExtraData& operator=( const SwRedlineExtraData& ) SAL_DELETED_FUNCTION;
protected:
SwRedlineExtraData() {}
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 592eacb..751f528 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -143,7 +143,7 @@ public:
SwTable( const SwTable& rTable ); // no copy of the lines !!
private:
// @@@ public copy ctor, but no copy assignment?
- SwTable & operator= (const SwTable &);
+ SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
// no default ctor.
SwTable();
bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
@@ -383,9 +383,8 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt.
friend void DelBoxNode(SwTableSortBoxes&); // Delete StartNode* !
friend class SwXMLTableContext;
- // Not implemented (any more).
- SwTableBox( const SwTableBox & );
- SwTableBox &operator=( const SwTableBox &); // Does not exist.
+ SwTableBox( const SwTableBox & ) SAL_DELETED_FUNCTION;
+ SwTableBox &operator=( const SwTableBox &) SAL_DELETED_FUNCTION;
SwTableLines aLines;
const SwStartNode * pSttNd;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 2377f15..6a4866c 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -167,7 +167,7 @@ private:
TOXTypes eType;
// @@@ public copy ctor, but no copy assignment?
- SwTOXType & operator= (const SwTOXType &);
+ SwTOXType & operator= (const SwTOXType &) SAL_DELETED_FUNCTION;
};
// Structure of the index lines
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 30bd2ba..7b95c37 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -79,9 +79,8 @@ class SwChartLockController_Helper
Timer aUnlockTimer; // timer to unlock chart controllers
bool bIsLocked;
- // disallow use of d-tor, copy c-tor and assignment operator
- SwChartLockController_Helper( const SwChartLockController_Helper & );
- SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & );
+ SwChartLockController_Helper( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
+ SwChartLockController_Helper & operator = ( const SwChartLockController_Helper & ) SAL_DELETED_FUNCTION;
void LockUnlockAllCharts( bool bLock );
void LockAllCharts() { LockUnlockAllCharts( true ); };
@@ -142,9 +141,8 @@ class SwChartDataProvider :
const SwDoc * pDoc;
bool bDisposed;
- // disallow use of c-tor and assignment operator
- SwChartDataProvider( const SwChartDataProvider & );
- SwChartDataProvider & operator = ( const SwChartDataProvider & );
+ SwChartDataProvider( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
+ SwChartDataProvider & operator = ( const SwChartDataProvider & ) SAL_DELETED_FUNCTION;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, bool bTestOnly = false )
throw (::com::sun::star::lang::IllegalArgumentException,
@@ -223,9 +221,8 @@ class SwChartDataSource :
com::sun::star::uno::Reference<
com::sun::star::chart2::data::XLabeledDataSequence > > aLDS;
- // disallow use of c-tor and assignment operator
- SwChartDataSource( const SwChartDataSource & );
- SwChartDataSource & operator = ( const SwChartDataSource & );
+ SwChartDataSource( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
+ SwChartDataSource & operator = ( const SwChartDataSource & ) SAL_DELETED_FUNCTION;
public:
SwChartDataSource( const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > &rLDS );
@@ -278,9 +275,8 @@ class SwChartDataSequence :
bool bDisposed;
- // disallow use of c-tor and assignment operator
SwChartDataSequence( const SwChartDataSequence &rObj );
- SwChartDataSequence & operator = ( const SwChartDataSequence & );
+ SwChartDataSequence & operator = ( const SwChartDataSequence & ) SAL_DELETED_FUNCTION;
protected:
//SwClient
@@ -381,9 +377,8 @@ class SwChartLabeledDataSequence :
bool bDisposed;
- // disallow use of c-tor and assignment operator
- SwChartLabeledDataSequence( const SwChartLabeledDataSequence & );
- SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & );
+ SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
+ SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) SAL_DELETED_FUNCTION;
void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource );
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 5835244..5ca871a5 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwUnoInternalPaM
{
private:
- SwUnoInternalPaM(const SwUnoInternalPaM&);
+ SwUnoInternalPaM(const SwUnoInternalPaM&) SAL_DELETED_FUNCTION;
public:
SwUnoInternalPaM(SwDoc& rDoc);
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 02866ab..5eaed9e 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -36,8 +36,8 @@ class SwParaChangeTrackingInfo
const SwWrongList* getChangeTrackingTextMarkupList( const sal_Int32 nTextMarkupType );
private:
- SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& );
- SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& );
+ SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
+ SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
const SwTxtFrm& mrTxtFrm;
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 1d15b23..e38dba1 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -60,8 +60,8 @@ class SwTextMarkupHelper
::com::sun::star::uno::RuntimeException);
private:
- SwTextMarkupHelper( const SwTextMarkupHelper& );
- SwTextMarkupHelper& operator=( const SwTextMarkupHelper& );
+ SwTextMarkupHelper( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION;
+ SwTextMarkupHelper& operator=( const SwTextMarkupHelper& ) SAL_DELETED_FUNCTION;
const SwAccessiblePortionData& mrPortionData;
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index a947f4e..8796fd4 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -38,8 +38,8 @@ public:
virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- CancellableJob( CancellableJob& ); // not defined
- void operator =( CancellableJob& ); // not defined
+ CancellableJob( CancellableJob& ) SAL_DELETED_FUNCTION;
+ void operator =( CancellableJob& ) SAL_DELETED_FUNCTION;
::rtl::Reference< ObservableThread > mrThread;
};
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index 26870bc..a91a6b2 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -28,28 +28,28 @@
using namespace ::com::sun::star;
-uno::Reference< util::XJobManager > SwThreadJoiner::mpThreadJoiner;
-
namespace
{
class theJoinerMutex : public rtl::Static<osl::Mutex, theJoinerMutex> {};
+
+ uno::Reference< util::XJobManager > pThreadJoiner;
}
uno::Reference< util::XJobManager >& SwThreadJoiner::GetThreadJoiner()
{
osl::MutexGuard aGuard(theJoinerMutex::get());
- if ( !mpThreadJoiner.is() )
+ if ( !pThreadJoiner.is() )
{
- mpThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() );
+ pThreadJoiner = util::JobManager::create( comphelper::getProcessComponentContext() );
}
- return mpThreadJoiner;
+ return pThreadJoiner;
}
void SwThreadJoiner::ReleaseThreadJoiner()
{
- mpThreadJoiner.clear();
+ pThreadJoiner.clear();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index fa71445..a6b3298 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -22,19 +22,12 @@
#include <com/sun/star/util/XJobManager.hpp>
/** Testing */
-class SwThreadJoiner
+namespace SwThreadJoiner
{
- public:
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner();
- static ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner();
-
- static void ReleaseThreadJoiner();
-
- private:
- static ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > mpThreadJoiner;
-
- SwThreadJoiner();
-};
+ void ReleaseThreadJoiner();
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 0d02c4d..a3979706 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -134,8 +134,8 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- SwXFlatParagraph( const SwXFlatParagraph & ); // not defined
- SwXFlatParagraph & operator = ( const SwXFlatParagraph & ); // not defined
+ SwXFlatParagraph( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
+ SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) SAL_DELETED_FUNCTION;
OUString maExpandText;
};
@@ -163,8 +163,8 @@ protected:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list