diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-16 10:11:04 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:19 -0400 |
commit | 2d2ae27b7e7aa147351655a40ed324b67cecf828 (patch) | |
tree | eb52bec1a946d147e3e8b9f3d5db6e250d533f85 /editeng | |
parent | c5cdfe39d3afca716e7b11f8f8e169ce378861ea (diff) |
update unusedmethods plugin to deal with constructors
and fix the operator< implementations in some of the other
plugins too.
Reviewed-on: https://gerrit.libreoffice.org/25057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 2c8fe2e737b84ecd3dbac36a4fe6bd061bbd3bae)
Change-Id: Ie5631e0cdc8d2a994ad2af2533cdb558a6cfc035
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.hxx | 28 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 1 | ||||
-rw-r--r-- | editeng/source/outliner/overflowingtxt.cxx | 6 |
3 files changed, 13 insertions, 22 deletions
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 5c419cd5c4a1..601e4bf37ab6 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -35,8 +35,6 @@ #include <memory> #include <vector> -#include <boost/noncopyable.hpp> - class ImpEditEngine; class SvxTabStop; @@ -82,10 +80,10 @@ struct ScriptTypePosInfo sal_Int32 nStartPos; sal_Int32 nEndPos; - ScriptTypePosInfo( short _Type, sal_Int32 _Start, sal_Int32 _End ) - : nScriptType(_Type) - , nStartPos(_Start) - , nEndPos(_End) + ScriptTypePosInfo( short Type, sal_Int32 Start, sal_Int32 End ) + : nScriptType(Type) + , nStartPos(Start) + , nEndPos(End) { } }; @@ -98,10 +96,10 @@ struct WritingDirectionInfo sal_Int32 nStartPos; sal_Int32 nEndPos; - WritingDirectionInfo( sal_uInt8 _Type, sal_Int32 _Start, sal_Int32 _End ) - : nType(_Type) - , nStartPos(_Start) - , nEndPos(_End) + WritingDirectionInfo( sal_uInt8 Type, sal_Int32 Start, sal_Int32 End ) + : nType(Type) + , nStartPos(Start) + , nEndPos(End) { } }; @@ -235,7 +233,7 @@ public: // class ContentNode -class ContentNode : boost::noncopyable +class ContentNode { private: OUString maString; @@ -249,6 +247,8 @@ public: ContentNode( SfxItemPool& rItemPool ); ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs ); ~ContentNode(); + ContentNode(const ContentNode&) = delete; + ContentNode& operator=(const ContentNode&) = delete; ContentAttribs& GetContentAttribs() { return aContentAttribs; } const ContentAttribs& GetContentAttribs() const { return aContentAttribs; } @@ -371,7 +371,6 @@ struct ExtraPortionInfo }; - // class TextPortion class TextPortion @@ -390,7 +389,7 @@ private: , nLen( 0 ) , aOutSz() , nKind( PortionKind::TEXT ) - , nRightToLeft( sal_False ) + , nRightToLeft( 0 ) , nExtraValue( 0 ) { } @@ -401,7 +400,7 @@ public: , nLen( nL ) , aOutSz( -1, -1 ) , nKind( PortionKind::TEXT ) - , nRightToLeft( sal_False ) + , nRightToLeft( 0 ) , nExtraValue( 0 ) { } @@ -554,7 +553,6 @@ public: }; - // class LineList class EditLineList diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index b71b0b17c103..b7c14a23d485 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -691,7 +691,6 @@ private: SpellInfo * CreateSpellInfo( bool bMultipleDocs ); - ImpEditEngine(); // disabled ImpEditEngine(EditEngine* pEditEngine, SfxItemPool* pPool); void InitDoc(bool bKeepParaAttribs); EditDoc& GetEditDoc() { return aEditDoc; } diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index ac88a3e4e966..09a98b43d15c 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -115,12 +115,6 @@ OverflowingText::OverflowingText(css::uno::Reference< css::datatransfer::XTransf // class NonOverflowingText -NonOverflowingText::NonOverflowingText(const EditTextObject * /*pTObj*/, bool bLastParaInterrupted) - : mbLastParaInterrupted(bLastParaInterrupted) -{ - // XXX: may have to delete pTObj -} - NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted) : maContentSel(aSel) , mbLastParaInterrupted(bLastParaInterrupted) |