diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:25:07 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:36:00 +0100 |
commit | 034f2e1a2ace6c05e0a9fde192f4929303754544 (patch) | |
tree | 5f3c2432c3379cca7968ad0c22053ba17d7400b5 | |
parent | cd5c0adf811f8b63c312dc48c2790759eb19deeb (diff) |
loplugin:deletedspecial
Change-Id: I1e61d3553795ed8e2b7bc6fa3d1c0f881e777b08
78 files changed, 150 insertions, 219 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index e1fb2f7bf0a5..e88971bb45c5 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -37,8 +37,7 @@ namespace rptui friend class OModuleClient; private: - OModule(); - // not implemented. OModule is a static class + OModule() SAL_DELETED_FUNCTION; //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 f4a0f60597f2..b77d0cd60eea 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&); - void operator =(OPropertyMediator&); + OPropertyMediator(OPropertyMediator&) SAL_DELETED_FUNCTION; + void operator =(OPropertyMediator&) SAL_DELETED_FUNCTION; protected: virtual ~OPropertyMediator(); diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 68bf784b3923..763d2e8332ef 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -96,8 +96,8 @@ namespace reportdesign ::boost::shared_ptr<OReportDefinitionImpl> m_pImpl; private: - OReportDefinition(const OReportDefinition&); - OReportDefinition& operator=(const OReportDefinition&); + OReportDefinition(const OReportDefinition&) SAL_DELETED_FUNCTION; + OReportDefinition& operator=(const OReportDefinition&) SAL_DELETED_FUNCTION; void setSection( const OUString& _sProperty ,const bool& _bOn diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index c0c35b68e8be..d3a606240033 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& ); - void operator=(const OReportModel& rSrcModel); + OReportModel( const OReportModel& ) SAL_DELETED_FUNCTION; + void operator=(const OReportModel& rSrcModel) SAL_DELETED_FUNCTION; public: TYPEINFO_OVERRIDE(); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index bb61305240cb..0c83c5e93a54 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -54,8 +54,8 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo DlgEdHintKind eHintKind; OUnoObject* pDlgEdObj; - DlgEdHint(DlgEdHint&); - void operator =(DlgEdHint&); + DlgEdHint(DlgEdHint&) SAL_DELETED_FUNCTION; + void operator =(DlgEdHint&) SAL_DELETED_FUNCTION; public: DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 2079a68b5b8f..14d33bd1d149 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -62,8 +62,8 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OGroupHelper { ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup; - OGroupHelper(const OGroupHelper&); - OGroupHelper& operator=(const OGroupHelper&); + OGroupHelper(const OGroupHelper&) SAL_DELETED_FUNCTION; + OGroupHelper& operator=(const OGroupHelper&) SAL_DELETED_FUNCTION; public: OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup) :m_xGroup(_xGroup) @@ -171,8 +171,8 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC OUndoContainerAction: public OCommentUndoAction { - OUndoContainerAction(OUndoContainerAction&); - void operator =(OUndoContainerAction&); + OUndoContainerAction(OUndoContainerAction&) SAL_DELETED_FUNCTION; + void operator =(OUndoContainerAction&) SAL_DELETED_FUNCTION; 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 9b4f6de8bac6..aa7936180249 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&); - OXUndoEnvironment& operator=(const OXUndoEnvironment&); + OXUndoEnvironment(const OXUndoEnvironment&) SAL_DELETED_FUNCTION; + OXUndoEnvironment& operator=(const OXUndoEnvironment&) SAL_DELETED_FUNCTION; protected: virtual ~OXUndoEnvironment(); diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index ae65306d68b7..04270c70d108 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -100,9 +100,8 @@ namespace rptui static size_t getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp ); private: - ConditionalExpressionFactory(); // never implemented - ConditionalExpressionFactory( const ConditionalExpressionFactory& ); // never implemented - ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ); // never implemented + ConditionalExpressionFactory( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION; + ConditionalExpressionFactory& operator=( const ConditionalExpressionFactory& ) SAL_DELETED_FUNCTION; }; } // namespace rptui diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 5e0332099588..2261a8298637 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -548,24 +548,6 @@ struct OReportDefinitionImpl ,m_bSetModifiedEnabled( true ) {} - OReportDefinitionImpl(::osl::Mutex& _aMutex,const OReportDefinitionImpl& _aCopy) - :m_aStorageChangeListeners(_aMutex) - ,m_aCloseListener(_aMutex) - ,m_aModifyListeners(_aMutex) - ,m_aDocEventListeners(_aMutex) - ,m_sMimeType(_aCopy.m_sMimeType) - ,m_sIdentifier(_aCopy.m_sIdentifier) - ,m_aVisualAreaSize(_aCopy.m_aVisualAreaSize) - ,m_nAspect(_aCopy.m_nAspect) - ,m_nGroupKeepTogether(_aCopy.m_nGroupKeepTogether) - ,m_nPageHeaderOption(_aCopy.m_nPageHeaderOption) - ,m_nPageFooterOption(_aCopy.m_nPageFooterOption) - ,m_nCommandType(_aCopy.m_nCommandType) - ,m_bControllersLocked(_aCopy.m_bControllersLocked) - ,m_bModified(_aCopy.m_bModified) - ,m_bEscapeProcessing(_aCopy.m_bEscapeProcessing) - ,m_bSetModifiedEnabled(_aCopy.m_bSetModifiedEnabled) - {} ~OReportDefinitionImpl(); }; @@ -611,35 +593,6 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co osl_atomic_decrement( &m_refCount ); } -OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy) -: cppu::BaseMutex() -,ReportDefinitionBase(m_aMutex) -,ReportDefinitionPropertySet(_rCopy.m_aProps->m_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >()) -,comphelper::IEmbeddedHelper() -,m_aProps(new OReportComponentProperties(*_rCopy.m_aProps)) -,m_pImpl(new OReportDefinitionImpl(m_aMutex,*_rCopy.m_pImpl)) -{ - osl_atomic_increment(&m_refCount); - { - init(); - OGroups* pGroups = new OGroups(this,m_aProps->m_xContext); - m_pImpl->m_xGroups = pGroups; - pGroups->copyGroups(_rCopy.m_pImpl->m_xGroups); - m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); - OSection::lcl_copySection(_rCopy.m_pImpl->m_xDetail,m_pImpl->m_xDetail); - - setPageHeaderOn(_rCopy.m_pImpl->m_xPageHeader.is()); - setPageFooterOn(_rCopy.m_pImpl->m_xPageFooter.is()); - setReportHeaderOn(_rCopy.m_pImpl->m_xReportHeader.is()); - setReportFooterOn(_rCopy.m_pImpl->m_xReportFooter.is()); - OSection::lcl_copySection(_rCopy.m_pImpl->m_xPageHeader,m_pImpl->m_xPageHeader); - OSection::lcl_copySection(_rCopy.m_pImpl->m_xPageFooter,m_pImpl->m_xPageFooter); - OSection::lcl_copySection(_rCopy.m_pImpl->m_xReportHeader,m_pImpl->m_xReportHeader); - OSection::lcl_copySection(_rCopy.m_pImpl->m_xReportFooter,m_pImpl->m_xReportFooter); - } - osl_atomic_decrement( &m_refCount ); -} - OReportDefinition::~OReportDefinition() { if ( !ReportDefinitionBase::rBHelper.bInDispose && !ReportDefinitionBase::rBHelper.bDisposed ) diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index cec14294f786..3ce3a2d8476f 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -119,8 +119,6 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef ,m_nForceNewPage(report::ForceNewPage::NONE) ,m_nNewRowOrCol(report::ForceNewPage::NONE) ,m_bKeepTogether(false) -,m_bCanGrow(false) -,m_bCanShrink(false) ,m_bRepeatSection(false) ,m_bVisible(true) ,m_bBacktransparent(true) diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index 53f46e3e391b..f74204f56442 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&); - OFixedLine& operator=(const OFixedLine&); + OFixedLine(const OFixedLine&) SAL_DELETED_FUNCTION; + OFixedLine& operator=(const OFixedLine&) SAL_DELETED_FUNCTION; 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 296f96ce5d32..9c243bba6b2e 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&); - OFixedText& operator=(const OFixedText&); + OFixedText(const OFixedText&) SAL_DELETED_FUNCTION; + OFixedText& operator=(const OFixedText&) SAL_DELETED_FUNCTION; 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 3ab7246af03b..a1ba1c9aa4c8 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&); - OFormatCondition& operator=(const OFormatCondition&); + OFormatCondition(const OFormatCondition&) SAL_DELETED_FUNCTION; + OFormatCondition& operator=(const OFormatCondition&) SAL_DELETED_FUNCTION; 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 bf8eb9a7869a..9a0c5bc283d8 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&); - OFormattedField& operator=(const OFormattedField&); + OFormattedField(const OFormattedField&) SAL_DELETED_FUNCTION; + OFormattedField& operator=(const OFormattedField&) SAL_DELETED_FUNCTION; 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 25ad9774af35..6c2ea414d2af 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&); - OFunction& operator=(const OFunction&); + OFunction(const OFunction&) SAL_DELETED_FUNCTION; + OFunction& operator=(const OFunction&) SAL_DELETED_FUNCTION; 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 2f6f49502b40..fdcd0a461a96 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&); - OFunctions(const OFunctions&); + OFunctions& operator=(const OFunctions&) SAL_DELETED_FUNCTION; + OFunctions(const OFunctions&) SAL_DELETED_FUNCTION; 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 e103f51d449a..a4c45dfc3887 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&); - OGroup(const OGroup&); + OGroup& operator=(const OGroup&) SAL_DELETED_FUNCTION; + OGroup(const OGroup&) SAL_DELETED_FUNCTION; 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 4c236285c9e5..126f40721882 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&); - OGroups(const OGroups&); + OGroups& operator=(const OGroups&) SAL_DELETED_FUNCTION; + OGroups(const OGroups&) SAL_DELETED_FUNCTION; 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 df06f1bcbe72..b2b7ffc0b09a 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&); - OImageControl& operator=(const OImageControl&); + OImageControl(const OImageControl&) SAL_DELETED_FUNCTION; + OImageControl& operator=(const OImageControl&) SAL_DELETED_FUNCTION; 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 9dc5324e856b..ab4a60f32365 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&); - void operator =(OReportControlModel&); + OReportControlModel(OReportControlModel&) SAL_DELETED_FUNCTION; + void operator =(OReportControlModel&) SAL_DELETED_FUNCTION; public: ::cppu::OInterfaceContainerHelper aContainerListeners; OReportComponentProperties aComponent; diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index 844d00c8d8bc..2104bcaf222f 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&); - void operator =(const OReportDrawPage&); + OReportDrawPage(const OReportDrawPage&) SAL_DELETED_FUNCTION; + void operator =(const OReportDrawPage&) SAL_DELETED_FUNCTION; 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 62a03ddab358..6952685f0571 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&); - OReportEngineJFree& operator=(const OReportEngineJFree&); + OReportEngineJFree(const OReportEngineJFree&) SAL_DELETED_FUNCTION; + OReportEngineJFree& operator=(const OReportEngineJFree&) SAL_DELETED_FUNCTION; 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 4dc37db82a33..32ba20b5c093 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&); - OReportUndoFactory& operator=(const OReportUndoFactory&); + OReportUndoFactory(const OReportUndoFactory&) SAL_DELETED_FUNCTION; + OReportUndoFactory& operator=(const OReportUndoFactory&) SAL_DELETED_FUNCTION; public: OReportUndoFactory(); virtual ~OReportUndoFactory(); diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 7fad4b4babdd..4903bf77744e 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&); - void operator =(const OObjectListener&); + OObjectListener(const OObjectListener&) SAL_DELETED_FUNCTION; + void operator =(const OObjectListener&) SAL_DELETED_FUNCTION; protected: virtual ~OObjectListener(); public: diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 3bf846d05e1e..f0a3031fc22b 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -67,8 +67,6 @@ namespace reportdesign ::sal_Int16 m_nForceNewPage; ::sal_Int16 m_nNewRowOrCol; bool m_bKeepTogether; - bool m_bCanGrow; - bool m_bCanShrink; bool m_bRepeatSection; bool m_bVisible; bool m_bBacktransparent; @@ -76,8 +74,8 @@ namespace reportdesign bool m_bInInsertNotify; private: - OSection(const OSection&); - OSection& operator=(const OSection&); + OSection(const OSection&) SAL_DELETED_FUNCTION; + OSection& operator=(const OSection&) SAL_DELETED_FUNCTION; 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 0c8c08300c4f..854d26a4c8c4 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&); - OShape& operator=(const OShape&); + OShape(const OShape&) SAL_DELETED_FUNCTION; + OShape& operator=(const OShape&) SAL_DELETED_FUNCTION; 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 a8241fde8aea..2fe7f6758378 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&); - void operator =(const OXMLAutoStylePoolP&); + OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION; + void operator =(const OXMLAutoStylePoolP&) SAL_DELETED_FUNCTION; public: OXMLAutoStylePoolP(ORptExport& rXMLExport); virtual ~OXMLAutoStylePoolP(); diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index 66692ba120c3..4973d8fe401e 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&); - OXMLCell& operator =(const OXMLCell&); + OXMLCell(const OXMLCell&) SAL_DELETED_FUNCTION; + OXMLCell& operator =(const OXMLCell&) SAL_DELETED_FUNCTION; public: OXMLCell( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index 2cd626ee4c5a..7cb14adb653e 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&); - void operator =(const OXMLRowColumn&); + OXMLRowColumn(const OXMLRowColumn&) SAL_DELETED_FUNCTION; + void operator =(const OXMLRowColumn&) SAL_DELETED_FUNCTION; public: OXMLRowColumn( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index dce2020f56d4..58f78db1edef 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&); - void operator =(const OXMLCondPrtExpr&); + OXMLCondPrtExpr(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION; + void operator =(const OXMLCondPrtExpr&) SAL_DELETED_FUNCTION; public: OXMLCondPrtExpr( ORptFilter& _rImport diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 1030d02f12b1..4d4d13db4c7c 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -40,8 +40,8 @@ namespace rptxml ORptFilter& GetOwnImport(); ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); - OXMLControlProperty(const OXMLControlProperty&); - void operator =(const OXMLControlProperty&); + OXMLControlProperty(const OXMLControlProperty&) SAL_DELETED_FUNCTION; + void operator =(const OXMLControlProperty&) SAL_DELETED_FUNCTION; public: OXMLControlProperty( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 6742e34bf82d..d15bb0524cc0 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -73,7 +73,6 @@ void lcl_correctCellAddress(const OUString & _sName, const uno::Reference< xml:: ExportDocumentHandler::ExportDocumentHandler(uno::Reference< uno::XComponentContext > const & context) : m_xContext(context) - ,m_nCurrentCellIndex(0) ,m_nColumnCount(0) ,m_bTableRowsStarted(false) ,m_bFirstRowExported(false) diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index a210571fc7ee..a5b0a531515f 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 &); // not defined - void operator =(ExportDocumentHandler &); // not defined + ExportDocumentHandler(ExportDocumentHandler &) SAL_DELETED_FUNCTION; + void operator =(ExportDocumentHandler &) SAL_DELETED_FUNCTION; virtual ~ExportDocumentHandler(); @@ -88,7 +88,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider > m_xDatabaseDataProvider; ::com::sun::star::uno::Sequence< OUString > m_aColumns; - sal_Int32 m_nCurrentCellIndex; sal_Int32 m_nColumnCount; bool m_bTableRowsStarted; bool m_bFirstRowExported; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index bfcbdcb64d48..462dc19b00aa 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&); - OXMLFixedContent& operator =(const OXMLFixedContent&); + OXMLFixedContent(const OXMLFixedContent&) SAL_DELETED_FUNCTION; + OXMLFixedContent& operator =(const OXMLFixedContent&) SAL_DELETED_FUNCTION; public: OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index 78759cf1d25f..18d46fead2f9 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&); - void operator =(const OXMLFormatCondition&); + OXMLFormatCondition(const OXMLFormatCondition&) SAL_DELETED_FUNCTION; + void operator =(const OXMLFormatCondition&) SAL_DELETED_FUNCTION; public: OXMLFormatCondition( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 7d8cde07730b..f96f332d227a 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&); - void operator =(const OXMLFormattedField&); + OXMLFormattedField(const OXMLFormattedField&) SAL_DELETED_FUNCTION; + void operator =(const OXMLFormattedField&) SAL_DELETED_FUNCTION; public: OXMLFormattedField( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 2f70c58ddf79..67748d5e676a 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&); - void operator =(const OPropertyHandlerFactory&); + OPropertyHandlerFactory(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION; + void operator =(const OPropertyHandlerFactory&) SAL_DELETED_FUNCTION; 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 c7be45fe7fd1..7c12c48ec4bf 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&); - void operator =(const OXMLImage&); + OXMLImage(const OXMLImage&) SAL_DELETED_FUNCTION; + void operator =(const OXMLImage&) SAL_DELETED_FUNCTION; public: OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index d50dcecd5491..6b1a638ab5af 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 &); // not defined - void operator =(ImportDocumentHandler &); // not defined + ImportDocumentHandler(ImportDocumentHandler &) SAL_DELETED_FUNCTION; + void operator =(ImportDocumentHandler &) SAL_DELETED_FUNCTION; virtual ~ImportDocumentHandler(); diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index 875c39e0ec90..837669fc37b0 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&); - void operator =(const OXMLMasterFields&); + OXMLMasterFields(const OXMLMasterFields&) SAL_DELETED_FUNCTION; + void operator =(const OXMLMasterFields&) SAL_DELETED_FUNCTION; public: OXMLMasterFields( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index 39e5461f44b4..fcec77843e66 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&); - void operator =(const OXMLRptPropHdlFactory&); + OXMLRptPropHdlFactory(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION; + void operator =(const OXMLRptPropHdlFactory&) SAL_DELETED_FUNCTION; public: OXMLRptPropHdlFactory(); virtual ~OXMLRptPropHdlFactory(); diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 4fc6177eafa6..c517246fe042 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&); - void operator =(const OXMLReport&); + OXMLReport(const OXMLReport&) SAL_DELETED_FUNCTION; + void operator =(const OXMLReport&) SAL_DELETED_FUNCTION; public: OXMLReport( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 8e5b25da0b3e..a3f1fa961b5d 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&); - void operator =(const OXMLReportElement&); + OXMLReportElement(const OXMLReportElement&) SAL_DELETED_FUNCTION; + void operator =(const OXMLReportElement&) SAL_DELETED_FUNCTION; public: OXMLReportElement( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index efbe98db8f03..bf2025fe1df0 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&); - void operator =(const OXMLReportElementBase&); + OXMLReportElementBase(const OXMLReportElementBase&) SAL_DELETED_FUNCTION; + void operator =(const OXMLReportElementBase&) SAL_DELETED_FUNCTION; protected: ORptFilter& m_rImport; OXMLTable* m_pContainer; diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index ed2e20afd546..030f693c480c 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -58,7 +58,6 @@ OXMLSection::OXMLSection( ORptFilter& rImport, ,bool _bPageHeader) :SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_xSection(_xSection) -,m_bPageHeader(_bPageHeader) { OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 9f2107df70e4..676009029a20 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -30,11 +30,10 @@ namespace rptxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection; - bool m_bPageHeader; ORptFilter& GetOwnImport(); - OXMLSection(const OXMLSection&); - void operator =(const OXMLSection&); + OXMLSection(const OXMLSection&) SAL_DELETED_FUNCTION; + void operator =(const OXMLSection&) SAL_DELETED_FUNCTION; public: OXMLSection( ORptFilter& rImport diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 8ee64b0a3c93..b94085932fea 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -76,12 +76,9 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport, const Reference< XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), - sNumberFormat(OUString("NumberFormat")), pStyles(&rStyles), m_nNumberFormat(-1), - m_rImport(rImport), - bConditionalFormatCreated(false), - bParentSet(false) + m_rImport(rImport) { } diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 772a1e95fc00..54534c238f0c 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -40,19 +40,15 @@ namespace rptxml { OUString m_sDataStyleName; OUString sPageStyle; - const OUString sNumberFormat; SvXMLStylesContext* pStyles; // std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; sal_Int32 m_nNumberFormat; ORptFilter& m_rImport; - bool bConditionalFormatCreated : 1; - bool bParentSet : 1; ORptFilter& GetOwnImport() const { return m_rImport;} - OControlStyleContext(const OControlStyleContext&); - void operator =(const OControlStyleContext&); + OControlStyleContext(const OControlStyleContext&) SAL_DELETED_FUNCTION; + void operator =(const OControlStyleContext&) SAL_DELETED_FUNCTION; protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, @@ -108,8 +104,8 @@ namespace rptxml ORptFilter& GetOwnImport() const { return m_rImport;} - OReportStylesContext(const OReportStylesContext&); - void operator =(const OReportStylesContext&); + OReportStylesContext(const OReportStylesContext&) SAL_DELETED_FUNCTION; + void operator =(const OReportStylesContext&) SAL_DELETED_FUNCTION; protected: // Create a style context. diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index fe93a4b82cce..bf33064a561e 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -37,8 +37,8 @@ namespace rptxml sal_Int32 m_nCurrentCount; bool m_bContainsShape; - OXMLSubDocument(const OXMLSubDocument&); - void operator =(const OXMLSubDocument&); + OXMLSubDocument(const OXMLSubDocument&) SAL_DELETED_FUNCTION; + void operator =(const OXMLSubDocument&) SAL_DELETED_FUNCTION; 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 d8bbb3a9a6ab..c54674eb81a7 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&); - void operator =(const OXMLTable&); + OXMLTable(const OXMLTable&) SAL_DELETED_FUNCTION; + void operator =(const OXMLTable&) SAL_DELETED_FUNCTION; public: OXMLTable( ORptFilter& rImport diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 37664f27db99..e4e76283ca55 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -41,7 +41,6 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c : SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" + rDialog.toAsciiLowerCase() + ".ui", pAttr) - , rOutAttrs(*pAttr) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); assert(pFact && "Dialog creation failed!"); diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 14e08d3fb4aa..fba3c7abf59c 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -73,8 +73,8 @@ class OAddFieldWindow :public FloatingWindow DECL_LINK( OnSelectHdl, void* ); DECL_LINK( OnSortAction, ToolBox* ); - OAddFieldWindow(const OAddFieldWindow&); - void operator =(const OAddFieldWindow&); + OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION; + void operator =(const OAddFieldWindow&) SAL_DELETED_FUNCTION; 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 1dd15ba00f0b..e85da835e3df 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&); - void operator =(const OColorListener&); + OColorListener(const OColorListener&) SAL_DELETED_FUNCTION; + void operator =(const OColorListener&) SAL_DELETED_FUNCTION; protected: OModuleClient m_aModuleClient; Link m_aCollapsedLink; diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index ac6dc78c68e0..b1faf767eb65 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 &); // not defined - void operator =(DataProviderHandler &); // not defined + DataProviderHandler(DataProviderHandler &) SAL_DELETED_FUNCTION; + void operator =(DataProviderHandler &) SAL_DELETED_FUNCTION; 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 0421f6b25c7d..e03f3ed2b41c 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( CBClickHdl, CheckBox* ); - ODateTimeDialog(const ODateTimeDialog&); - void operator =(const ODateTimeDialog&); + ODateTimeDialog(const ODateTimeDialog&) SAL_DELETED_FUNCTION; + void operator =(const ODateTimeDialog&) SAL_DELETED_FUNCTION; // fill methods void InsertEntry(sal_Int16 _nNumberFormatId); diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index fffe7d1922be..61601eb249d5 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&); - DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&); + DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION; + DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) SAL_DELETED_FUNCTION; protected: virtual ~DefaultComponentInspectorModel(); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index c44b67abc966..fc951fd0827c 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -86,8 +86,8 @@ namespace rptui void ImplInitSettings(); - ODesignView(ODesignView&); - void operator =(ODesignView&); + ODesignView(ODesignView&) SAL_DELETED_FUNCTION; + void operator =(ODesignView&) SAL_DELETED_FUNCTION; 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 78a03b3761c0..5d09262e2c61 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&); - void operator =(OEndMarker&); + OEndMarker(OEndMarker&) SAL_DELETED_FUNCTION; + void operator =(OEndMarker&) SAL_DELETED_FUNCTION; protected: virtual void ImplInitSettings() SAL_OVERRIDE; public: diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 89e643291547..d71dd3dd215c 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 &); // not defined - void operator =(GeometryHandler &); // not defined + GeometryHandler(GeometryHandler &) SAL_DELETED_FUNCTION; + void operator =(GeometryHandler &) SAL_DELETED_FUNCTION; // 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 d3ab6bb50ef3..49b6ad0843a7 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -135,8 +135,8 @@ private: * */ void fillColumns(); - OGroupsSortingDialog(OGroupsSortingDialog&); - void operator =(OGroupsSortingDialog&); + OGroupsSortingDialog(OGroupsSortingDialog&) SAL_DELETED_FUNCTION; + void operator =(OGroupsSortingDialog&) SAL_DELETED_FUNCTION; protected: // OPropertyChangeListener virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 3d6ad6a19f01..5410de2cdb9e 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&); - void operator =(const ONavigator&); + ONavigator(const ONavigator&) SAL_DELETED_FUNCTION; + void operator =(const ONavigator&) SAL_DELETED_FUNCTION; public: ONavigator( vcl::Window* pParent ,OReportController& _rController); diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 2e987b0ea321..fcf6d6b24fe0 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&); - void operator =(const OPageNumberDialog&); + OPageNumberDialog(const OPageNumberDialog&) SAL_DELETED_FUNCTION; + void operator =(const OPageNumberDialog&) SAL_DELETED_FUNCTION; 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 f5ab78a4deb6..2c6c2215a0aa 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 &); // not defined - void operator =(ReportComponentHandler &); // not defined + ReportComponentHandler(ReportComponentHandler &) SAL_DELETED_FUNCTION; + void operator =(ReportComponentHandler &) SAL_DELETED_FUNCTION; diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index a1a1207790eb..786618c7b9ab 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&); - OXReportControllerObserver& operator=(const OXReportControllerObserver&); + OXReportControllerObserver(const OXReportControllerObserver&) SAL_DELETED_FUNCTION; + OXReportControllerObserver& operator=(const OXReportControllerObserver&) SAL_DELETED_FUNCTION; 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 075e56fa2f3c..bef2ae1e2ea4 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -55,7 +55,6 @@ namespace rptui DlgEdMode m_eMode; bool m_bDialogModelChanged; - bool m_bInDrag; /** fills the section with all control from the report section */ @@ -64,8 +63,8 @@ namespace rptui */ void impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_Int32 i_nLeftMargin,sal_Int32 i_nRightMargin); - OReportSection(OReportSection&); - void operator =(OReportSection&); + OReportSection(OReportSection&) SAL_DELETED_FUNCTION; + void operator =(OReportSection&) SAL_DELETED_FUNCTION; 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 171af0e38a37..60bdc486d32c 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -58,8 +58,8 @@ namespace rptui sal_Int32 GetTotalHeight() const; sal_Int32 impl_getRealPixelWidth() const; - OReportWindow(OReportWindow&); - void operator =(OReportWindow&); + OReportWindow(OReportWindow&) SAL_DELETED_FUNCTION; + void operator =(OReportWindow&) SAL_DELETED_FUNCTION; 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 1fd0ea9aa58d..f82a716e5376 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&); - void operator =(const OSectionUndo&); + OSectionUndo(const OSectionUndo&) SAL_DELETED_FUNCTION; + void operator =(const OSectionUndo&) SAL_DELETED_FUNCTION; 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&); - void operator =(const OReportSectionUndo&); + OReportSectionUndo(const OReportSectionUndo&) SAL_DELETED_FUNCTION; + void operator =(const OReportSectionUndo&) SAL_DELETED_FUNCTION; 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&); - void operator =(const OGroupSectionUndo&); + OGroupSectionUndo(const OGroupSectionUndo&) SAL_DELETED_FUNCTION; + void operator =(const OGroupSectionUndo&) SAL_DELETED_FUNCTION; 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 a8f214dbbeb2..ec5cc90d2439 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -62,8 +62,8 @@ namespace rptui void ImplInitSettings(); void impl_initScrollBar( ScrollBar& _rScrollBar ) const; - OScrollWindowHelper(OScrollWindowHelper&); - void operator =(OScrollWindowHelper&); + OScrollWindowHelper(OScrollWindowHelper&) SAL_DELETED_FUNCTION; + void operator =(OScrollWindowHelper&) SAL_DELETED_FUNCTION; 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 11651ab4072a..14de81adc63e 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -38,8 +38,8 @@ private: OReportSection* m_pSectionWindow; void ObjectRemovedInAliveMode( const SdrObject* pObject ); - OSectionView(const OSectionView&); - void operator =(const OSectionView&); + OSectionView(const OSectionView&) SAL_DELETED_FUNCTION; + void operator =(const OSectionView&) SAL_DELETED_FUNCTION; public: TYPEINFO_OVERRIDE(); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index e0398fde5fad..78890d5e9f90 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -56,8 +56,8 @@ namespace rptui ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pSectionMulti; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pGroupMulti; - OSectionWindow(OSectionWindow&); - void operator =(OSectionWindow&); + OSectionWindow(OSectionWindow&) SAL_DELETED_FUNCTION; + void operator =(OSectionWindow&) SAL_DELETED_FUNCTION; /** 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 d1604ae4a28e..e390024f51a9 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -45,8 +45,8 @@ namespace rptui void initDefaultNodeImages(); void setColor(); virtual void ImplInitSettings() SAL_OVERRIDE; - OStartMarker(OStartMarker&); - void operator =(OStartMarker&); + OStartMarker(OStartMarker&) SAL_DELETED_FUNCTION; + void operator =(OStartMarker&) SAL_DELETED_FUNCTION; 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 05d4aa4fb73c..ac6926178764 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -139,8 +139,8 @@ namespace rptui 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&); - void operator =(OViewsWindow&); + OViewsWindow(OViewsWindow&) SAL_DELETED_FUNCTION; + void operator =(OViewsWindow&) SAL_DELETED_FUNCTION; 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 9941c95479b3..b9d0275ce673 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&); - void operator =(const DlgEdFunc&); + DlgEdFunc(const DlgEdFunc&) SAL_DELETED_FUNCTION; + void operator =(const DlgEdFunc&) SAL_DELETED_FUNCTION; protected: OReportSection* m_pParent; OSectionView& m_rView; diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index a613cbb97326..5085aabc4dc1 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -31,10 +31,8 @@ namespace rptui class ORptPageDialog : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - - ORptPageDialog(const ORptPageDialog&); - void operator =(const ORptPageDialog&); + ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION; + void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION; public: ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog); diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 79f479cd790b..238aeb30da2c 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&); - void operator =(const OPropertyInfoService&); + OPropertyInfoService(const OPropertyInfoService&) SAL_DELETED_FUNCTION; + void operator =(const OPropertyInfoService&) SAL_DELETED_FUNCTION; 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 49d9a80c87f5..43ec71c790b2 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&); - void operator =(PropBrw&); + PropBrw(PropBrw&) SAL_DELETED_FUNCTION; + void operator =(PropBrw&) SAL_DELETED_FUNCTION; protected: virtual void Resize() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 8127988d1eb4..9b294b1302fd 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&); - void operator =(const OToolboxController&); + OToolboxController(const OToolboxController&) SAL_DELETED_FUNCTION; + void operator =(const OToolboxController&) SAL_DELETED_FUNCTION; public: OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); virtual ~OToolboxController(); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index e7e2f533ee2e..1a70619ecc33 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -88,7 +88,6 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re ,m_nPaintEntranceCount(0) ,m_eMode(RPTUI_SELECT) ,m_bDialogModelChanged(false) -,m_bInDrag(false) { //EnableChildTransparentMode(); SetHelpId(HID_REPORTSECTION); |