summaryrefslogtreecommitdiff
path: root/editeng/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-03-10 20:43:37 +0000
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:28 -0400
commita84e0049ddc48bbdb6f23ad5be570bc8dff657e1 (patch)
treea9d4f5bebb417bed03f541d9ef444555c488ffd5 /editeng/source
parent3ded6117176a474588914a02bae3265aa3d58f12 (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 (cherry picked from commit c27d0a583d5748bfe68bcf3be73a33e8d2823f8f)
Diffstat (limited to 'editeng/source')
-rw-r--r--editeng/source/editeng/editeng.cxx5
-rw-r--r--editeng/source/editeng/impedit3.cxx8
-rw-r--r--editeng/source/outliner/outleeng.cxx4
-rw-r--r--editeng/source/outliner/outleeng.hxx16
4 files changed, 16 insertions, 17 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index ce83201e7a9e..39902418c47f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2412,7 +2412,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_Int32, sal_Int32, 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&)
@@ -2421,8 +2421,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_Int32 /*nPara*/, sal_Int32 /*nIndex*/,
- 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 f8bd382a98d3..ad58252a41c4 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, n, nIndex, 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, n, nIndex, 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, n, nIndex, 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, n, nIndex, 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 55527c4966be..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_Int32 nPara, sal_Int32 /*nIndex*/, sal_uInt8 nRightToLeft,
+ const long* pDXArray, const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@@ -162,7 +162,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const OUString& rText
}
void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
- const SvxFont& rFont, sal_Int32 nPara, sal_Int32 /*nIndex*/, sal_uInt8 nRightToLeft,
+ const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor)
{
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 02786bebe97f..04e44c2bcdff 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -46,19 +46,19 @@ public:
virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart,
sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont,
- sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+ sal_Int32 nPara, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
- bool bEndOfLine,
- bool bEndOfParagraph,
- bool bEndOfBullet,
- const css::lang::Locale* pLocale,
- const Color& rOverlineColor,
- const Color& rTextLineColor) override;
+ bool bEndOfLine,
+ bool bEndOfParagraph,
+ bool bEndOfBullet,
+ const css::lang::Locale* pLocale,
+ const Color& rOverlineColor,
+ const Color& rTextLineColor) override;
virtual void DrawingTab(
const Point& rStartPos, long nWidth, const OUString& rChar,
- const SvxFont& rFont, sal_Int32 nPara, sal_Int32 nIndex, sal_uInt8 nRightToLeft,
+ const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,