diff options
Diffstat (limited to 'include/svx')
23 files changed, 52 insertions, 52 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 45b1d0a8897c..e29b5a7a1bdc 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -193,9 +193,9 @@ private: bool m_bWaitingForControl : 1; // if we are created before our control exists, we need to wait for it to appear ... private: - AccessibleControlShape(const AccessibleControlShape&) SAL_DELETED_FUNCTION; + AccessibleControlShape(const AccessibleControlShape&) = delete; - AccessibleControlShape& operator= (const AccessibleControlShape&) SAL_DELETED_FUNCTION; + AccessibleControlShape& operator= (const AccessibleControlShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index d4b88080ecfe..45dcfa394ab2 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -99,9 +99,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - AccessibleGraphicShape (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION; + AccessibleGraphicShape (const AccessibleGraphicShape&) = delete; - AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) SAL_DELETED_FUNCTION; + AccessibleGraphicShape& operator= (const AccessibleGraphicShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 5ff85ada3468..082d6f647b20 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -105,9 +105,9 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - AccessibleOLEShape (const AccessibleOLEShape&) SAL_DELETED_FUNCTION; + AccessibleOLEShape (const AccessibleOLEShape&) = delete; - AccessibleOLEShape& operator= (const AccessibleOLEShape&) SAL_DELETED_FUNCTION; + AccessibleOLEShape& operator= (const AccessibleOLEShape&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 495c3c1bd652..1cfd86c2c0e8 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -459,8 +459,8 @@ protected: void UpdateStates(); private: - AccessibleShape (const AccessibleShape&) SAL_DELETED_FUNCTION; - AccessibleShape& operator= (const AccessibleShape&) SAL_DELETED_FUNCTION; + AccessibleShape (const AccessibleShape&) = delete; + AccessibleShape& operator= (const AccessibleShape&) = delete; //Old accessible name OUString aAccName; diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx index 0c75bc914b9b..1d99e9289d38 100644 --- a/include/svx/AccessibleShapeInfo.hxx +++ b/include/svx/AccessibleShapeInfo.hxx @@ -91,7 +91,7 @@ public: AccessibleShapeInfo (const AccessibleShapeInfo&); private: - AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) SAL_DELETED_FUNCTION; + AccessibleShapeInfo& operator= (const AccessibleShapeInfo&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 668574f5f61e..516561198998 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -197,8 +197,8 @@ protected: ChildrenManagerImpl* mpImpl; private: - ChildrenManager (const ChildrenManager&) SAL_DELETED_FUNCTION; - ChildrenManager& operator= (const ChildrenManager&) SAL_DELETED_FUNCTION; + ChildrenManager (const ChildrenManager&) = delete; + ChildrenManager& operator= (const ChildrenManager&) = delete; }; } // end of namespace accessibility diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 9f4f464e7133..8f0691001156 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -195,8 +195,8 @@ private: // supposed to be a singleton FunctionParser(); - FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION; - FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION; + FunctionParser(const FunctionParser&) = delete; + FunctionParser& operator=( const FunctionParser& ) = delete; }; } diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 22600859db21..129bc8042b58 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -42,8 +42,8 @@ private: bool m_bOpenInDesignMode : 1; bool m_bAutoControlFocus : 1; - FmFormModel( const FmFormModel& ) SAL_DELETED_FUNCTION; - void operator=(const FmFormModel& rSrcModel) SAL_DELETED_FUNCTION; + FmFormModel( const FmFormModel& ) = delete; + void operator=(const FmFormModel& rSrcModel) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 49fb5643c34e..1bf169e81e04 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -40,7 +40,7 @@ class HelpEvent; class SVX_DLLPUBLIC FmFormPage : public SdrPage { - FmFormPage& operator=(const FmFormPage&) SAL_DELETED_FUNCTION; + FmFormPage& operator=(const FmFormPage&) = delete; friend class FmFormObj; FmFormPageImpl* m_pImpl; diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 0fcee6f39b2b..27cb49dc54fc 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -58,8 +58,8 @@ SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 class SVX_DLLPUBLIC SvxLanguageBoxBase { private: - SvxLanguageBoxBase(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION; - SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION; + SvxLanguageBoxBase(const SvxLanguageBoxBase&) = delete; + SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) = delete; public: explicit SvxLanguageBoxBase( bool bCheck ); virtual ~SvxLanguageBoxBase(); diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index a4c97f6be210..f7c4125fd1af 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -78,7 +78,7 @@ public: class E3dObjList : public SdrObjList { - E3dObjList &operator=(const E3dObjList& rSrcList) SAL_DELETED_FUNCTION; + E3dObjList &operator=(const E3dObjList& rSrcList) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 8c75da3af07a..42863867fd60 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) SAL_DELETED_FUNCTION; + const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; public: TYPEINFO_OVERRIDE(); @@ -76,7 +76,7 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) SAL_DELETED_FUNCTION; + const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; public: TYPEINFO_OVERRIDE(); @@ -108,7 +108,7 @@ protected: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: - const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) SAL_DELETED_FUNCTION; + const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; public: TYPEINFO_OVERRIDE(); SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); @@ -234,7 +234,7 @@ protected: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; private: - const SvxObjectItem &operator=(const SvxObjectItem &) SAL_DELETED_FUNCTION; + const SvxObjectItem &operator=(const SvxObjectItem &) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index b7be54cad695..d25613a1fa80 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -53,8 +53,8 @@ namespace sdr , public salhelper::SimpleReferenceObject { private: - OverlayManager(const OverlayManager&) SAL_DELETED_FUNCTION; - OverlayManager& operator=(const OverlayManager&) SAL_DELETED_FUNCTION; + OverlayManager(const OverlayManager&) = delete; + OverlayManager& operator=(const OverlayManager&) = delete; protected: // the OutputDevice to work on, set on construction and not to be changed diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 9b3a7585d0ea..36bd20868354 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -54,8 +54,8 @@ namespace sdr class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event { private: - OverlayObject(const OverlayObject&) SAL_DELETED_FUNCTION; - OverlayObject& operator=(const OverlayObject&) SAL_DELETED_FUNCTION; + OverlayObject(const OverlayObject&) = delete; + OverlayObject& operator=(const OverlayObject&) = delete; // Manager is allowed access to private Member mpOverlayManager friend class OverlayManager; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 1df8742c0605..59428d9ebdee 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -114,8 +114,8 @@ public: bool isColumnHeader(); sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); } private: - SvxTableController(SvxTableController &) SAL_DELETED_FUNCTION; - void operator =(SvxTableController &) SAL_DELETED_FUNCTION; + SvxTableController(SvxTableController &) = delete; + void operator =(SvxTableController &) = delete; // internals SVX_DLLPRIVATE void ApplyBorderAttr( const SfxItemSet& rAttr ); diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index eec99df167bf..a00a0b96703a 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -47,7 +47,7 @@ namespace sdr // ViewContact part sdr::contact::ViewContact* mpViewContact; - void operator=(const MasterPageDescriptor& rCandidate) SAL_DELETED_FUNCTION; + void operator=(const MasterPageDescriptor& rCandidate) = delete; protected: sdr::contact::ViewContact* CreateObjectSpecificViewContact(); diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index 16cce1c9bf28..48845fbc3ed6 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -49,8 +49,8 @@ class SVX_DLLPUBLIC SdrPageWindow Impl* mpImpl; - SdrPageWindow( const SdrPageWindow& ) SAL_DELETED_FUNCTION; - SdrPageWindow& operator= ( const SdrPageWindow& ) SAL_DELETED_FUNCTION; + SdrPageWindow( const SdrPageWindow& ) = delete; + SdrPageWindow& operator= ( const SdrPageWindow& ) = delete; public: SdrPageWindow(SdrPageView& rNewPageView, SdrPaintWindow& rPaintWindow); diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index a12a991c536e..3095872570a7 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -80,8 +80,8 @@ namespace svx protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } - PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION; - PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + PropertyValueProvider(const PropertyValueProvider&) = delete; + PropertyValueProvider& operator=(const PropertyValueProvider&) = delete; private: ::cppu::OWeakObject& m_rContext; @@ -129,8 +129,8 @@ namespace svx void disposing(); private: - PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; - PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + PropertyChangeNotifier(const PropertyChangeNotifier&) = delete; + PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) = delete; std::unique_ptr< PropertyChangeNotifier_Data > m_xData; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 890a72ab3427..00ecc3831690 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -66,8 +66,8 @@ public: void Disconnect(); private: - SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; - SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; + SelectionChangeHandler(const SelectionChangeHandler&) = delete; + SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete; const std::function<rtl::OUString ()> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 6379540c2dda..e467525eab3d 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -260,9 +260,9 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); private: - SdrModel(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION; - void operator=(const SdrModel& rSrcModel) SAL_DELETED_FUNCTION; - bool operator==(const SdrModel& rCmpModel) const SAL_DELETED_FUNCTION; + SdrModel(const SdrModel& rSrcModel) = delete; + void operator=(const SdrModel& rSrcModel) = delete; + bool operator==(const SdrModel& rCmpModel) const = delete; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false ); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 545a3fb61e78..7b498af21124 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -191,9 +191,9 @@ protected: sal_uInt16 nVersion; private: - void operator=(const SdrObjUserData& rData) SAL_DELETED_FUNCTION; - bool operator==(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION; - bool operator!=(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION; + void operator=(const SdrObjUserData& rData) = delete; + bool operator==(const SdrObjUserData& rData) const = delete; + bool operator!=(const SdrObjUserData& rData) const = delete; public: SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer); @@ -265,7 +265,7 @@ private: struct Impl; Impl* mpImpl; - SdrObject( const SdrObject& ) SAL_DELETED_FUNCTION; + SdrObject( const SdrObject& ) = delete; public: void AddObjectUser(sdr::ObjectUser& rNewUser); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 6140c386492c..f3ecc7a47537 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { - SdrVirtObj( const SdrVirtObj& ) SAL_DELETED_FUNCTION; + SdrVirtObj( const SdrVirtObj& ) = delete; public: virtual sdr::properties::BaseProperties& GetProperties() const SAL_OVERRIDE; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 20a7fce3ad65..470c11a1fbaa 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -76,8 +76,8 @@ public: class SVX_DLLPUBLIC SdrObjList { - SdrObjList(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION; - SdrObjList &operator=(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION; + SdrObjList(const SdrObjList& rSrcList) = delete; + SdrObjList &operator=(const SdrObjList& rSrcList) = delete; private: ::std::vector<SdrObject*> maList; @@ -313,8 +313,8 @@ public: class SVX_DLLPUBLIC SdrPageGridFrameList { std::vector<SdrPageGridFrame*> aList; private: - SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION; - void operator=(const SdrPageGridFrameList& rSrcList) SAL_DELETED_FUNCTION; + SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList) = delete; + void operator=(const SdrPageGridFrameList& rSrcList) = delete; protected: SdrPageGridFrame* GetObject(sal_uInt16 i) const { return aList[i]; } public: @@ -342,7 +342,7 @@ private: void ImpRemoveStyleSheet(); void ImpAddStyleSheet(SfxStyleSheet& rNewStyleSheet); - SdrPageProperties& operator=(const SdrPageProperties& rCandidate) SAL_DELETED_FUNCTION; + SdrPageProperties& operator=(const SdrPageProperties& rCandidate) = delete; public: // construct/destruct @@ -377,7 +377,7 @@ public: */ class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage > { - SdrPage& operator=(const SdrPage& rSrcPage) SAL_DELETED_FUNCTION; + SdrPage& operator=(const SdrPage& rSrcPage) = delete; // start PageUser section private: |