diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
| commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
| tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /reportdesign | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'reportdesign')
72 files changed, 150 insertions, 150 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index e88971bb45c5..55b58bab9937 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -37,7 +37,7 @@ namespace rptui friend class OModuleClient; private: - OModule() SAL_DELETED_FUNCTION; //TODO: get rid of this class + OModule() = delete; //TODO: get rid of this class protected: static sal_Int32 s_nClients; /// number of registered clients diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index a9c61b71ece3..1e8daa88fb67 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -49,8 +49,8 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; bool m_bInChange; - OPropertyMediator(OPropertyMediator&) SAL_DELETED_FUNCTION; - void operator =(OPropertyMediator&) SAL_DELETED_FUNCTION; + OPropertyMediator(OPropertyMediator&) = delete; + void operator =(OPropertyMediator&) = delete; protected: virtual ~OPropertyMediator(); diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index adad74da4c79..2d6e7a565418 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -91,8 +91,8 @@ namespace reportdesign std::shared_ptr<OReportDefinitionImpl> m_pImpl; private: - OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION; - OReportDefinition& operator=(const OReportDefinition&) SAL_DELETED_FUNCTION; + OReportDefinition(const OReportDefinition&) = delete; + OReportDefinition& operator=(const OReportDefinition&) = delete; void setSection( const OUString& _sProperty ,const bool& _bOn diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index d3a606240033..793ab26683ff 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -49,8 +49,8 @@ private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE; - OReportModel( const OReportModel& ) SAL_DELETED_FUNCTION; - void operator=(const OReportModel& rSrcModel) SAL_DELETED_FUNCTION; + OReportModel( const OReportModel& ) = delete; + void operator=(const OReportModel& rSrcModel) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index a9eff84462ea..76b01b31faa3 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -53,8 +53,8 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo private: DlgEdHintKind eHintKind; - DlgEdHint(DlgEdHint&) SAL_DELETED_FUNCTION; - void operator =(DlgEdHint&) SAL_DELETED_FUNCTION; + DlgEdHint(DlgEdHint&) = delete; + void operator =(DlgEdHint&) = delete; public: DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index e45a9064da48..40df189b9354 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -34,7 +34,7 @@ class OReportModel; class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage { - OReportPage& operator=(const OReportPage&) SAL_DELETED_FUNCTION; + OReportPage& operator=(const OReportPage&) = delete; OReportModel& rModel; ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 1190412646e8..c6cb8b9ade86 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -61,8 +61,8 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OGroupHelper { ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; - OGroupHelper(const OGroupHelper&) SAL_DELETED_FUNCTION; - OGroupHelper& operator=(const OGroupHelper&) SAL_DELETED_FUNCTION; + OGroupHelper(const OGroupHelper&) = delete; + OGroupHelper& operator=(const OGroupHelper&) = delete; public: OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup) :m_xGroup(_xGroup) @@ -169,8 +169,8 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction { - OUndoContainerAction(OUndoContainerAction&) SAL_DELETED_FUNCTION; - void operator =(OUndoContainerAction&) SAL_DELETED_FUNCTION; + OUndoContainerAction(OUndoContainerAction&) = delete; + void operator =(OUndoContainerAction&) = delete; protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xElement; // object not owned by the action diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index 78a36c5c602f..687923e5b13c 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -42,8 +42,8 @@ namespace rptui { const ::std::unique_ptr<OXUndoEnvironmentImpl> m_pImpl; - OXUndoEnvironment(const OXUndoEnvironment&) SAL_DELETED_FUNCTION; - OXUndoEnvironment& operator=(const OXUndoEnvironment&) SAL_DELETED_FUNCTION; + OXUndoEnvironment(const OXUndoEnvironment&) = delete; + OXUndoEnvironment& operator=(const OXUndoEnvironment&) = delete; protected: virtual ~OXUndoEnvironment(); diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 6ffaad730e83..4e581f2dac0c 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -98,8 +98,8 @@ namespace rptui static size_t getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp ); private: - ConditionalExpressionFactory( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION; - ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION; + ConditionalExpressionFactory( const ConditionalExpressionFactory& ) = delete; + ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) = delete; }; } // namespace rptui diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 52c30227730e..57016148b839 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -52,8 +52,8 @@ namespace reportdesign ::sal_Int32 m_LineWidth; private: - OFixedLine(const OFixedLine&) SAL_DELETED_FUNCTION; - OFixedLine& operator=(const OFixedLine&) SAL_DELETED_FUNCTION; + OFixedLine(const OFixedLine&) = delete; + OFixedLine& operator=(const OFixedLine&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 8a5ce95df61d..c5103de0efac 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -47,8 +47,8 @@ namespace reportdesign OReportControlModel m_aProps; OUString m_sLabel; private: - OFixedText(const OFixedText&) SAL_DELETED_FUNCTION; - OFixedText& operator=(const OFixedText&) SAL_DELETED_FUNCTION; + OFixedText(const OFixedText&) = delete; + OFixedText& operator=(const OFixedText&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index d70ce5a4d587..8017fb196c70 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -45,8 +45,8 @@ namespace reportdesign OUString m_sFormula; bool m_bEnabled; private: - OFormatCondition(const OFormatCondition&) SAL_DELETED_FUNCTION; - OFormatCondition& operator=(const OFormatCondition&) SAL_DELETED_FUNCTION; + OFormatCondition(const OFormatCondition&) = delete; + OFormatCondition& operator=(const OFormatCondition&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 1b25ce0e6bd6..3569a4577b37 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -50,8 +50,8 @@ namespace reportdesign ::sal_Int32 m_nFormatKey; private: - OFormattedField(const OFormattedField&) SAL_DELETED_FUNCTION; - OFormattedField& operator=(const OFormattedField&) SAL_DELETED_FUNCTION; + OFormattedField(const OFormattedField&) = delete; + OFormattedField& operator=(const OFormattedField&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index ca221f096678..fab6042468a4 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -48,8 +48,8 @@ namespace reportdesign bool m_bPreEvaluated; bool m_bDeepTraversing; private: - OFunction(const OFunction&) SAL_DELETED_FUNCTION; - OFunction& operator=(const OFunction&) SAL_DELETED_FUNCTION; + OFunction(const OFunction&) = delete; + OFunction& operator=(const OFunction&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index c835c7e1a8b8..c756ac972737 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -43,8 +43,8 @@ namespace reportdesign ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XFunctionsSupplier > m_xParent; TFunctions m_aFunctions; private: - OFunctions& operator=(const OFunctions&) SAL_DELETED_FUNCTION; - OFunctions(const OFunctions&) SAL_DELETED_FUNCTION; + OFunctions& operator=(const OFunctions&) = delete; + OFunctions(const OFunctions&) = delete; void checkIndex(sal_Int32 _nIndex); protected: // TODO: VirtualFunctionFinder: This is virtual function! diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index c63c68152ce4..fb928fa73d71 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -51,8 +51,8 @@ namespace reportdesign ::rptshared::GroupProperties m_aProps; private: - OGroup& operator=(const OGroup&) SAL_DELETED_FUNCTION; - OGroup(const OGroup&) SAL_DELETED_FUNCTION; + OGroup& operator=(const OGroup&) = delete; + OGroup(const OGroup&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index 7099aaa5c177..caf9978a390b 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -42,8 +42,8 @@ namespace reportdesign ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XReportDefinition > m_xParent; TGroups m_aGroups; private: - OGroups& operator=(const OGroups&) SAL_DELETED_FUNCTION; - OGroups(const OGroups&) SAL_DELETED_FUNCTION; + OGroups& operator=(const OGroups&) = delete; + OGroups(const OGroups&) = delete; void checkIndex(sal_Int32 _nIndex); protected: // TODO: VirtualFunctionFinder: This is virtual function! diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index dc63e19ce5f1..882681ee3f23 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -47,8 +47,8 @@ namespace reportdesign sal_Int16 m_nScaleMode; bool m_bPreserveIRI; private: - OImageControl(const OImageControl&) SAL_DELETED_FUNCTION; - OImageControl& operator=(const OImageControl&) SAL_DELETED_FUNCTION; + OImageControl(const OImageControl&) = delete; + OImageControl& operator=(const OImageControl&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index ab4a60f32365..391cc0884023 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -79,8 +79,8 @@ namespace reportdesign class OReportControlModel { void checkIndex(sal_Int32 _nIndex); - OReportControlModel(OReportControlModel&) SAL_DELETED_FUNCTION; - void operator =(OReportControlModel&) SAL_DELETED_FUNCTION; + OReportControlModel(OReportControlModel&) = delete; + void operator =(OReportControlModel&) = delete; public: ::cppu::OInterfaceContainerHelper aContainerListeners; OReportComponentProperties aComponent; diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index 2104bcaf222f..e91b0c6bb390 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -28,8 +28,8 @@ namespace reportdesign class OReportDrawPage : public SvxDrawPage { ::com::sun::star::uno::WeakReference< ::com::sun::star::report::XSection > m_xSection; - OReportDrawPage(const OReportDrawPage&) SAL_DELETED_FUNCTION; - void operator =(const OReportDrawPage&) SAL_DELETED_FUNCTION; + OReportDrawPage(const OReportDrawPage&) = delete; + void operator =(const OReportDrawPage&) = delete; protected: virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index ec8153ff43f4..5de09e82997f 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -52,8 +52,8 @@ namespace reportdesign ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; ::sal_Int32 m_nMaxRows; private: - OReportEngineJFree(const OReportEngineJFree&) SAL_DELETED_FUNCTION; - OReportEngineJFree& operator=(const OReportEngineJFree&) SAL_DELETED_FUNCTION; + OReportEngineJFree(const OReportEngineJFree&) = delete; + OReportEngineJFree& operator=(const OReportEngineJFree&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 32ba20b5c093..0d4cf81a7a8f 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -30,8 +30,8 @@ namespace rptui OModuleClient m_aModuleClient; ::std::unique_ptr<SdrUndoFactory> m_pUndoFactory; - OReportUndoFactory(const OReportUndoFactory&) SAL_DELETED_FUNCTION; - OReportUndoFactory& operator=(const OReportUndoFactory&) SAL_DELETED_FUNCTION; + OReportUndoFactory(const OReportUndoFactory&) = delete; + OReportUndoFactory& operator=(const OReportUndoFactory&) = delete; public: OReportUndoFactory(); virtual ~OReportUndoFactory(); diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 353941a13a34..465f397f057d 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -38,8 +38,8 @@ class OObjectListener: public TPropertyChangeListenerHelper { private: OObjectBase* m_pObject; - OObjectListener(const OObjectListener&) SAL_DELETED_FUNCTION; - void operator =(const OObjectListener&) SAL_DELETED_FUNCTION; + OObjectListener(const OObjectListener&) = delete; + void operator =(const OObjectListener&) = delete; protected: virtual ~OObjectListener(); public: diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 96aeb472dfdc..70d25699d3e3 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -74,8 +74,8 @@ namespace reportdesign bool m_bInInsertNotify; private: - OSection(const OSection&) SAL_DELETED_FUNCTION; - OSection& operator=(const OSection&) SAL_DELETED_FUNCTION; + OSection(const OSection&) = delete; + OSection& operator=(const OSection&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index ab852e0bc299..f988f7426289 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -57,8 +57,8 @@ namespace reportdesign m_CustomShapeGeometry; private: - OShape(const OShape&) SAL_DELETED_FUNCTION; - OShape& operator=(const OShape&) SAL_DELETED_FUNCTION; + OShape(const OShape&) = delete; + OShape& operator=(const OShape&) = delete; template <typename T> void set( const OUString& _sProperty ,const T& _Value diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx index abcfdac91f0b..fe38992c655f 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx @@ -40,8 +40,8 @@ namespace rptxml const SvXMLNamespaceMap& rNamespaceMap ) const SAL_OVERRIDE; - OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION; - void operator =(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION; + OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) = delete; + void operator =(const OXMLAutoStylePoolP&) = delete; public: explicit OXMLAutoStylePoolP(ORptExport& rXMLExport); virtual ~OXMLAutoStylePoolP(); diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index 4973d8fe401e..bec3281dfb84 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -37,8 +37,8 @@ namespace rptxml bool m_bContainsShape; ORptFilter& GetOwnImport(); - OXMLCell(const OXMLCell&) SAL_DELETED_FUNCTION; - OXMLCell& operator =(const OXMLCell&) SAL_DELETED_FUNCTION; + OXMLCell(const OXMLCell&) = delete; + OXMLCell& operator =(const OXMLCell&) = delete; public: OXMLCell( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 7cb14adb653e..f67ed760e2b6 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -32,8 +32,8 @@ namespace rptxml ORptFilter& GetOwnImport(); void fillStyle(const OUString& _sStyleName); - OXMLRowColumn(const OXMLRowColumn&) SAL_DELETED_FUNCTION; - void operator =(const OXMLRowColumn&) SAL_DELETED_FUNCTION; + OXMLRowColumn(const OXMLRowColumn&) = delete; + void operator =(const OXMLRowColumn&) = delete; public: OXMLRowColumn( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index 58f78db1edef..fc77d154fb98 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -28,8 +28,8 @@ namespace rptxml class OXMLCondPrtExpr : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; - OXMLCondPrtExpr(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION; - void operator =(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION; + OXMLCondPrtExpr(const OXMLCondPrtExpr&) = delete; + void operator =(const OXMLCondPrtExpr&) = delete; public: OXMLCondPrtExpr( ORptFilter& _rImport diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 5e6bde3430c9..9220a5517721 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -40,8 +40,8 @@ namespace rptxml ORptFilter& GetOwnImport(); static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); - OXMLControlProperty(const OXMLControlProperty&) SAL_DELETED_FUNCTION; - void operator =(const OXMLControlProperty&) SAL_DELETED_FUNCTION; + OXMLControlProperty(const OXMLControlProperty&) = delete; + void operator =(const OXMLControlProperty&) = delete; public: OXMLControlProperty( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index a5b0a531515f..83e8f40c39fe 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -74,8 +74,8 @@ private: void exportTableRows(); private: - ExportDocumentHandler(ExportDocumentHandler &) SAL_DELETED_FUNCTION; - void operator =(ExportDocumentHandler &) SAL_DELETED_FUNCTION; + ExportDocumentHandler(ExportDocumentHandler &) = delete; + void operator =(ExportDocumentHandler &) = delete; virtual ~ExportDocumentHandler(); diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 462dc19b00aa..6e7f115de678 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -40,8 +40,8 @@ namespace rptxml const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; private: - OXMLFixedContent(const OXMLFixedContent&) SAL_DELETED_FUNCTION; - OXMLFixedContent& operator =(const OXMLFixedContent&) SAL_DELETED_FUNCTION; + OXMLFixedContent(const OXMLFixedContent&) = delete; + OXMLFixedContent& operator =(const OXMLFixedContent&) = delete; public: OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 18d46fead2f9..16806ec38ed2 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -30,8 +30,8 @@ namespace rptxml ORptFilter& m_rImport; OUString m_sStyleName; ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > m_xComponent; - OXMLFormatCondition(const OXMLFormatCondition&) SAL_DELETED_FUNCTION; - void operator =(const OXMLFormatCondition&) SAL_DELETED_FUNCTION; + OXMLFormatCondition(const OXMLFormatCondition&) = delete; + void operator =(const OXMLFormatCondition&) = delete; public: OXMLFormatCondition( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index f96f332d227a..d3ae6d7e5dd8 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -27,8 +27,8 @@ namespace rptxml class ORptFilter; class OXMLFormattedField : public OXMLReportElementBase { - OXMLFormattedField(const OXMLFormattedField&) SAL_DELETED_FUNCTION; - void operator =(const OXMLFormattedField&) SAL_DELETED_FUNCTION; + OXMLFormattedField(const OXMLFormattedField&) = delete; + void operator =(const OXMLFormattedField&) = delete; public: OXMLFormattedField( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 67748d5e676a..31da0c0d2ebe 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -38,8 +38,8 @@ namespace rptxml { class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory { - OPropertyHandlerFactory(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION; - void operator =(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION; + OPropertyHandlerFactory(const OPropertyHandlerFactory&) = delete; + void operator =(const OPropertyHandlerFactory&) = delete; protected: mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; mutable ::std::unique_ptr<XMLPropertyHandler> m_pTextAlignHandler; diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 7c12c48ec4bf..3acfe1d391d4 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -27,8 +27,8 @@ namespace rptxml class ORptFilter; class OXMLImage : public OXMLReportElementBase { - OXMLImage(const OXMLImage&) SAL_DELETED_FUNCTION; - void operator =(const OXMLImage&) SAL_DELETED_FUNCTION; + OXMLImage(const OXMLImage&) = delete; + void operator =(const OXMLImage&) = delete; public: OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 6b1a638ab5af..d19292916cf1 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -71,8 +71,8 @@ private: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ImportDocumentHandler(ImportDocumentHandler &) SAL_DELETED_FUNCTION; - void operator =(ImportDocumentHandler &) SAL_DELETED_FUNCTION; + ImportDocumentHandler(ImportDocumentHandler &) = delete; + void operator =(ImportDocumentHandler &) = delete; virtual ~ImportDocumentHandler(); diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index 837669fc37b0..e32179a53e94 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -27,8 +27,8 @@ namespace rptxml class OXMLMasterFields : public SvXMLImportContext { IMasterDetailFieds* m_pReport; - OXMLMasterFields(const OXMLMasterFields&) SAL_DELETED_FUNCTION; - void operator =(const OXMLMasterFields&) SAL_DELETED_FUNCTION; + OXMLMasterFields(const OXMLMasterFields&) = delete; + void operator =(const OXMLMasterFields&) = delete; public: OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index fcec77843e66..f1492f2224af 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx @@ -28,8 +28,8 @@ namespace rptxml class OXMLRptPropHdlFactory : public XMLPropertyHandlerFactory { private: - OXMLRptPropHdlFactory(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION; - void operator =(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION; + OXMLRptPropHdlFactory(const OXMLRptPropHdlFactory&) = delete; + void operator =(const OXMLRptPropHdlFactory&) = delete; public: OXMLRptPropHdlFactory(); virtual ~OXMLRptPropHdlFactory(); diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index c517246fe042..ab88f2e7efae 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -30,8 +30,8 @@ namespace rptxml ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xComponent; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; - OXMLReport(const OXMLReport&) SAL_DELETED_FUNCTION; - void operator =(const OXMLReport&) SAL_DELETED_FUNCTION; + OXMLReport(const OXMLReport&) = delete; + void operator =(const OXMLReport&) = delete; public: OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index a3f1fa961b5d..5708f034da38 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -29,8 +29,8 @@ namespace rptxml { ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > m_xComponent; ORptFilter& GetOwnImport(); - OXMLReportElement(const OXMLReportElement&) SAL_DELETED_FUNCTION; - void operator =(const OXMLReportElement&) SAL_DELETED_FUNCTION; + OXMLReportElement(const OXMLReportElement&) = delete; + void operator =(const OXMLReportElement&) = delete; public: OXMLReportElement( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index bf2025fe1df0..5c7571e30ba7 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -39,8 +39,8 @@ namespace rptxml class OXMLReportElementBase : public SvXMLImportContext { - OXMLReportElementBase(const OXMLReportElementBase&) SAL_DELETED_FUNCTION; - void operator =(const OXMLReportElementBase&) SAL_DELETED_FUNCTION; + OXMLReportElementBase(const OXMLReportElementBase&) = delete; + void operator =(const OXMLReportElementBase&) = delete; protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 676009029a20..51ef60396902 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -32,8 +32,8 @@ namespace rptxml ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; ORptFilter& GetOwnImport(); - OXMLSection(const OXMLSection&) SAL_DELETED_FUNCTION; - void operator =(const OXMLSection&) SAL_DELETED_FUNCTION; + OXMLSection(const OXMLSection&) = delete; + void operator =(const OXMLSection&) = delete; public: OXMLSection( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index cdef154f4b3a..44b058bdffef 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -47,8 +47,8 @@ namespace rptxml ORptFilter& GetOwnImport() const { return m_rImport;} - OControlStyleContext(const OControlStyleContext&) SAL_DELETED_FUNCTION; - void operator =(const OControlStyleContext&) SAL_DELETED_FUNCTION; + OControlStyleContext(const OControlStyleContext&) = delete; + void operator =(const OControlStyleContext&) = delete; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, @@ -102,8 +102,8 @@ namespace rptxml ORptFilter& GetOwnImport() const { return m_rImport;} - OReportStylesContext(const OReportStylesContext&) SAL_DELETED_FUNCTION; - void operator =(const OReportStylesContext&) SAL_DELETED_FUNCTION; + OReportStylesContext(const OReportStylesContext&) = delete; + void operator =(const OReportStylesContext&) = delete; protected: // Create a style context. diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index 80e312e9db56..0a90a866837b 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -36,8 +36,8 @@ namespace rptxml sal_Int32 m_nCurrentCount; bool m_bContainsShape; - OXMLSubDocument(const OXMLSubDocument&) SAL_DELETED_FUNCTION; - void operator =(const OXMLSubDocument&) SAL_DELETED_FUNCTION; + OXMLSubDocument(const OXMLSubDocument&) = delete; + void operator =(const OXMLSubDocument&) = delete; virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index ebcb55a55640..bdec3a15bcaa 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -50,8 +50,8 @@ namespace rptxml sal_Int32 m_nColumnIndex; ORptFilter& GetOwnImport(); - OXMLTable(const OXMLTable&) SAL_DELETED_FUNCTION; - void operator =(const OXMLTable&) SAL_DELETED_FUNCTION; + OXMLTable(const OXMLTable&) = delete; + void operator =(const OXMLTable&) = delete; public: OXMLTable( ORptFilter& rImport diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 77c296611c03..f30e34d9d61e 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -74,8 +74,8 @@ class OAddFieldWindow :public FloatingWindow DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( OnSortAction, ToolBox*, void ); - OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION; - void operator =(const OAddFieldWindow&) SAL_DELETED_FUNCTION; + OAddFieldWindow(const OAddFieldWindow&) = delete; + void operator =(const OAddFieldWindow&) = delete; public: OAddFieldWindow(vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet); diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 3088e0857201..8d7b82d30e4b 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -29,8 +29,8 @@ namespace rptui { class OColorListener : public vcl::Window, public SfxListener { - OColorListener(const OColorListener&) SAL_DELETED_FUNCTION; - void operator =(const OColorListener&) SAL_DELETED_FUNCTION; + OColorListener(const OColorListener&) = delete; + void operator =(const OColorListener&) = delete; protected: OModuleClient m_aModuleClient; Link<OColorListener&,void> m_aCollapsedLink; diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index b89e7d26a0b7..ccd36cea3580 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -89,8 +89,8 @@ namespace rptui protected: virtual ~DataProviderHandler() {} private: - DataProviderHandler(DataProviderHandler &) SAL_DELETED_FUNCTION; - void operator =(DataProviderHandler &) SAL_DELETED_FUNCTION; + DataProviderHandler(DataProviderHandler &) = delete; + void operator =(DataProviderHandler &) = delete; bool impl_dialogLinkedFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 84e3127f8784..4d6f5b6914de 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -71,8 +71,8 @@ class ODateTimeDialog : public ModalDialog sal_Int32 getFormatKey(bool _bDate) const; DECL_LINK_TYPED( CBClickHdl, Button*, void ); - ODateTimeDialog(const ODateTimeDialog&) SAL_DELETED_FUNCTION; - void operator =(const ODateTimeDialog&) SAL_DELETED_FUNCTION; + ODateTimeDialog(const ODateTimeDialog&) = delete; + void operator =(const ODateTimeDialog&) = delete; // fill methods void InsertEntry(sal_Int16 _nNumberFormatId); diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 61601eb249d5..5c39bd17a652 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -53,8 +53,8 @@ namespace rptui /// access to property meta data ::std::unique_ptr< OPropertyInfoService > m_pInfoService; - DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION; - DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION; + DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) = delete; + DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) = delete; protected: virtual ~DefaultComponentInspectorModel(); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 3825ac3a118d..95f1cdb26360 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -82,8 +82,8 @@ namespace rptui void ImplInitSettings(); - ODesignView(ODesignView&) SAL_DELETED_FUNCTION; - void operator =(ODesignView&) SAL_DELETED_FUNCTION; + ODesignView(ODesignView&) = delete; + void operator =(ODesignView&) = delete; protected: // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index 7c050a5ba52a..27d234dca968 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -28,8 +28,8 @@ namespace rptui */ class OEndMarker : public OColorListener { - OEndMarker(OEndMarker&) SAL_DELETED_FUNCTION; - void operator =(OEndMarker&) SAL_DELETED_FUNCTION; + OEndMarker(OEndMarker&) = delete; + void operator =(OEndMarker&) = delete; protected: virtual void ImplInitSettings() SAL_OVERRIDE; public: diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 592305371eac..e96a01c2520d 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -276,8 +276,8 @@ namespace rptui protected: virtual ~GeometryHandler(); private: - GeometryHandler(GeometryHandler &) SAL_DELETED_FUNCTION; - void operator =(GeometryHandler &) SAL_DELETED_FUNCTION; + GeometryHandler(GeometryHandler &) = delete; + void operator =(GeometryHandler &) = delete; // override WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 4b9ed07e75ba..386883acf50a 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -135,8 +135,8 @@ private: * */ void fillColumns(); - OGroupsSortingDialog(OGroupsSortingDialog&) SAL_DELETED_FUNCTION; - void operator =(OGroupsSortingDialog&) SAL_DELETED_FUNCTION; + OGroupsSortingDialog(OGroupsSortingDialog&) = delete; + void operator =(OGroupsSortingDialog&) = delete; protected: // OPropertyChangeListener virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 5410de2cdb9e..65c77ee6d99e 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -30,8 +30,8 @@ namespace rptui { OModuleClient m_aModuleClient; ::std::unique_ptr<ONavigatorImpl> m_pImpl; - ONavigator(const ONavigator&) SAL_DELETED_FUNCTION; - void operator =(const ONavigator&) SAL_DELETED_FUNCTION; + ONavigator(const ONavigator&) = delete; + void operator =(const ONavigator&) = delete; public: ONavigator( vcl::Window* pParent ,OReportController& _rController); diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 43a1915d8e81..fdbd11dbef2c 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -50,8 +50,8 @@ class OPageNumberDialog : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> m_xHoldAlive; - OPageNumberDialog(const OPageNumberDialog&) SAL_DELETED_FUNCTION; - void operator =(const OPageNumberDialog&) SAL_DELETED_FUNCTION; + OPageNumberDialog(const OPageNumberDialog&) = delete; + void operator =(const OPageNumberDialog&) = delete; public: OPageNumberDialog( vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index fae48f2b83cd..9d83a985c9cf 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -83,8 +83,8 @@ namespace rptui protected: virtual ~ReportComponentHandler() {} private: - ReportComponentHandler(ReportComponentHandler &) SAL_DELETED_FUNCTION; - void operator =(ReportComponentHandler &) SAL_DELETED_FUNCTION; + ReportComponentHandler(ReportComponentHandler &) = delete; + void operator =(ReportComponentHandler &) = delete; diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 735a149ca047..ff480fb58b4f 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -53,8 +53,8 @@ namespace rptui FixedTextColor m_aFixedTextColor; // do not allow copy - OXReportControllerObserver(const OXReportControllerObserver&) SAL_DELETED_FUNCTION; - OXReportControllerObserver& operator=(const OXReportControllerObserver&) SAL_DELETED_FUNCTION; + OXReportControllerObserver(const OXReportControllerObserver&) = delete; + OXReportControllerObserver& operator=(const OXReportControllerObserver&) = delete; virtual ~OXReportControllerObserver(); // UNO Object must have private destructor! public: OXReportControllerObserver(const OReportController& _rController); diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index b60680822433..2bd6733ad52e 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -61,8 +61,8 @@ namespace rptui */ void impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_Int32 i_nLeftMargin,sal_Int32 i_nRightMargin); - OReportSection(OReportSection&) SAL_DELETED_FUNCTION; - void operator =(OReportSection&) SAL_DELETED_FUNCTION; + OReportSection(OReportSection&) = delete; + void operator =(OReportSection&) = delete; protected: // DropTargetHelper overridables virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index fd9eaabff3eb..257add2e83f3 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -57,8 +57,8 @@ namespace rptui sal_Int32 GetTotalHeight() const; sal_Int32 impl_getRealPixelWidth() const; - OReportWindow(OReportWindow&) SAL_DELETED_FUNCTION; - void operator =(OReportWindow&) SAL_DELETED_FUNCTION; + OReportWindow(OReportWindow&) = delete; + void operator =(OReportWindow&) = delete; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // OPropertyChangeListener diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index f82a716e5376..150a646331f2 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -35,8 +35,8 @@ namespace rptui */ class OSectionUndo : public OCommentUndoAction { - OSectionUndo(const OSectionUndo&) SAL_DELETED_FUNCTION; - void operator =(const OSectionUndo&) SAL_DELETED_FUNCTION; + OSectionUndo(const OSectionUndo&) = delete; + void operator =(const OSectionUndo&) = delete; protected: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > m_aControls; @@ -72,8 +72,8 @@ namespace rptui void implReInsert( ) SAL_OVERRIDE; void implReRemove( ) SAL_OVERRIDE; - OReportSectionUndo(const OReportSectionUndo&) SAL_DELETED_FUNCTION; - void operator =(const OReportSectionUndo&) SAL_DELETED_FUNCTION; + OReportSectionUndo(const OReportSectionUndo&) = delete; + void operator =(const OReportSectionUndo&) = delete; public: TYPEINFO_OVERRIDE(); //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection @@ -99,8 +99,8 @@ namespace rptui void implReInsert( ) SAL_OVERRIDE; void implReRemove( ) SAL_OVERRIDE; - OGroupSectionUndo(const OGroupSectionUndo&) SAL_DELETED_FUNCTION; - void operator =(const OGroupSectionUndo&) SAL_DELETED_FUNCTION; + OGroupSectionUndo(const OGroupSectionUndo&) = delete; + void operator =(const OGroupSectionUndo&) = delete; public: TYPEINFO_OVERRIDE(); //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 54a88b051e0a..195d1166cfa2 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -61,8 +61,8 @@ namespace rptui void ImplInitSettings(); void impl_initScrollBar( ScrollBar& _rScrollBar ) const; - OScrollWindowHelper(OScrollWindowHelper&) SAL_DELETED_FUNCTION; - void operator =(OScrollWindowHelper&) SAL_DELETED_FUNCTION; + OScrollWindowHelper(OScrollWindowHelper&) = delete; + void operator =(OScrollWindowHelper&) = delete; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // window diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index c8f14e26ee4b..581523d408f8 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -38,8 +38,8 @@ private: VclPtr<OReportSection> m_pSectionWindow; void ObjectRemovedInAliveMode( const SdrObject* pObject ); - OSectionView(const OSectionView&) SAL_DELETED_FUNCTION; - void operator =(const OSectionView&) SAL_DELETED_FUNCTION; + OSectionView(const OSectionView&) = delete; + void operator =(const OSectionView&) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 41bdb042a8fa..cc8245eae261 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -55,8 +55,8 @@ namespace rptui ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pSectionMulti; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pGroupMulti; - OSectionWindow(OSectionWindow&) SAL_DELETED_FUNCTION; - void operator =(OSectionWindow&) SAL_DELETED_FUNCTION; + OSectionWindow(OSectionWindow&) = delete; + void operator =(OSectionWindow&) = delete; /** set the title of the group header or footer * diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 0fe0bc64bd99..d5bcc555ca66 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -48,8 +48,8 @@ namespace rptui virtual void ImplInitSettings() SAL_OVERRIDE; virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - OStartMarker(OStartMarker&) SAL_DELETED_FUNCTION; - void operator =(OStartMarker&) SAL_DELETED_FUNCTION; + OStartMarker(OStartMarker&) = delete; + void operator =(OStartMarker&) = delete; public: OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry); virtual ~OStartMarker(); diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 4950ec9a55c5..9a900a89c274 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -124,8 +124,8 @@ namespace rptui static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize); void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet); - OViewsWindow(OViewsWindow&) SAL_DELETED_FUNCTION; - void operator =(OViewsWindow&) SAL_DELETED_FUNCTION; + OViewsWindow(OViewsWindow&) = delete; + void operator =(OViewsWindow&) = delete; protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // Window overrides diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 527654eb001f..4d47ef04698f 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -38,8 +38,8 @@ class OSectionView; class DlgEdFunc /* : public LinkHdl */ { - DlgEdFunc(const DlgEdFunc&) SAL_DELETED_FUNCTION; - void operator =(const DlgEdFunc&) SAL_DELETED_FUNCTION; + DlgEdFunc(const DlgEdFunc&) = delete; + void operator =(const DlgEdFunc&) = delete; protected: VclPtr<OReportSection> m_pParent; OSectionView& m_rView; diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 1b577a482569..98876703ca13 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -31,8 +31,8 @@ namespace rptui class ORptPageDialog : public SfxTabDialog { private: - ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION; - void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION; + ORptPageDialog(const ORptPageDialog&) = delete; + void operator =(const ORptPageDialog&) = delete; sal_uInt16 m_nCharBgdId; public: diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 0506dfcd3357..4b8465056ef5 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -37,8 +37,8 @@ namespace rptui class OPropertyInfoService :public OModuleClient { - OPropertyInfoService(const OPropertyInfoService&) SAL_DELETED_FUNCTION; - void operator =(const OPropertyInfoService&) SAL_DELETED_FUNCTION; + OPropertyInfoService(const OPropertyInfoService&) = delete; + void operator =(const OPropertyInfoService&) = delete; protected: static sal_uInt16 s_nCount; static OPropertyInfoImpl* s_pPropertyInfos; diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 811d57c2c389..c71bb668aadb 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -62,8 +62,8 @@ private: OSectionView* m_pView; bool m_bInitialStateChange; - PropBrw(PropBrw&) SAL_DELETED_FUNCTION; - void operator =(PropBrw&) SAL_DELETED_FUNCTION; + PropBrw(PropBrw&) = delete; + void operator =(PropBrw&) = delete; protected: virtual void Resize() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 810de524f4bd..968cf5436cef 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -45,8 +45,8 @@ namespace rptui TToolbarHelper m_pToolbarController; sal_uInt16 m_nToolBoxId; sal_uInt16 m_nSlotId; - OToolboxController(const OToolboxController&) SAL_DELETED_FUNCTION; - void operator =(const OToolboxController&) SAL_DELETED_FUNCTION; + OToolboxController(const OToolboxController&) = delete; + void operator =(const OToolboxController&) = delete; public: OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); virtual ~OToolboxController(); |