[Libreoffice-commits] core.git: 3 commits - sc/source sw/source
Caolán McNamara
caolanm at redhat.com
Sun May 11 09:34:55 PDT 2014
sc/source/filter/excel/xeescher.cxx | 1
sw/source/filter/ww8/wrtww8.cxx | 20 ++--
sw/source/filter/ww8/ww8par.cxx | 164 +++++++++++++++++++++---------------
3 files changed, 114 insertions(+), 71 deletions(-)
New commits:
commit 9cce3ad91f9bcd784e570561ce4bf2155e06cbbc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 11 17:23:21 2014 +0100
coverity#1130479 Uninitialized pointer field
Change-Id: I2c8b640b29cd716b11c064efb93351d83f81c725
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 1fc1105..b5ccf1b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3538,13 +3538,19 @@ MSWordExportBase::~MSWordExportBase()
WW8Export::WW8Export( SwWW8Writer *pWriter,
SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam,
bool bIsWW8, bool bDot )
- : MSWordExportBase( pDocument, pCurrentPam, pOriginalPam ),
- pO( NULL ),
- pSepx( NULL ),
- bWrtWW8( bIsWW8 ),
- m_bDot(bDot),
- m_pWriter( pWriter ),
- m_pAttrOutput( new WW8AttributeOutput( *this ) )
+ : MSWordExportBase( pDocument, pCurrentPam, pOriginalPam )
+ , pO(NULL)
+ , pTableStrm(NULL)
+ , pDataStrm(NULL)
+ , pFib(NULL)
+ , pDop(NULL)
+ , pFtn(NULL)
+ , pEdn(NULL)
+ , pSepx(NULL)
+ , bWrtWW8(bIsWW8)
+ , m_bDot(bDot)
+ , m_pWriter(pWriter)
+ , m_pAttrOutput(new WW8AttributeOutput(*this))
{
}
commit 6d02764e3badf2dcedc5de4dc7ced7e2f4d8f35b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 11 17:20:23 2014 +0100
coverity#708031 Uninitialized scalar field
Change-Id: I1b70f7f84c0e357a1d5d1733c036fd4becf26fdf
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index c4c1abf..d91e15d 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -599,6 +599,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStream& rStrm )
XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< XShape > xShape , const Rectangle* pChildAnchor ) :
XclObj( rRoot, EXC_OBJTYPE_UNKNOWN, true ),
XclMacroHelper( rRoot ),
+ meEventType( EXC_TBX_EVENT_ACTION ),
mnHeight( 0 ),
mnState( 0 ),
mnLineCount( 0 ),
commit 3c4230122311d661e789667fbcd0b93de31b1709
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun May 11 17:14:50 2014 +0100
coverity#1130478 Uninitialized pointer field
Change-Id: Icbfa6cdf299c0dc28583be16cf1ac73445ee4aaa
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7e60a8f..41bfc4f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4100,20 +4100,120 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
, pTableStream(0)
, pDataStream(0)
, rDoc(rD)
+ , pPaM(0)
+ , pCtrlStck(0)
+ , mpRedlineStack(0)
+ , pReffedStck(0)
+ , pReffingStck(0)
+ , pAnchorStck(0)
, maSectionManager(*this)
, m_aExtraneousParas(rD)
, maInsertedTables(rD)
, maSectionNameGenerator(rD, OUString("WW"))
+ , mpSprmParser(NULL)
, maGrfNameGenerator(bNewDoc, OUString('G'))
, maParaStyleMapper(rD)
, maCharStyleMapper(rD)
+ , mpChosenOutlineNumRule(0)
+ , pFormImpl(0)
+ , pFlyFmtOfJustInsertedGraphic(0)
+ , pFmtOfJustInsertedApo(0)
+ , pPreviousNumPaM(0)
+ , pPrevNumRule(0)
+ , mpPostProcessAttrsInfo(0)
+ , pWwFib(0)
+ , pFonts(0)
+ , pWDop(0)
+ , pLstManager(0)
+ , pSBase(0)
+ , pPlcxMan(0)
, maTxtNodesHavingFirstLineOfstSet()
, maTxtNodesHavingLeftIndentSet()
+ , pStyles(0)
+ , pAktColl(0)
+ , pAktItemSet(0)
+ , pDfltTxtFmtColl(0)
+ , pStandardFmtColl(0)
+ , pHdFt(0)
+ , pWFlyPara(0)
+ , pSFlyPara(0)
+ , pTableDesc(0)
+ , pNumOlst(0)
+ , pNode_FLY_AT_PARA(0)
+ , pDrawModel(0)
+ , pDrawPg(0)
+ , mpDrawEditEngine(0)
+ , pWWZOrder(0)
+ , pNumFldType(0)
, pMSDffManager(0)
, mpAtnNames(0)
, sBaseURL(rBaseURL)
+ , nIniFlags(0)
+ , nIniFlags1(0)
+ , nFieldFlags(0)
, m_bRegardHindiDigits( false )
+ , nDrawCpO(0)
+ , nPicLocFc(0)
+ , nObjLocFc(0)
+ , nIniFlyDx(0)
+ , nIniFlyDy(0)
+ , eTextCharSet(RTL_TEXTENCODING_ASCII_US)
+ , eStructCharSet(RTL_TEXTENCODING_ASCII_US)
+ , eHardCharSet(RTL_TEXTENCODING_DONTKNOW)
+ , nProgress(0)
+ , nAktColl(0)
+ , nFldNum(0)
+ , nLFOPosition(USHRT_MAX)
+ , nCharFmt(0)
+ , nDrawXOfs(0)
+ , nDrawYOfs(0)
+ , nDrawXOfs2(0)
+ , nDrawYOfs2(0)
+ , cSymbol(0)
+ , nWantedVersion(nVersionPara)
+ , nSwNumLevel(0xff)
+ , nWwNumType(0xff)
+ , nListLevel(WW8ListManager::nMaxLevel)
+ , nPgChpDelim(0)
+ , nPgChpLevel(0)
, mbNewDoc(bNewDoc)
+ , bReadNoTbl(false)
+ , bPgSecBreak(false)
+ , bSpec(false)
+ , bObj(false)
+ , bTxbxFlySection(false)
+ , bHasBorder(false)
+ , bSymbol(false)
+ , bIgnoreText(false)
+ , nInTable(0)
+ , bWasTabRowEnd(false)
+ , bWasTabCellEnd(false)
+ , bShdTxtCol(false)
+ , bCharShdTxtCol(false)
+ , bAnl(false)
+ , bHdFtFtnEdn(false)
+ , bFtnEdn(false)
+ , bIsHeader(false)
+ , bIsFooter(false)
+ , bIsUnicode(false)
+ , bCpxStyle(false)
+ , bStyNormal(false)
+ , bWWBugNormal(false)
+ , bNoAttrImport(false)
+ , bInHyperlink(false)
+ , bWasParaEnd(false)
+ , bVer67(false)
+ , bVer6(false)
+ , bVer7(false)
+ , bVer8(false)
+ , bEmbeddObj(false)
+ , bAktAND_fNumberAcross(false)
+ , bNoLnNumYet(true)
+ , bFirstPara(true)
+ , bFirstParaOfPage(false)
+ , bParaAutoBefore(false)
+ , bParaAutoAfter(false)
+ , bDropCap(false)
, nDropCap(0)
, nIdctHint(0)
, bBidi(false)
@@ -4128,70 +4228,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
, mbOnLoadingMain(false)
{
pStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
- nWantedVersion = nVersionPara;
- pCtrlStck = 0;
- mpRedlineStack = 0;
- pReffedStck = 0;
- pReffingStck = 0;
- pAnchorStck = 0;
- pFonts = 0;
- pSBase = 0;
- pPlcxMan = 0;
- pStyles = 0;
- pAktColl = 0;
- pLstManager = 0;
- pAktItemSet = 0;
- pDfltTxtFmtColl = 0;
- pStandardFmtColl = 0;
- pHdFt = 0;
- pWFlyPara = 0;
- pSFlyPara = 0;
- pFlyFmtOfJustInsertedGraphic = 0;
- pFmtOfJustInsertedApo = 0;
- pPreviousNumPaM = 0;
- pPrevNumRule = 0;
- nAktColl = 0;
- nObjLocFc = nPicLocFc = 0;
- nInTable=0;
- bReadNoTbl = bPgSecBreak = bSpec = bObj = bTxbxFlySection
- = bHasBorder = bSymbol = bIgnoreText
- = bWasTabRowEnd = bWasTabCellEnd = false;
- bShdTxtCol = bCharShdTxtCol = bAnl = bHdFtFtnEdn = bFtnEdn
- = bIsHeader = bIsFooter = bIsUnicode = bCpxStyle = bStyNormal =
- bWWBugNormal = false;
-
- mpPostProcessAttrsInfo = 0;
-
- bNoAttrImport = bEmbeddObj = false;
- bAktAND_fNumberAcross = false;
- bNoLnNumYet = true;
- bInHyperlink = false;
- bWasParaEnd = false;
- bDropCap = false;
- bFirstPara = true;
- bFirstParaOfPage = false;
- bParaAutoBefore = false;
- bParaAutoAfter = false;
- nProgress = 0;
- nSwNumLevel = nWwNumType = 0xff;
- pTableDesc = 0;
- pNumOlst = 0;
- pNode_FLY_AT_PARA = 0;
- pDrawModel = 0;
- pDrawPg = 0;
- mpDrawEditEngine = 0;
- pWWZOrder = 0;
- pFormImpl = 0;
- mpChosenOutlineNumRule = 0;
- pNumFldType = 0;
- nFldNum = 0;
-
- nLFOPosition = USHRT_MAX;
- nListLevel = WW8ListManager::nMaxLevel;
- eHardCharSet = RTL_TEXTENCODING_DONTKNOW;
-
- nPgChpDelim = nPgChpLevel = 0;
-
maApos.push_back(false);
}
More information about the Libreoffice-commits
mailing list