[Libreoffice-commits] core.git: 18 commits - editeng/source lotuswordpro/source
Norbert Thiebaud
nthiebaud at gmail.com
Sun Mar 2 16:41:37 PST 2014
editeng/source/editeng/impedit2.cxx | 4 -
lotuswordpro/source/filter/lwptablelayout.cxx | 2
lotuswordpro/source/filter/lwptblcell.cxx | 20 ++++-
lotuswordpro/source/filter/lwptblcell.hxx | 11 ++-
lotuswordpro/source/filter/lwpuidoc.hxx | 9 +-
lotuswordpro/source/filter/lwpverdocument.cxx | 1
lotuswordpro/source/filter/tocread.hxx | 7 +
lotuswordpro/source/filter/xfilter/xfcolumns.hxx | 8 +-
lotuswordpro/source/filter/xfilter/xfcrossref.cxx | 1
lotuswordpro/source/filter/xfilter/xffont.cxx | 49 ++++++-------
lotuswordpro/source/filter/xfilter/xfindex.hxx | 16 ++--
lotuswordpro/source/filter/xfilter/xfliststyle.hxx | 1
lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 77 ++++++++++-----------
13 files changed, 119 insertions(+), 87 deletions(-)
New commits:
commit bc55934ef4c049d1f1c1e2e4e0533cf2958ead25
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:39:11 2014 -0600
coverity#738752: Unitialized scalar field
Change-Id: I54bdd68a7520ac1e936d048cbb7a72c8b7fdfe7c
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index c5421d8..7aa0bca 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1432,6 +1432,8 @@ void LwpColumnLayout::RegisterStyle(double dCalculatedWidth)
LwpTableHeadingLayout::LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
: LwpTableLayout(objHdr, pStrm)
+ , cStartRow(0)
+ , cEndRow(0)
{}
LwpTableHeadingLayout::~LwpTableHeadingLayout()
commit e94cdddd560307d9aceb5f59a51cd0e809f72b69
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:36:52 2014 -0600
coverity#738753: Unitialized scalar field
Change-Id: Ib540a9e2d478ce9be677735cefa238834bb9b13d
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index 0a229e1..154006c 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -128,11 +128,14 @@ void LwpNumericValue::Read()
m_pObjStrm->SkipExtra();
}
- void LwpNumericValue::Parse(IXFStream* /*pOutputStream*/)
+
+void LwpNumericValue::Parse(IXFStream* /*pOutputStream*/)
{
}
- LwpRowList::LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+LwpRowList::LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ : LwpDLVList(objHdr, pStrm)
+ , cRowID(0)
{}
LwpRowList::~LwpRowList()
commit 3a9220adc0cfd4b6a7672e383bcbead0e1211aeb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:33:50 2014 -0600
coverity#738754: Unitialized scalar field
Change-Id: I25e7f5322f414bbd523746ed87d7ac79cce521ce
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index bb6d4c3..0a229e1 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -67,7 +67,9 @@
#include "lwptblcell.hxx"
#include "lwppara.hxx"
- LwpCellList::LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+ LwpCellList::LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ : LwpDLVList(objHdr, pStrm)
+ , cColumn(0)
{}
LwpCellList::~LwpCellList()
commit 8cb473cdf838072adcc8faa493c0cd049c056cb2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:32:27 2014 -0600
coverity#738755: Unitialized scalar field
Change-Id: I3d320f09ddfa5ce40ac55317c92d7acecaec5db9
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index a2698f7..bb6d4c3 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -216,7 +216,10 @@ void LwpFolder::Parse(IXFStream* /*pOutputStream*/)
{
}
-LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ : LwpDLVList(objHdr, pStrm)
+ , cReferenceOffset(0)
+ , cFlags(0)
{}
LwpDependent::~LwpDependent()
commit 41c440bab0c56497ea0c7c95306a154847cc4a4e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:29:27 2014 -0600
coverity#738756: Unitialized scalar field
Change-Id: I4fc6f8db2a30564e6bac0052a51610245e9cf61c
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index 1ed04ea..a2698f7 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -112,7 +112,9 @@ void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/)
}
}
- LwpNumericValue::LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm)
+LwpNumericValue::LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ : LwpObject(objHdr, pStrm)
+ , cNumber(0)
{}
LwpNumericValue::~LwpNumericValue()
commit 0c19977db435d1ca77e3fe1fb2ba30279a4a2846
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:25:37 2014 -0600
coverity#738757: Unitialized scalar field
Change-Id: I864a7d0c7027eb689c2986fec27883396b600ba2
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 5d0cd14..a8a26d2 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -304,7 +304,9 @@ LwpRowColumnQualifier::IsAbsolute()
class LwpRowSpecifier
{
public:
- LwpRowSpecifier(void){}
+ LwpRowSpecifier(void)
+ : cRow(0)
+ {}
~LwpRowSpecifier(){}
void QuickRead(LwpObjectStream *pStrm);
commit c541a0a15c2e982526a6ec5e858c09a9ab0a7dbb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:24:15 2014 -0600
coverity#738758: Unitialized scalar field
Change-Id: I5b22d78762a725b7cf2e8cea2f22afc53736e176
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index ddf1b19..5d0cd14 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -405,8 +405,11 @@ LwpRowSpecifier::IsBad()
class LwpColumnSpecifier
{
public:
- LwpColumnSpecifier(void){}
- ~LwpColumnSpecifier(){}
+ LwpColumnSpecifier(void)
+ : cColumn(0)
+ {}
+ ~LwpColumnSpecifier()
+ {}
void QuickRead(LwpObjectStream *pStrm);
sal_uInt8 Column(){return cColumn;}
commit 283f661e65f1bf77ddfa8852757199099bd015a2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:19:35 2014 -0600
coverity#738760: Unitialized scalar field
Change-Id: If4f3e607894d8babddc75264e4a84bcf69a4097b
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 7aa8da9..ed9c84b 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -111,7 +111,10 @@ public:
class LwpMergeOptions
{
public:
- LwpMergeOptions(){}
+ LwpMergeOptions()
+ : m_nType(0)
+ , m_nLastActionFlag(0)
+ {}
~LwpMergeOptions(){}
private:
LwpAtomHolder m_RecordFile;
commit d59f879fee086afa504072c4fee249f9ebeddb55
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:16:56 2014 -0600
coverity#738761: Unitialized scalar field
Change-Id: I49efd8eab42b51859127294bddc4bb88ea0b0063
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 5815f21..7aa8da9 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -92,7 +92,9 @@ public:
class LwpAutoRunMacroOptions
{
public:
- LwpAutoRunMacroOptions(){}
+ LwpAutoRunMacroOptions()
+ : m_OptionFlag(0)
+ {}
~LwpAutoRunMacroOptions(){}
private:
LwpAtomHolder m_OpenName;
commit d8ece4008612d3497e506bb05e272798dbef8388
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:14:30 2014 -0600
coverity#738762: Unitialized scalar field
Change-Id: Ifd0b8e14328f5a23eb92fdc38f72d15989e54c3e
diff --git a/lotuswordpro/source/filter/lwpverdocument.cxx b/lotuswordpro/source/filter/lwpverdocument.cxx
index 5b76c6b..a3e685a 100644
--- a/lotuswordpro/source/filter/lwpverdocument.cxx
+++ b/lotuswordpro/source/filter/lwpverdocument.cxx
@@ -72,6 +72,7 @@ Jun 2005 Created
LwpVerDocument::LwpVerDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
: LwpObject(objHdr, pStrm)
+ , m_nTabSpacing(0)
{}
void LwpVerDocument::Read()
commit d00bcca7649e8813a050fadb551b5e2af1b47124
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:13:13 2014 -0600
coverity#738763: Unitialized scalar field
Change-Id: I3eee225397c55a1caee433189dd4b28c03aabac5
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index cf21d9d..4e22054 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -62,7 +62,12 @@ class CBenTOCReader
{
public: // Methods
CBenTOCReader(pLtcBenContainer pContainer)
- { cpContainer = pContainer; cpTOC = NULL; cCurr = 0; }
+ : cpContainer(pContainer)
+ , cpTOC(NULL)
+ , cBlockSize(0)
+ , cCurr(0)
+ , cTOCSize(0)
+ { }
~CBenTOCReader() { delete[] cpTOC; }
BenError ReadLabelAndTOC();
commit 2639d2f79eb1514b327787cf9b2a211310f4bbc2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 18:10:33 2014 -0600
coverity#738764: Unitialized scalar field
Change-Id: Id0e724ab2b6bead9f20a5c60a1094648ce3e843e
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index 0af64f4..3448262 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -137,10 +137,10 @@ class XFColumns
{
public:
XFColumns()
- {
- m_nFlag = 0;
- m_fGap = 0;
- }
+ : m_nFlag(0)
+ , m_nCount(0)
+ , m_fGap(0.0)
+ { }
public:
void SetSeparator(XFColumnSep& aSeparator);
void SetGap(double fGap);
commit cf6af1d485c9ef5183b9d74bedc6822347bf1c8c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 17:56:44 2014 -0600
coverity#738765: Unitialized scalar field
Change-Id: I3fb065a63db4f8a0148ba201dc19104bb53f5280
diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
index 5e70b5d..080cda9 100644
--- a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx
@@ -60,6 +60,7 @@
#include "xfcrossref.hxx"
XFCrossRefStart::XFCrossRefStart()
+ : m_nType(CROSSREF_INVALID)
{
}
commit 53e9a024dcac33bf2943b9c50a7cf2a587c3b24a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 17:46:17 2014 -0600
coverity#738767: Unitialized scalar field
Change-Id: I922c15f11cfa7013aa184ca54704e86eb9f0b2df
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index ce2d2be..be9b9ff 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -60,31 +60,32 @@
#include "xffont.hxx"
XFFont::XFFont()
+ : m_nFontSize(0)
+ , m_nFontSizeAsia(0)
+ , m_nFontSizeComplex(0)
+ , m_bItalic(sal_False)
+ , m_bItalicAsia(sal_False)
+ , m_bItalicComplex(sal_False)
+ , m_bBold(sal_False)
+ , m_bBoldAsia(sal_False)
+ , m_bBoldComplex(sal_False)
+ , m_eUnderline(enumXFUnderlineNone)
+ , m_eCrossout(enumXFCrossoutNone)
+ , m_eRelief(enumXFReliefNone)
+ , m_eTransform(enumXFTransformNone)
+ , m_eEmphasize(enumXFEmphasizeNone)
+ , m_bWordByWord(sal_False)
+ , m_bEmphasizeTop(sal_True)
+ , m_bOutline(sal_False)
+ , m_bShadow(sal_False)
+ , m_bBlink(sal_False)
+ , m_nPosition(33)
+ , m_nScale(58)
+ , m_fCharSpace(0)
+ , m_nWidthScale(100)
+ , m_nFlag(0)
+ , m_bTransparent(sal_False)
{
- m_nFontSize = 0;
- m_nFontSizeAsia = 0;
- m_nFontSizeComplex = 0;
- m_bItalic = sal_False;
- m_bItalicAsia = sal_False;
- m_bItalicComplex = sal_False;
- m_bBold = sal_False;
- m_bBoldAsia = sal_False;
- m_bBoldComplex = sal_False;
- m_eUnderline = enumXFUnderlineNone;
- m_eCrossout = enumXFCrossoutNone;
- m_eRelief = enumXFReliefNone;
- m_eTransform = enumXFTransformNone;
- m_eEmphasize = enumXFEmphasizeNone;
- m_bEmphasizeTop = sal_True;
- m_bOutline = sal_False;
- m_bShadow = sal_False;
- m_bBlink = sal_False;
- m_nPosition = 33;
- m_nScale = 58;
- m_fCharSpace = 0;
- m_nWidthScale = 100;
- m_bWordByWord = sal_False;
- m_nFlag = 0;
}
/*
The Following variable are to be compared:
commit c7f15b9688aa5982e3e16109e39c166d71874fdd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 17:35:39 2014 -0600
coverity#738768: Unitialized scalar field
Change-Id: Ie228cc0b19e6cf8ad8599c1760b10c79873c70d8
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index e49a1e2..694210e 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -121,8 +121,8 @@ private:
private:
OUString m_nLevel;
OUString m_strStyle;
- enumXFTab m_eTabType;
- double m_fTabLength;
+ enumXFTab m_eTabType;
+ double m_fTabLength;
OUString m_strTabDelimiter;
OUString m_strTabLeader;
OUString m_strTagName;
@@ -165,17 +165,17 @@ public:
*/
void SetSeparator(sal_Bool sep);
- virtual void ToXml(IXFStream *pStrm);
+ virtual void ToXml(IXFStream *pStrm);
void AddTocSource(sal_uInt16 nLevel, const OUString sStyleName);
private:
enumXFIndex m_eType;
- OUString m_strTitle;
- OUString m_strSectStyle;
- bool m_bProtect;
+ OUString m_strTitle;
+ OUString m_strSectStyle;
+ bool m_bProtect;
bool m_bSeparator;
- XFParagraph *m_pTitle;
+ XFParagraph* m_pTitle;
std::vector<XFIndexTemplate *> m_aTemplates; // template entry + style
@@ -186,6 +186,8 @@ private:
};
inline XFIndexTemplate::XFIndexTemplate()
+ : m_eTabType(enumXFTabNone)
+ , m_fTabLength(0.0)
{
m_nLevel = Int32ToOUString(0);
}
commit 72069675955aaf0b72a7842453347e3e7293f56d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 17:29:07 2014 -0600
coverity#738770: Unitialized scalar field
Change-Id: Ieef151be935e1834eb2c9d84dfb91cf2c02a1c7c
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index 79590f7..221327d 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -141,6 +141,7 @@ class XFListLevelBullet : public XFListLevel
{
public:
XFListLevelBullet()
+ : m_chBullet(0)
{
m_eListType = enumXFListLevelBullet;
}
commit d3428aaf3180d3741766365e33ab0a3b4af3c47d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 17:22:01 2014 -0600
coverity#738771: Unitialized scalar field
Change-Id: I6a3956623d013bb2e827ce82650a8834398a1387
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index a2ea034..4a2627c 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -66,63 +66,62 @@
#include "xfbgimage.hxx"
XFParaStyle::XFParaStyle()
+ : m_eAlignType(enumXFAlignNone)
+ , m_eLastLineAlign(enumXFAlignNone)
+ , m_bJustSingleWord(sal_False)
+ , m_bKeepWithNext(sal_False)
+ , m_fTextIndent(0)
+ , m_pFont(NULL)
+ , m_pBorders(NULL)
+ , m_pBGImage(NULL)
+ , m_nPageNumber(0)
+ , m_bNumberLines(sal_True)
+ , m_nLineNumberRestart(0)
+ , m_nFlag(0)
+ , m_bNumberRight(sal_False)
{
- //init member variables:
- m_nFlag = 0;
- m_eAlignType = enumXFAlignNone;
- m_eLastLineAlign = enumXFAlignNone;
- m_bJustSingleWord = sal_False;
- m_bKeepWithNext = sal_False;
- m_nPageNumber = 0;
- m_fTextIndent = 0;
-
- m_pFont = NULL;
- m_pBorders = NULL;
- m_pBGImage = NULL;
-
- m_nLineNumberRestart = 0;
- m_bNumberLines = sal_True;
- m_bNumberRight = sal_False;
}
-XFParaStyle::XFParaStyle(const XFParaStyle& other) : XFStyle(other)
+
+XFParaStyle::XFParaStyle(const XFParaStyle& other)
+ : XFStyle(other)
+ , m_eAlignType(other.m_eAlignType)
+ , m_eLastLineAlign(other.m_eLastLineAlign)
+ , m_bJustSingleWord(other.m_bJustSingleWord)
+ , m_bKeepWithNext(other.m_bKeepWithNext)
+ , m_fTextIndent(other.m_fTextIndent)
+ , m_aBackColor(other.m_aBackColor)
+ , m_aMargin(other.m_aMargin)
+ , m_aPadding(other.m_aPadding)
+ , m_pFont(other.m_pFont)
+ , m_aShadow(other.m_aShadow)
+ , m_aDropcap(other.m_aDropcap)
+ , m_aLineHeight(other.m_aLineHeight)
+ , m_aBreaks(other.m_aBreaks)
+ , m_nPageNumber(other.m_nPageNumber)
+ , m_bNumberLines(other.m_bNumberLines)
+ , m_nLineNumberRestart(other.m_nLineNumberRestart)
+ , m_nFlag(other.m_nFlag)
+ , m_bNumberRight(other.m_bNumberRight)
{
m_strParentStyleName = other.m_strParentStyleName;
- m_nFlag = other.m_nFlag;
- m_eAlignType = other.m_eAlignType;
- m_fTextIndent = other.m_fTextIndent;
- m_bNumberLines = other.m_bNumberLines;
- m_nLineNumberRestart = other.m_nLineNumberRestart;
- m_bNumberRight = other.m_bNumberRight;
-
- if( other.m_pFont )
- m_pFont = other.m_pFont;
- else
- m_pFont = NULL;
if( other.m_pBorders )
m_pBorders = new XFBorders(*other.m_pBorders);
else
m_pBorders = NULL;
- m_aBackColor = other.m_aBackColor;
+
if( other.m_pBGImage )
m_pBGImage = new XFBGImage(*other.m_pBGImage);
else
m_pBGImage = NULL;
- m_aShadow = other.m_aShadow;
- m_aMargin = other.m_aMargin;
- m_aDropcap = other.m_aDropcap;
- m_aLineHeight = other.m_aLineHeight;
- m_aPadding = other.m_aPadding;
- m_aBreaks = other.m_aBreaks;
-
- for (size_t i=0; i<other.m_aTabs.GetCount(); ++i)
+ for (size_t i = 0; i < other.m_aTabs.GetCount(); ++i)
{
- const IXFStyle *pStyle = other.m_aTabs.Item(i);
+ const IXFStyle* pStyle = other.m_aTabs.Item(i);
if( pStyle )
{
- const XFTabStyle *pTabStyle = dynamic_cast<const XFTabStyle*>(pStyle);
+ const XFTabStyle* pTabStyle = dynamic_cast<const XFTabStyle*>(pStyle);
if( pTabStyle )
{
XFTabStyle *pCopyStyle = new XFTabStyle(*pTabStyle);
commit 17b56dc326e98a97f45f86d0010f06bd37e32091
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 2 16:22:53 2014 -0600
WaE sign/unsigned comp
Change-Id: I12cb5aa89caa3670101f4632701e33851885c1db
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 68474fc..c0d432e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2814,14 +2814,14 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib
{
// Correct only if really a word gets overlapped in the process of
// Spell checking
- if (i->mnStart > nEnd)
+ if (i->mnStart > (size_t)nEnd)
{
pRWrongs->push_back(*i);
editeng::MisspellRange& rRWrong = pRWrongs->back();
rRWrong.mnStart = rRWrong.mnStart - nEnd;
rRWrong.mnEnd = rRWrong.mnEnd - nEnd;
}
- else if (i->mnStart < nEnd && i->mnEnd > nEnd)
+ else if (i->mnStart < (size_t)nEnd && i->mnEnd > (size_t)nEnd)
i->mnEnd = nEnd;
}
sal_Int32 nInv = nEnd ? nEnd-1 : nEnd;
More information about the Libreoffice-commits
mailing list