diff options
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/AccessibleEditableTextPara.hxx | 4 | ||||
-rw-r--r-- | include/editeng/AccessibleImageBullet.hxx | 4 | ||||
-rw-r--r-- | include/editeng/AccessibleStaticTextBase.hxx | 4 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 4 | ||||
-rw-r--r-- | include/editeng/editobj.hxx | 2 | ||||
-rw-r--r-- | include/editeng/editview.hxx | 4 | ||||
-rw-r--r-- | include/editeng/hangulhanja.hxx | 4 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 6 | ||||
-rw-r--r-- | include/editeng/svxacorr.hxx | 4 | ||||
-rw-r--r-- | include/editeng/txtrange.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoedprx.hxx | 4 | ||||
-rw-r--r-- | include/editeng/unolingu.hxx | 8 |
12 files changed, 25 insertions, 25 deletions
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 6d48c27e6d73..5900e23194c6 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -286,8 +286,8 @@ namespace accessibility void TextChanged(); private: - AccessibleEditableTextPara( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION; - AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION; + AccessibleEditableTextPara( const AccessibleEditableTextPara& ) = delete; + AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) = delete; /** Calculate character range of similar attributes diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index d4caae753dce..ff0d25004dc6 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -148,8 +148,8 @@ namespace accessibility void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const; private: - AccessibleImageBullet( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION; - AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION; + AccessibleImageBullet( const AccessibleImageBullet& ) = delete; + AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete; // syntactic sugar for FireEvent void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const; diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 5682425d8619..b5918f21d44c 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -106,8 +106,8 @@ namespace accessibility virtual ~AccessibleStaticTextBase(); private: - AccessibleStaticTextBase( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION; - AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION; + AccessibleStaticTextBase( const AccessibleStaticTextBase& ) = delete; + AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) = delete; public: diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index a35a3424309d..da46fe6f5eba 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -158,8 +158,8 @@ public: private: ImpEditEngine* pImpEditEngine; - EditEngine( const EditEngine& ) SAL_DELETED_FUNCTION; - EditEngine& operator=( const EditEngine& ) SAL_DELETED_FUNCTION; + EditEngine( const EditEngine& ) = delete; + EditEngine& operator=( const EditEngine& ) = delete; EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL ); EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode); diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index a11d052bc48d..e07547ce312f 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -64,7 +64,7 @@ class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser EditTextObjectImpl* mpImpl; - EditTextObject& operator=( const EditTextObject& ) SAL_DELETED_FUNCTION; + EditTextObject& operator=( const EditTextObject& ) = delete; EditTextObject(); // disabled diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 210e816b2132..835e540ec5fc 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -93,8 +93,8 @@ private: ImpEditView* pImpEditView; OUString aDicNameSingle; - EditView( const EditView& ) SAL_DELETED_FUNCTION; - EditView& operator=( const EditView& ) SAL_DELETED_FUNCTION; + EditView( const EditView& ) = delete; + EditView& operator=( const EditView& ) = delete; public: EditView( EditEngine* pEng, vcl::Window* pWindow ); diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 1b9abb8e5cbf..0ee9113e140d 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -102,8 +102,8 @@ namespace editeng static bool m_bTryBothDirectionsSave; static ConversionDirection m_ePrimaryConversionDirectionSave; - HangulHanjaConversion (const HangulHanjaConversion &) SAL_DELETED_FUNCTION; - HangulHanjaConversion & operator= (const HangulHanjaConversion &) SAL_DELETED_FUNCTION; + HangulHanjaConversion (const HangulHanjaConversion &) = delete; + HangulHanjaConversion & operator= (const HangulHanjaConversion &) = delete; public: HangulHanjaConversion( diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 69ccb523fbe0..b996ef2cd08e 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -137,7 +137,7 @@ private: friend class OutlinerUndoCheckPara; friend class OutlinerUndoChangeParaFlags; - Paragraph& operator=(const Paragraph& rPara ) SAL_DELETED_FUNCTION; + Paragraph& operator=(const Paragraph& rPara ) = delete; ParaFlag nFlags; OUString aBulText; @@ -151,7 +151,7 @@ private: const OUString& GetText() const { return aBulText; } Paragraph( sal_Int16 nDepth ); - Paragraph( const Paragraph& ) SAL_DELETED_FUNCTION; + Paragraph( const Paragraph& ) = delete; Paragraph( const ParagraphData& ); ~Paragraph(); @@ -506,7 +506,7 @@ private: sal_Int32 nPos; bool bSimpleClick; - EditFieldInfo( const EditFieldInfo& ) SAL_DELETED_FUNCTION; + EditFieldInfo( const EditFieldInfo& ) = delete; SdrPage* mpSdrPage; diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 0f8a46760607..3e5399df97ab 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -136,8 +136,8 @@ class EDITENG_DLLPUBLIC SvxAutocorrWordList struct Impl; Impl* mpImpl; - SvxAutocorrWordList( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION; - const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION; + SvxAutocorrWordList( const SvxAutocorrWordList& ) = delete; + const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) = delete; const SvxAutocorrWord* WordMatches(const SvxAutocorrWord *pFnd, const OUString &rTxt, diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index 2069152a58c9..09897e0904ee 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -57,7 +57,7 @@ class EDITENG_DLLPUBLIC TextRanger // FALSE: Objekt flow (StarWriter); bool bVertical :1;// for vertical writing mode - TextRanger( const TextRanger& ) SAL_DELETED_FUNCTION; + TextRanger( const TextRanger& ) = delete; const Rectangle& _GetBoundRect(); public: TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 90071d52a5e7..9d61c2b01956 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -156,8 +156,8 @@ public: bool IsValid() const { return mbEditSourceValid;} private: - SvxEditSourceAdapter( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION; - SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION; + SvxEditSourceAdapter( const SvxEditSourceAdapter& ) = delete; + SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) = delete; ::std::unique_ptr< SvxEditSource > mpAdaptee; diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index 06e890081bd4..113d1b35b8ca 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -81,8 +81,8 @@ class EDITENG_DLLPUBLIC LinguMgr static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetChangeAll(); - LinguMgr(const LinguMgr &) SAL_DELETED_FUNCTION; - LinguMgr & operator = (const LinguMgr &) SAL_DELETED_FUNCTION; + LinguMgr(const LinguMgr &) = delete; + LinguMgr & operator = (const LinguMgr &) = delete; public: @@ -146,8 +146,8 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList; - SvxDicListChgClamp(const SvxDicListChgClamp &) SAL_DELETED_FUNCTION; - SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) SAL_DELETED_FUNCTION; + SvxDicListChgClamp(const SvxDicListChgClamp &) = delete; + SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) = delete; public: SvxDicListChgClamp( ::com::sun::star::uno::Reference< |