diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 20:43:37 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 22:14:59 +0000 |
commit | c27d0a583d5748bfe68bcf3be73a33e8d2823f8f (patch) | |
tree | 34e0b2ca915b5f7d6cc3aa7bc10bdaea00b3063b /editeng | |
parent | eee4dd746ea3fc09d51d008446ec82e3de456eed (diff) |
coverity#1355507 uninitialized scalar field
I think
commit b2fb84499e1f75735e8fd90bc2eece3fed9af5f6
Author: Noel Grandin <noel@peralex.com>
Date: Mon Mar 7 14:19:22 2016 +0200
loplugin:write only fields
wrong wrong and took out this param along with the unused nIndex
beside it
Change-Id: Idc34e03b5d59d4b0017fff456b79c807fda2535f
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 8 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.cxx | 8 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.hxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 00b0d146ade9..555bce1b34f5 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2408,7 +2408,7 @@ css::uno::Reference< css::datatransfer::XTransferable > // ====================== Virtual Methods ======================== void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int32, - const long*, const SvxFont&, sal_uInt8, + const long*, const SvxFont&, sal_Int32 /*nPara*/, sal_uInt8 /*nRightToLeft*/, const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool, const css::lang::Locale*, const Color&, const Color&) @@ -2417,7 +2417,7 @@ void EditEngine::DrawingText( const Point&, const OUString&, sal_Int32, sal_Int3 void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/, const OUString& /*rChar*/, const SvxFont& /*rFont*/, - sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/, + sal_Int32 /*nPara*/, sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/, bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/, const Color& /*rTextLineColor*/) { diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 520249619cb0..dac9f8b3ab18 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3344,7 +3344,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt // StripPortions() data callback GetEditEnginePtr()->DrawingText( aOutPos, aText, nTextStart, nTextLen, pDXArray, - aTmpFont, rTextPortion.GetRightToLeft(), + aTmpFont, n, rTextPortion.GetRightToLeft(), aWrongSpellVector.size() ? &aWrongSpellVector : nullptr, pFieldData, bEndOfLine, bEndOfParagraph, false, // support for EOL/EOP TEXT comments @@ -3574,7 +3574,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt GetEditEnginePtr()->DrawingTab( aTmpPos, rTextPortion.GetSize().Width(), OUString(rTextPortion.GetExtraValue()), - aTmpFont, rTextPortion.GetRightToLeft(), + aTmpFont, n, rTextPortion.GetRightToLeft(), bEndOfLine, bEndOfParagraph, aOverlineColor, aTextLineColor); } @@ -3592,7 +3592,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt GetEditEnginePtr()->DrawingText( aTmpPos, OUString(), 0, 0, nullptr, - aTmpFont, 0, + aTmpFont, n, 0, nullptr, nullptr, bEndOfLine, bEndOfParagraph, false, @@ -3649,7 +3649,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt GetEditEnginePtr()->DrawingText( aTmpPos, OUString(), 0, 0, nullptr, - aTmpFont, 0, + aTmpFont, n, 0, nullptr, nullptr, false, true, false, // support for EOL/EOP TEXT comments diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 8716b6bb478c..575bb5eee323 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -147,7 +147,7 @@ OUString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const } void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, - const long* pDXArray, const SvxFont& rFont, sal_uInt8 nRightToLeft, + const long* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -157,16 +157,16 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText const Color& rOverlineColor, const Color& rTextLineColor) { - pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nRightToLeft, + pOwner->DrawingText(rStartPos,rText,nTextStart,nTextLen,pDXArray,rFont,nPara,nRightToLeft, pWrongSpellVector, pFieldData, bEndOfLine, bEndOfParagraph, bEndOfBullet, pLocale, rOverlineColor, rTextLineColor); } void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, - const SvxFont& rFont, sal_uInt8 nRightToLeft, + const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, const Color& rTextLineColor) { - pOwner->DrawingTab(rStartPos, nWidth, rChar, rFont, nRightToLeft, + pOwner->DrawingTab(rStartPos, nWidth, rChar, rFont, nPara, nRightToLeft, bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor ); } diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index a042aee92873..04e44c2bcdff 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -46,7 +46,7 @@ public: virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont, - sal_uInt8 nRightToLeft, + sal_Int32 nPara, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -58,7 +58,7 @@ public: virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, - const SvxFont& rFont, sal_uInt8 nRightToLeft, + const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index f14053b73f34..257316810b28 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -983,7 +983,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, } DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().getLength(), pBuf.get(), - aSvxFont, bRightToLeftPara ? 1 : 0, nullptr, nullptr, false, false, true, nullptr, Color(), Color()); + aSvxFont, nPara, bRightToLeftPara ? 1 : 0, nullptr, nullptr, false, false, true, nullptr, Color(), Color()); } else { @@ -1702,7 +1702,7 @@ void Outliner::StripPortions() void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const long* pDXArray,const SvxFont& rFont, - sal_uInt8 nRightToLeft, + sal_Int32 nPara, sal_uInt8 nRightToLeft, const EEngineData::WrongSpellVector* pWrongSpellVector, const SvxFieldData* pFieldData, bool bEndOfLine, @@ -1714,7 +1714,7 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_I { if(aDrawPortionHdl.IsSet()) { - DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, pDXArray, pWrongSpellVector, + DrawPortionInfo aInfo( rStartPos, rText, nTextStart, nTextLen, rFont, nPara, pDXArray, pWrongSpellVector, pFieldData, pLocale, rOverlineColor, rTextLineColor, nRightToLeft, false, 0, bEndOfLine, bEndOfParagraph, bEndOfBullet); aDrawPortionHdl.Call( &aInfo ); @@ -1722,12 +1722,12 @@ void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_I } void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar, const SvxFont& rFont, - sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, + sal_Int32 nPara, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph, const Color& rOverlineColor, const Color& rTextLineColor) { if(aDrawPortionHdl.IsSet()) { - DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nullptr, nullptr, + DrawPortionInfo aInfo( rStartPos, rChar, 0, rChar.getLength(), rFont, nPara, nullptr, nullptr, nullptr, nullptr, rOverlineColor, rTextLineColor, nRightToLeft, true, nWidth, bEndOfLine, bEndOfParagraph, false); aDrawPortionHdl.Call( &aInfo ); |