diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-30 13:57:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-01 08:13:06 +0100 |
| commit | e7f6fdd5c3805469e1905b11d11d9b01bef477a9 (patch) | |
| tree | 344fa8bceaad4eca3f4259eabafa86470c70fb51 /editeng | |
| parent | 7522dc0f5ce4774f8947e588cda5b32e24553b43 (diff) | |
loplugin:unusedfields
The mnRequestedLength fields in formula/ were introduced in
commit 6ef6dd0122b8e44d8547ec31f40def42173e4e41
Author: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Wed Feb 26 14:32:57 2014 -0500
Store the length of originally requested array size prior to
trimming.
but then partially removed in
commit d7f1f91b194da1cb96e66268ce7ef38602aa5754
Author: Noel Grandin <noel@peralex.com>
Date: Mon Mar 3 13:29:43 2014 +0200
remove unused code in formula/vectortoken
Change-Id: Ic56b6e42682131ee45df7838867145f980f3d601
Reviewed-on: https://gerrit.libreoffice.org/45571
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editdoc.hxx | 3 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 59ebecc11a32..45cd7f0bf907 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -483,7 +483,6 @@ private: sal_Int32 nEndPortion; sal_uInt16 nHeight; // Total height of the line sal_uInt16 nTxtHeight; // Pure Text height - sal_uInt16 nCrsrHeight; // For contour flow high lines => cursor is large. sal_uInt16 nMaxAscent; bool bHangingPunctuation:1; bool bInvalid:1; // for skillful formatting @@ -515,7 +514,7 @@ public: sal_Int32 GetEndPortion() const { return nEndPortion; } sal_Int32& GetEndPortion() { return nEndPortion; } - void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 ); + void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0 ); sal_uInt16 GetHeight() const { return nHeight; } sal_uInt16 GetTxtHeight() const { return nTxtHeight; } diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 5ef52667846a..8c84c685c956 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -926,7 +926,6 @@ EditLine::EditLine() : nEndPortion(0), nHeight(0), nTxtHeight(0), - nCrsrHeight(0), nMaxAscent(0), bHangingPunctuation(false), bInvalid(true) @@ -942,7 +941,6 @@ EditLine::EditLine( const EditLine& r ) : nEndPortion(r.nEndPortion), nHeight(0), nTxtHeight(0), - nCrsrHeight(0), nMaxAscent(0), bHangingPunctuation(r.bHangingPunctuation), bInvalid(true) @@ -966,7 +964,6 @@ EditLine* EditLine::Clone() const pL->nHeight = nHeight; pL->nTxtWidth = nTxtWidth; pL->nTxtHeight = nTxtHeight; - pL->nCrsrHeight = nCrsrHeight; pL->nMaxAscent = nMaxAscent; return pL; @@ -999,11 +996,10 @@ EditLine& EditLine::operator = ( const EditLine& r ) } -void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH, sal_uInt16 nCrsrH ) +void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH ) { nHeight = nH; nTxtHeight = ( nTxtH ? nTxtH : nH ); - nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight ); } void EditLine::SetStartPosX( long start ) diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index ee2dac949f40..3c990f25cb71 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1554,7 +1554,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) pLine->SetStartPosX( pLine->GetStartPosX() + nTextXOffset ); if ( nTextExtraYOffset ) { - pLine->SetHeight( (sal_uInt16) ( pLine->GetHeight() + nTextExtraYOffset ), 0, pLine->GetHeight() ); + pLine->SetHeight( (sal_uInt16) ( pLine->GetHeight() + nTextExtraYOffset ), 0 ); pLine->SetMaxAscent( (sal_uInt16) ( pLine->GetMaxAscent() + nTextExtraYOffset ) ); } } |