From 6f96e86dae6e8fd0861848bbb396278831afc01d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 18 Oct 2016 14:19:52 +0200
Subject: loplugin:expandablemethodds in editeng..extensions
Change-Id: Ibe1929d74ff460955e39f2ccce3056b2051ddf08
Reviewed-on: https://gerrit.libreoffice.org/30013
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
editeng/source/editeng/eertfpar.cxx | 2 +-
editeng/source/editeng/eertfpar.hxx | 2 --
editeng/source/editeng/impedit.cxx | 2 +-
editeng/source/editeng/impedit.hxx | 1 -
editeng/source/misc/hangulhanja.cxx | 4 +---
editeng/source/misc/txtrange.cxx | 6 ++----
editeng/source/uno/unoedprx.cxx | 3 +--
7 files changed, 6 insertions(+), 14 deletions(-)
(limited to 'editeng')
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 19a4225073db..65e24dd5adf0 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -147,7 +147,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
MapMode _aEditMapMode(mpEditEngine->GetRefDevice()->GetMapMode().GetMapUnit());
aSz = mpEditEngine->GetRefDevice()->LogicToLogic(aSz, &aPntMode, &_aEditMapMode);
SvxFontHeightItem aFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT );
- vcl::Font aDefFont( GetDefFont() );
+ vcl::Font aDefFont( GetFont( nDefFont ) );
SvxFontItem aFontItem( aDefFont.GetFamilyType(), aDefFont.GetFamilyName(),
aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 250000a8b7cc..16eff0da1d04 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -63,8 +63,6 @@ public:
virtual SvParserState CallParser() override;
- vcl::Font GetDefFont() { return GetFont( nDefFont ); }
-
EditPaM GetCurPaM() const { return aCurSel.Max(); }
};
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index f23bd81943e5..eeacfe0bdb4c 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -196,7 +196,7 @@ void lcl_translateTwips(vcl::Window& rParent, vcl::Window& rChild)
void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, OutputDevice* pTargetDevice )
{
- if ( GetSelectionMode() == EE_SELMODE_HIDDEN )
+ if ( eSelectionMode == EE_SELMODE_HIDDEN )
return;
// It must be ensured before rendering the selection, that the contents of
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 0a9dfb547bb8..1771aac97ebb 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -325,7 +325,6 @@ public:
vcl::Window* GetWindow() const { return pOutWin; }
- EESelectionMode GetSelectionMode() const { return eSelectionMode; }
void SetSelectionMode( EESelectionMode eMode );
inline const Pointer& GetPointer();
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 00b0da046717..41d351af4f8b 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -131,8 +131,6 @@ namespace editeng
public:
void DoDocumentConversion( );
- inline bool IsByCharacter( ) const { return m_bByCharacter; }
-
inline bool IsValid() const { return m_xConverter.is(); }
inline LanguageType GetSourceLang() const { return m_nSourceLang; }
@@ -328,7 +326,7 @@ namespace editeng
sal_Int32 nLength = m_sCurrentPortion.getLength() - nStartSearch;
m_nCurrentConversionType = implGetConversionType();
- m_nCurrentConversionOption = IsByCharacter() ? CHARACTER_BY_CHARACTER : css::i18n::TextConversionOption::NONE;
+ m_nCurrentConversionOption = m_bByCharacter ? CHARACTER_BY_CHARACTER : css::i18n::TextConversionOption::NONE;
if( m_bIgnorePostPositionalWord )
m_nCurrentConversionOption = m_nCurrentConversionOption | IGNORE_POST_POSITIONAL_WORD;
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index e5b798c16315..a5e80f84af74 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -139,8 +139,6 @@ public:
void Concat( const tools::PolyPolygon* pPoly );
// inlines
void NoteLast() { if( bMultiple ) NoteRange( nAct == nFirst ); }
- void SetClosed( const bool bNew ){ bClosed = bNew; }
- bool IsClosed() const { return bClosed; }
void SetConcat( const bool bNew ){ bConcat = bNew; }
bool IsConcat() const { return bConcat; }
};
@@ -311,7 +309,7 @@ void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly )
if( nCount )
{
const Point& rNull = rPol[ 0 ];
- SetClosed( IsConcat() || ( rNull == rPol[ nCount - 1 ] ) );
+ bClosed = IsConcat() || ( rNull == rPol[ nCount - 1 ] );
nLast = Area( rNull );
if( nLast & 12 )
{
@@ -393,7 +391,7 @@ void SvxBoundArgs::Calc( const tools::PolyPolygon& rPoly )
NoteFarPoint( A(rNext), B(rNext)-nUpper, nUpDiff );
}
nLast = nNext;
- if( ++nIdx == nCount && !IsClosed() )
+ if( ++nIdx == nCount && !bClosed )
{
if( !( nNext & 12 ) )
NoteLast();
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 86e30b776521..5a47cb202eea 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -103,7 +103,6 @@ public:
void SetBulletOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnBulletOffset = nOffset; mnBulletLen = nLen; }
sal_Int32 GetBulletOffset() const { return mnBulletOffset; }
sal_Int32 GetBulletLen() const { return mnBulletLen; }
- void AreInBullet() { mbInBullet = true; }
bool InBullet() const { return mbInBullet; }
/// returns false if the given range is non-editable (e.g. contains bullets or _parts_ of fields)
@@ -245,7 +244,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
if( nIndex < nBulletLen )
{
- AreInBullet();
+ mbInBullet = true;
SetBulletOffset( nIndex, nBulletLen );
mnEEIndex = 0;
return;
--
cgit