From 4efae8d0f71120beb28126ba6063a80ce2e08c81 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Sat, 11 Nov 2017 09:20:52 +0100 Subject: clang-tidy modernize-use-equals-default in svtools no need to explicit delete SvtScriptedTextHelper_Impl assinment operator because it's implicit deleted anyway. Change-Id: I8463345e9035fc0466a22ed6648eb5b2614ed1b5 Reviewed-on: https://gerrit.libreoffice.org/44927 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/source/control/ctrlbox.cxx | 9 --------- svtools/source/control/scriptedtext.cxx | 20 -------------------- 2 files changed, 29 deletions(-) (limited to 'svtools/source/control') diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 43eb29469781..18f924ec1d2b 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -67,15 +67,6 @@ BorderWidthImpl::BorderWidthImpl( BorderWidthImplFlags nFlags, double nRate1, do { } -BorderWidthImpl& BorderWidthImpl::operator= ( const BorderWidthImpl& r ) -{ - m_nFlags = r.m_nFlags; - m_nRate1 = r.m_nRate1; - m_nRate2 = r.m_nRate2; - m_nRateGap = r.m_nRateGap; - return *this; -} - bool BorderWidthImpl::operator== ( const BorderWidthImpl& r ) const { return ( m_nFlags == r.m_nFlags ) && diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 16f737fd22a1..4a9b204646cf 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -46,9 +46,6 @@ private: vector< sal_Int32 > maWidthVec; /// The output width of each text portion. Size maTextSize; /// The size the text will take in the current output device. - /** Assignment operator not implemented to prevent usage. */ - SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) = delete; - /** Gets the font of the given script type. */ const vcl::Font& GetFont( sal_uInt16 _nScript ) const; /** Sets a font on the output device depending on the script type. */ @@ -66,9 +63,6 @@ public: /** This constructor sets an output device and fonts for all script types. */ explicit SvtScriptedTextHelper_Impl( OutputDevice& _rOutDevice ); - /** Copy constructor. */ - SvtScriptedTextHelper_Impl( - const SvtScriptedTextHelper_Impl& _rCopy ); /** Sets new fonts and recalculates the text width. */ void SetFonts( vcl::Font const * _pLatinFont, vcl::Font const * _pAsianFont, vcl::Font const * _pCmplxFont ); @@ -95,20 +89,6 @@ SvtScriptedTextHelper_Impl::SvtScriptedTextHelper_Impl( { } -SvtScriptedTextHelper_Impl::SvtScriptedTextHelper_Impl( const SvtScriptedTextHelper_Impl& _rCopy ) : - mrOutDevice( _rCopy.mrOutDevice ), - maLatinFont( _rCopy.maLatinFont ), - maAsianFont( _rCopy.maAsianFont ), - maCmplxFont( _rCopy.maCmplxFont ), - maDefltFont( _rCopy.maDefltFont ), - maText( _rCopy.maText ), - maPosVec( _rCopy.maPosVec ), - maScriptVec( _rCopy.maScriptVec ), - maWidthVec( _rCopy.maWidthVec ), - maTextSize( _rCopy.maTextSize ) -{ -} - const vcl::Font& SvtScriptedTextHelper_Impl::GetFont( sal_uInt16 _nScript ) const { switch( _nScript ) -- cgit