summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-07 12:13:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-07 12:35:58 +0100
commit5efac16be63274ff5e578cb3406accf75ae0f174 (patch)
tree345faf1748cfc9747f1ea8b4cc456c122a4f0401 /include
parent913b112d952d21913cb407fc5138681c10d587e4 (diff)
loplugin:deletedspecial
Change-Id: Ia5cdc216ef4e5ebb11709fa1079e70c9ac2ff360
Diffstat (limited to 'include')
-rw-r--r--include/editeng/AccessibleEditableTextPara.hxx6
-rw-r--r--include/editeng/AccessibleImageBullet.hxx8
-rw-r--r--include/editeng/AccessibleStaticTextBase.hxx7
-rw-r--r--include/editeng/editeng.hxx4
-rw-r--r--include/editeng/editobj.hxx2
-rw-r--r--include/editeng/editview.hxx4
-rw-r--r--include/editeng/hangulhanja.hxx5
-rw-r--r--include/editeng/outliner.hxx7
-rw-r--r--include/editeng/svxacorr.hxx4
-rw-r--r--include/editeng/txtrange.hxx2
-rw-r--r--include/editeng/unoedprx.hxx5
-rw-r--r--include/editeng/unolingu.hxx10
12 files changed, 25 insertions, 39 deletions
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 0ee06eff2451..337f97a0d8a7 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -286,10 +286,8 @@ namespace accessibility
void TextChanged();
private:
-
- // declared, but not defined
- AccessibleEditableTextPara( const AccessibleEditableTextPara& );
- AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& );
+ AccessibleEditableTextPara( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION;
+ AccessibleEditableTextPara& operator= ( const AccessibleEditableTextPara& ) SAL_DELETED_FUNCTION;
/** Calculate character range of similar attributes
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 909081153b81..9e55e69bd9a7 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -148,10 +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:
-
- // declared, but not defined
- AccessibleImageBullet( const AccessibleImageBullet& );
- AccessibleImageBullet& operator= ( const AccessibleImageBullet& );
+ AccessibleImageBullet( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION;
+ AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) SAL_DELETED_FUNCTION;
// syntactic sugar for FireEvent
void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
@@ -200,8 +198,6 @@ namespace accessibility
// the current state set (updated from SetState/UnSetState and guarded by solar mutex)
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet;
- mutable osl::Mutex maMutex;
-
/// The shape we're the accessible for (unguarded)
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index a6c84404e46f..5682425d8619 100644
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@@ -106,11 +106,8 @@ namespace accessibility
virtual ~AccessibleStaticTextBase();
private:
-
- // declared, but not defined
- EDITENG_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
- // declared, but not defined
- EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
+ AccessibleStaticTextBase( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION;
+ AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ) SAL_DELETED_FUNCTION;
public:
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 3bff7c932dc6..89b5ce33fccb 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -140,8 +140,8 @@ public:
private:
ImpEditEngine* pImpEditEngine;
- EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
- EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& );
+ EditEngine( const EditEngine& ) SAL_DELETED_FUNCTION;
+ EditEngine& operator=( const EditEngine& ) SAL_DELETED_FUNCTION;
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 62263f165d2c..09c757402cf8 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -63,7 +63,7 @@ class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser
EditTextObjectImpl* mpImpl;
- EDITENG_DLLPRIVATE EditTextObject& operator=( const EditTextObject& );
+ EditTextObject& operator=( const EditTextObject& ) SAL_DELETED_FUNCTION;
EditTextObject(); // disabled
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index cf26a6250b68..3f7c637f153f 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -81,8 +81,8 @@ private:
ImpEditView* pImpEditView;
OUString aDicNameSingle;
- EDITENG_DLLPRIVATE EditView( const EditView& );
- EDITENG_DLLPRIVATE EditView& operator=( const EditView& );
+ EditView( const EditView& ) SAL_DELETED_FUNCTION;
+ EditView& operator=( const EditView& ) SAL_DELETED_FUNCTION;
public:
EditView( EditEngine* pEng, vcl::Window* pWindow );
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index ec765dcc4e98..41e47c60f9e8 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -102,9 +102,8 @@ namespace editeng
static bool m_bTryBothDirectionsSave;
static ConversionDirection m_ePrimaryConversionDirectionSave;
- // Forbidden and not implemented.
- HangulHanjaConversion (const HangulHanjaConversion &);
- HangulHanjaConversion & operator= (const HangulHanjaConversion &);
+ HangulHanjaConversion (const HangulHanjaConversion &) SAL_DELETED_FUNCTION;
+ HangulHanjaConversion & operator= (const HangulHanjaConversion &) SAL_DELETED_FUNCTION;
public:
HangulHanjaConversion(
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 836ad0665d3f..075fdebf148f 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -120,7 +120,7 @@ private:
friend class OutlinerUndoCheckPara;
friend class OutlinerUndoChangeParaFlags;
- Paragraph& operator=(const Paragraph& rPara );
+ Paragraph& operator=(const Paragraph& rPara ) SAL_DELETED_FUNCTION;
sal_uInt16 nFlags;
OUString aBulText;
@@ -134,7 +134,7 @@ private:
const OUString& GetText() const { return aBulText; }
Paragraph( sal_Int16 nDepth );
- Paragraph( const Paragraph& );
+ Paragraph( const Paragraph& ) SAL_DELETED_FUNCTION;
Paragraph( const ParagraphData& );
~Paragraph();
@@ -482,8 +482,7 @@ private:
sal_Int32 nPos;
bool bSimpleClick;
- EditFieldInfo();
- EditFieldInfo( const EditFieldInfo& );
+ EditFieldInfo( const EditFieldInfo& ) SAL_DELETED_FUNCTION;
SdrPage* mpSdrPage;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 9342c0f00a05..98510fc1880a 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -135,8 +135,8 @@ class EDITENG_DLLPUBLIC SvxAutocorrWordList
struct Impl;
Impl* mpImpl;
- SvxAutocorrWordList( const SvxAutocorrWordList& ); // disabled
- const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ); // disabled
+ SvxAutocorrWordList( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION;
+ const SvxAutocorrWordList& operator= ( const SvxAutocorrWordList& ) SAL_DELETED_FUNCTION;
const SvxAutocorrWord* WordMatches(const SvxAutocorrWord *pFnd,
const OUString &rTxt,
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 8fe6b4f2bb5d..f37d835724d5 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& ); // not implemented
+ TextRanger( const TextRanger& ) SAL_DELETED_FUNCTION;
const Rectangle& _GetBoundRect();
public:
TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index b135c7e7a1d6..90071d52a5e7 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -156,9 +156,8 @@ public:
bool IsValid() const { return mbEditSourceValid;}
private:
- // declared, but not defined
- SvxEditSourceAdapter( const SvxEditSourceAdapter& );
- SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& );
+ SvxEditSourceAdapter( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION;
+ SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ) SAL_DELETED_FUNCTION;
::std::unique_ptr< SvxEditSource > mpAdaptee;
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 72d1567e7b9e..2b35bed79c3d 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -80,9 +80,8 @@ class EDITENG_DLLPUBLIC LinguMgr
static ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionary > GetChangeAll();
- // disallow access to copy-constructor and assignment-operator
- LinguMgr(const LinguMgr &);
- LinguMgr & operator = (const LinguMgr &);
+ LinguMgr(const LinguMgr &) SAL_DELETED_FUNCTION;
+ LinguMgr & operator = (const LinguMgr &) SAL_DELETED_FUNCTION;
public:
@@ -146,9 +145,8 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > xDicList;
- // disallow access to copy-constructor and assignment-operator
- EDITENG_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
- EDITENG_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
+ SvxDicListChgClamp(const SvxDicListChgClamp &) SAL_DELETED_FUNCTION;
+ SvxDicListChgClamp & operator = (const SvxDicListChgClamp &) SAL_DELETED_FUNCTION;
public:
SvxDicListChgClamp( ::com::sun::star::uno::Reference<