diff options
Diffstat (limited to 'reportdesign/source/ui')
26 files changed, 56 insertions, 56 deletions
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(); |