[Libreoffice-commits] core.git: 40 commits - connectivity/source cui/source dbaccess/source hwpfilter/source lotuswordpro/source sc/source svtools/source svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Thu Mar 13 07:03:59 PDT 2014
connectivity/source/drivers/file/FResultSet.cxx | 3 +
cui/source/dialogs/thesdlg.cxx | 3 +
cui/source/tabpages/numpages.cxx | 4 -
cui/source/tabpages/paragrph.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 4 -
hwpfilter/source/hwpread.cxx | 51 ++++++++++++++--------
lotuswordpro/source/filter/lwp9reader.cxx | 5 +-
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 9 +++
lotuswordpro/source/filter/lwpdrawobj.cxx | 5 +-
sc/source/ui/view/gridwin.cxx | 21 +++------
svtools/source/contnr/contentenumeration.cxx | 1
svtools/source/contnr/svlbitm.cxx | 20 +++++---
svtools/source/control/calendar.cxx | 22 ++++-----
svx/source/form/filtnav.cxx | 2
sw/source/core/text/porfld.cxx | 31 ++++++++++---
sw/source/core/uibase/app/docsh2.cxx | 9 ++-
sw/source/core/uibase/uno/unomailmerge.cxx | 2
sw/source/core/unocore/unoframe.cxx | 3 -
sw/source/core/unocore/unotbl.cxx | 7 +--
sw/source/filter/html/htmlgrin.cxx | 19 ++++----
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 8 ++-
sw/source/filter/ww8/ww8par.hxx | 9 +++
sw/source/filter/ww8/ww8par3.cxx | 10 ++--
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 6 +-
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/ui/chrdlg/numpara.cxx | 11 +++-
28 files changed, 174 insertions(+), 99 deletions(-)
New commits:
commit 72922d8fe70a66ad0ccf2577e354dc4a1cf4fafc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:10:29 2014 +0000
coverity#708786 Unused pointer value
Change-Id: I1ca9a4bfa6b72d836e0143373ff6831dc59a9a7e
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index df84b78..35d76d7 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1481,8 +1481,6 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( eState != m_pKeepParaBox->GetSavedValue() )
{
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_KEEP );
-
// if the status has changed, putting is necessary
rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = sal_True;
commit b532886a20c3e82d0df1d87f6e4d1a35c4d3df3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:06:59 2014 +0000
coverity#708512 Uninitialized scalar field
Change-Id: I23b0d3ebcbf64ae4705edaa32fb5933161d8e4d7
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 9f7800e..cfe17cb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5894,9 +5894,9 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs)
}
WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
- : rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
- stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0),
- ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
+ : rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0), fStdStylenamesWritten(0)
+ , stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0)
+ , ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
{
if (!checkSeek(rSt, rFib.fcStshf))
return;
commit 5e8f7b8c831a0b403d915cf3f16b860eb5975d64
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:05:13 2014 +0000
coverity#708508 Uninitialized scalar field
Change-Id: I91551d8ef7d27c6abc81cd59a6866ee5eb93adcb
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 339c319..e8bb5e4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -752,7 +752,7 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection)
}
wwSection::wwSection(const SwPosition &rPos) : maStart(rPos.nNode),
- mpSection(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP),
+ mpSection(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP), mLinkId(0),
nPgWidth(SvxPaperInfo::GetPaperSize(PAPER_A4).Width()),
nPgLeft(MM_250), nPgRight(MM_250), mnBorders(0), mbHasFootnote(false)
{
commit 0947dedf8d15fe18824011a7090297072c7d798b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:04:03 2014 +0000
coverity#708507 Uninitialized scalar field
Change-Id: I3e5a4432ae8a4ea455935e4d089f9436ef539851
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 69af98e..83c978a 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1092,10 +1092,13 @@ SwNumRule* WW8ListManager::GetNumRule(size_t i)
// oeffentliche Methoden
WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
- : maSprmParser(rReader_.GetFib().GetFIBVersion()), rReader(rReader_),
- rDoc(rReader.GetDoc()), rFib(rReader.GetFib()), rSt(rSt_),
- nUniqueList(1)
+ : maSprmParser(rReader_.GetFib().GetFIBVersion()), rReader(rReader_)
+ , rDoc(rReader.GetDoc())
+ , rFib(rReader.GetFib()), rSt(rSt_)
+ , nUniqueList(1)
+ , nLastLFOPosition(USHRT_MAX)
{
+
// LST und LFO gibts erst ab WW8
if( ( 8 > rFib.nVersion )
|| ( rFib.fcPlcfLst == rFib.fcPlfLfo )
@@ -1105,7 +1108,6 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
// Arrays anlegen
bool bLVLOk = true;
- nLastLFOPosition = USHRT_MAX;
long nOriginalPos = rSt.Tell();
// 1. PLCF LST auslesen und die Listen Vorlagen im Writer anlegen
commit 061b839c3f5d33ae32fc6b027039f5fe66827eae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:02:24 2014 +0000
coverity#708504 Uninitialized scalar field
Change-Id: I36fd2d6f419ffbb3770e821019c1d665cf4b2c8b
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index cbb8563..8c324a7 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -813,7 +813,14 @@ private:
{
bool bHasHeader, bHasFooter;
sal_uInt32 nSwHLo, nSwFUp, nSwUp, nSwLo;
- wwULSpaceData() : bHasHeader(false), bHasFooter(false) {}
+ wwULSpaceData()
+ : bHasHeader(false)
+ , bHasFooter(false)
+ , nSwHLo(0)
+ , nSwFUp(0)
+ , nSwUp(0)
+ , nSwLo(0)
+ {}
};
void SetSegmentToPageDesc(const wwSection &rSection, bool bIgnoreCols);
commit 8b84c00165a6f72d47455fd017b9762eae750dda
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 12:00:49 2014 +0000
coverity#708497 Uninitialized scalar field
Change-Id: I7e3715d99c6061eb14c7bb2485e9fbe635346f5a
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 896fe64..6aaba7c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3302,6 +3302,8 @@ bool RtfAttributeOutput::PlaceholderField( const SwField* pField)
RtfAttributeOutput::RtfAttributeOutput( RtfExport &rExport )
: m_rExport( rExport ),
+ m_nStyleId( 0 ),
+ m_nListId( 0 ),
m_bStrikeDouble( false ),
m_nNextAnnotationMarkId(0),
m_nCurrentAnnotationMarkId(-1),
commit 2af3d98f5565959c50eb368e6d5d415f1561669f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:59:18 2014 +0000
coverity#708499 Uninitialized scalar field
Change-Id: I4b21ac710b578c4d40130379facc7b0055bfc2cc
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9832e18..d084282 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -851,8 +851,12 @@ sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
return rStrm.Tell();
}
-WW8_WrPlcPn::WW8_WrPlcPn( WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc )
- : rWrt(rWr), nFkpStartPage(0), ePlc(ePl), nMark(0)
+WW8_WrPlcPn::WW8_WrPlcPn(WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc)
+ : rWrt(rWr)
+ , nFkpStartPage(0)
+ , ePlc(ePl)
+ , bWrtWW8(true)
+ , nMark(0)
{
WW8_WrFkp* pF = new WW8_WrFkp( ePlc, nStartFc, rWrt.bWrtWW8 );
aFkps.push_back( pF );
commit c338f61286366bd140f59829461135700c06ce33
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:57:02 2014 +0000
coverity#707909 Uninitialized scalar field
Change-Id: I0cf8f5f862afb13b406776e17dd5036cefe23f3b
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 57fe728..0facd76 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -734,13 +734,14 @@ bool Compose::Read(HWPFile & hwpf)
return !hwpf.State();
}
-
// hyphen(24)
-Hyphen::Hyphen():HBox(CH_HYPHEN)
+Hyphen::Hyphen()
+ : HBox(CH_HYPHEN)
+ , width(0)
+ , dummy(0)
{
}
-
bool Hyphen::Read(HWPFile & hwpf)
{
hwpf.Read2b(&width, 1);
commit fc77ac3d4baeab566f8b2317bb27ab525ce0e201
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:56:20 2014 +0000
coverity#707911 Uninitialized scalar field
Change-Id: I7a7c6cbdd8619687bf1dded6f399cc1c3cf753a7
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 2a35a3a..57fe728 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -608,13 +608,15 @@ bool Footnote::Read(HWPFile & hwpf)
return !hwpf.State();
}
-
// auto number(18)
-AutoNum::AutoNum():HBox(CH_AUTO_NUM)
+AutoNum::AutoNum()
+ : HBox(CH_AUTO_NUM)
+ , type(0)
+ , number(0)
+ , dummy(0)
{
}
-
bool AutoNum::Read(HWPFile & hwpf)
{
hwpf.Read2b(&type, 1);
commit 47c1dbb955c0904f2eb99ae921323ee5711fabcd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:55:39 2014 +0000
coverity#707912 Uninitialized scalar field
Change-Id: If8d95327cfde32d146d8313fbd8f78d4c4f7ca88
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index ae528fa..2a35a3a 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -714,13 +714,13 @@ bool MailMerge::Read(HWPFile & hwpf)
return !hwpf.State();
}
-
// char compositon(23)
-Compose::Compose():HBox(CH_COMPOSE)
+Compose::Compose()
+ : HBox(CH_COMPOSE)
+ , dummy(0)
{
}
-
bool Compose::Read(HWPFile & hwpf)
{
hwpf.Read2b(compose, 3);
commit 18fa6e2081a5071ece0e5ddb8a95bd5ab73b1873
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:54:56 2014 +0000
coverity#707913 Uninitialized scalar field
Change-Id: I05aaab5c88a745157f578a15bcf2a6c3a7b8858b
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 1227bd7..ae528fa 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -793,13 +793,16 @@ bool IndexMark::Read(HWPFile & hwpf)
return !hwpf.State();
}
-
// outline(28)
-Outline::Outline():HBox(CH_OUTLINE)
+Outline::Outline()
+ : HBox(CH_OUTLINE)
+ , kind(0)
+ , shape(0)
+ , level(0)
+ , dummy(0)
{
}
-
bool Outline::Read(HWPFile & hwpf)
{
hwpf.Read2b(&kind, 1);
commit 98c4a470bf122a61193ec8828ca604bc269bf01a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:53:25 2014 +0000
coverity#707914 Uninitialized scalar field
Change-Id: Ia9094d3ecffef5981fd5c8edbcfd036cbfee309f
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 83213d2..1227bd7 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -752,7 +752,10 @@ bool Hyphen::Read(HWPFile & hwpf)
// toc mark(25)
-TocMark::TocMark():HBox(CH_TOC_MARK)
+TocMark::TocMark()
+ : HBox(CH_TOC_MARK)
+ , kind(0)
+ , dummy(0)
{
}
commit e3cce885d2fbeb4d375b6441ea0a0a4ab7d05ccb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:51:21 2014 +0000
coverity#707915 Uninitialized scalar field
Change-Id: I9617b67f9a3af7fff43ae1ff5b98c1066c53059b
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 72b54bf..83213d2 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -582,11 +582,15 @@ bool HeaderFooter::Read(HWPFile & hwpf)
// footnote(17)
-Footnote::Footnote():HBox(CH_FOOTNOTE)
+Footnote::Footnote()
+ : HBox(CH_FOOTNOTE)
+ , dummy(0)
+ , number(0)
+ , type(0)
+ , width(0)
{
}
-
bool Footnote::Read(HWPFile & hwpf)
{
hwpf.Read2b(reserved, 2);
commit 15db92036b2927d447497fa441182645e3659b07
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:49:59 2014 +0000
coverity#707916 Uninitialized scalar field
Change-Id: I51531ec9a82291398e2310efdd5e32c441f43a6e
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 0422115..72b54bf 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -766,7 +766,9 @@ bool TocMark::Read(HWPFile & hwpf)
// index mark(26)
-IndexMark::IndexMark():HBox(CH_INDEX_MARK)
+IndexMark::IndexMark()
+ : HBox(CH_INDEX_MARK)
+ , dummy(0)
{
}
commit 0660d241b7174101dbecda55cea265021d04a296
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:49:24 2014 +0000
coverity#707917 Uninitialized scalar field
Change-Id: Ida5f4a74a0ab808706b6e52862dab7272df5a27d
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index a4f1595..0422115 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -809,7 +809,9 @@ bool Outline::Read(HWPFile & hwpf)
/* ¹À½ ºóÄ(30) */
-KeepSpace::KeepSpace():HBox(CH_KEEP_SPACE)
+KeepSpace::KeepSpace()
+ : HBox(CH_KEEP_SPACE)
+ , dummy(0)
{
}
commit 00902f740e67f2fc21f307d40e6d2a2c5f11db72
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:47:19 2014 +0000
coverity#738584 Uninitialized pointer field
Change-Id: I2aefd425027f782b11dd362dcf11cd28d5e9bac0
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 988a3cd..23e6b56 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -98,6 +98,7 @@ IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ )
ReplaceEdit::ReplaceEdit(Window *pParent)
: Edit(pParent, WB_BORDER | WB_TABSTOP)
+ , m_pBtn(NULL)
{
}
commit 17ef1fb83d5975241673412b9f8c60efa48c7957
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:46:32 2014 +0000
coverity#738585 Uninitialized pointer field
Change-Id: I3d876fc4fa450204776f8aae82c95081a50f4759
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 80dbfe4..988a3cd 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -58,6 +58,7 @@ using namespace ::com::sun::star;
LookUpComboBox::LookUpComboBox(Window *pParent)
: ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP)
+ , m_pDialog(NULL)
{
EnableAutoSize(true);
commit 609956aea76292cc6ab5f4dc84b7fc0d9fb74ed0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:45:57 2014 +0000
coverity#738586 Uninitialized pointer field
Change-Id: If52645a0cba2d82976b314b9195caa83a6af13a0
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 36833f4..80dbfe4 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -160,6 +160,7 @@ void AlternativesString::Paint(
ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent)
: SvxCheckListBox(pParent)
+ , m_pDialog(NULL)
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
SetHighlightRange();
commit 335cc944c41b9ca7653fd1b7338e289d328fde26
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:45:00 2014 +0000
coverity#738683 Uninitialized pointer field
Change-Id: I7b69f2e468c21be3020068af25de8001d71eb19a
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index b7d12f0..e0ec331 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -66,7 +66,10 @@
#include <tools/stream.hxx>
Lwp9Reader::Lwp9Reader (LwpSvStream* pInputStream, IXFStream* pStream)
- : m_pDocStream(pInputStream), m_pStream(pStream), m_LwpFileHdr()
+ : m_pDocStream(pInputStream)
+ , m_pStream(pStream)
+ , m_pObjMgr(NULL)
+ , m_LwpFileHdr()
{}
/**
commit 830b5bf0d6f9f5bf6607e0dd6848557628c8f5e2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:43:13 2014 +0000
coverity#738685 Uninitialized pointer field
Change-Id: Ieee94d9dd2913b03260e98a5ac85aac27301dcf0
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 6b1114b..5c6719c 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -74,10 +74,15 @@
#include "xfilter/xflist.hxx"
#include "lwpglobalmgr.hxx"
-LwpBulletStyleMgr::LwpBulletStyleMgr() :
-m_pBulletList(NULL), m_bContinue(sal_True), m_bIsBulletSkipped(sal_False), m_nCurrentPos(0xFF)
+LwpBulletStyleMgr::LwpBulletStyleMgr()
+ : m_pFoundry(NULL)
+ , m_pBulletList(NULL)
+ , m_bContinue(sal_True)
+ , m_bIsBulletSkipped(sal_False)
+ , m_nCurrentPos(0xFF)
{
}
+
LwpBulletStyleMgr::~LwpBulletStyleMgr()
{
if (m_pBulletList)
commit fb4071204205e06b537e968ebd97c37fccd4d1f2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:41:53 2014 +0000
coverity#738701 Uninitialized pointer field
Change-Id: Icda26e653e0c42691020453ec58b22f9469cdb2f
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index ee811ef..ef26f6d 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -565,9 +565,12 @@ XFFrame* LwpDrawPolyLine::CreateStandardDrawObj(const OUString& rStyleName)
* @param pStream The memory stream which contains the lwp-sdw draw objects
*/
LwpDrawPolygon::LwpDrawPolygon(SvStream * pStream, DrawingOffsetAndScale* pTransData)
-: LwpDrawObj(pStream, pTransData)
+ : LwpDrawObj(pStream, pTransData)
+ , m_nNumPoints(NULL)
+ , m_pVector(NULL)
{
}
+
LwpDrawPolygon::~LwpDrawPolygon()
{
if (m_pVector)
commit 5621d54fc4d6c77016d235d0c4b792c5dccbd07a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:40:35 2014 +0000
coverity#708356 Uninitialized pointer field
Change-Id: I9fe9932831bed1538d03f618074d457ea645230f
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index fddea8e..0341e54 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -108,10 +108,10 @@ namespace svxform
OFilterItemExchange::OFilterItemExchange()
+ : m_pFormItem(NULL)
{
}
-
void OFilterItemExchange::AddSupportedFormats()
{
AddFormat(getFormatId());
commit 9a76d79dc4fb861f4a7aee6ed32cd9ab64ad7402
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:39:04 2014 +0000
coverity#708296 Uninitialized pointer field
Change-Id: I05b10b0b9812a79ea8c55e5af3bcde83f24e12cf
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 1a1d7bf..c6a9fff 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2389,21 +2389,19 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
return FloatingWindow::Notify( rNEvt );
}
-
-
-CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) :
- DateField( pParent, nWinStyle ),
- maDefaultDate( 0, 0, 0 )
+CalendarField::CalendarField(Window* pParent, WinBits nWinStyle)
+ : DateField(pParent, nWinStyle)
+ , mpFloatWin(NULL)
+ , mpCalendar(NULL)
+ , mnCalendarStyle(0)
+ , mpTodayBtn(NULL)
+ , mpNoneBtn(NULL)
+ , maDefaultDate( 0, 0, 0 )
+ , mbToday(false)
+ , mbNone(false)
{
- mpFloatWin = NULL;
- mpCalendar = NULL;
- mnCalendarStyle = 0;
- mbToday = sal_False;
- mbNone = sal_False;
}
-
-
CalendarField::~CalendarField()
{
if ( mpFloatWin )
commit 514fcf423857e2d828fe296c63012835567afcd2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:30:47 2014 +0000
coverity#708287 Uninitialized pointer field
Change-Id: Ie1e605caaaa6a2fc7756a285298c1f49962ad2b6
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index fa9db5f..2d193a4 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -302,19 +302,23 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource )
SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
sal_uInt16 nFlags, SvLBoxButtonData* pBData )
: SvLBoxItem( pEntry, nFlags )
+ , isVis(true)
+ , pData(pBData)
+ , eKind(eTheKind)
+ , nBaseOffs(0)
+ , nItemFlags(0)
{
- eKind = eTheKind;
- nBaseOffs = 0;
- nItemFlags = 0;
SetStateUnchecked();
- pData = pBData;
- isVis = true;
}
-SvLBoxButton::SvLBoxButton() : SvLBoxItem()
+SvLBoxButton::SvLBoxButton()
+ : SvLBoxItem()
+ , isVis(false)
+ , pData(0)
+ , eKind(SvLBoxButtonKind_enabledCheckbox)
+ , nItemFlags(0)
+ , nBaseOffs(0)
{
- eKind = SvLBoxButtonKind_enabledCheckbox;
- nItemFlags = 0;
SetStateUnchecked();
}
commit 184b9f7da76edd4a665676a029035b71112a1c7c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:27:45 2014 +0000
coverity#708280 Uninitialized pointer field
Change-Id: I92b3e6ec80a951bd8a0133a348de7240ec15a89e
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index ae97aab..a4fd091 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -89,6 +89,7 @@ namespace svt
,m_rContentMutex ( _rContentMutex )
,m_xCommandEnv ( _rxCommandEnv )
,m_pTranslator ( _pTranslator )
+ ,m_pResultHandler ( NULL )
,m_bCancelled ( false )
,m_rBlackList ( ::com::sun::star::uno::Sequence< OUString >() )
{
commit 24642ae52ee718eb83fb4289c5f930488767fc43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:19:18 2014 +0000
coverity#705522 Dereference null return value
Change-Id: Icf9e49d12b593c590287be9952dfe8d722613a86
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 8e80738..64debea 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -601,7 +601,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
}
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, sal_False);
- SwView *pView = PTR_CAST( SwView, pFrame->GetViewShell() );
+ SwView *pView = pFrame ? PTR_CAST( SwView, pFrame->GetViewShell() ) : NULL;
if (!pView)
throw RuntimeException();
SwWrtShell &rSh = *pView->GetWrtShellPtr();
commit 0c4bda19f07b5b14980e320b7d243e989d432349
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:17:27 2014 +0000
coverity#705519 Dereference null return value
Change-Id: Ifdbb4fe65e5c2a0c9e037ec9990697550d44af3f
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index b1febbd..b6c2b8c 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -123,10 +123,13 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
aStyle = m_pNumberStyleLB->GetSelectEntry();
const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( rSet, SID_ATTR_PARA_NUMRULE);
SfxStringItem* pRule = (SfxStringItem*)pOldRule->Clone();
- pRule->SetValue(aStyle);
- rSet.Put(*pRule);
- delete pRule;
- bModified = sal_True;
+ if (pRule)
+ {
+ pRule->SetValue(aStyle);
+ rSet.Put(*pRule);
+ delete pRule;
+ bModified = sal_True;
+ }
}
if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() ||
m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()||
commit debe27d27a0c0ba058f8d0f978ddbcb528c4ebf4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:16:08 2014 +0000
coverity#705517 Dereference null return value
Change-Id: I797e302d71f45f618985fe2470a0428ff8452107
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index bafef7b..fb8d353 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -444,7 +444,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
else
pTmpFrm = SfxViewFrame::GetFirst( this );
- pTmpFrm->GetDispatcher()->Execute( nSlotId, 0, 0, SFX_CALLMODE_ASYNCHRON );
+ if (pTmpFrm)
+ pTmpFrm->GetDispatcher()->Execute( nSlotId, 0, 0, SFX_CALLMODE_ASYNCHRON );
}
rReq.SetReturnValue(SfxBoolItem(SID_PRINTPREVIEW, bSet ));
commit e6fd5873a002a75074cbaf8462be97ae3a97050b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:15:02 2014 +0000
coverity#705516 Dereference null return value
Change-Id: I026e543ef2887276f6cd72109038e888f72eafab
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index 5cb9a63..bafef7b 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -160,7 +160,8 @@ void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
pTempView->SetPrinter( GetDoc()->getPrinter( false ), SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
GetDoc()->CheckDefaultPageFmt();
SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
- do {
+ while (pTmpFrm)
+ {
if( pTmpFrm != pTempView->GetViewFrame() )
{
pTmpFrm->DoClose();
@@ -168,8 +169,7 @@ void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
}
else
pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False);
-
- } while ( pTmpFrm );
+ }
const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions();
pTempView->GetWrtShell().CheckBrowseView( sal_True );
pTempView->CheckVisArea();
commit 532cd8a2b5a73455e23ec16beb8835bf4552181f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:13:18 2014 +0000
coverity#705515 Dereference null return value
Change-Id: I124dd8e5eacb54194f07fe867916da82d74d8f6f
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index e3612656..f3a4131 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -201,7 +201,7 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
return;
SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )->GetGrfNode();
- if( !pGrfNd->IsGrfLink() )
+ if (pGrfNd && !pGrfNd->IsGrfLink())
{
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
commit 9e8001eb2c41ea79592f6975b8c3e904d7ce1175
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:12:31 2014 +0000
coverity#705509 Dereference null return value
Change-Id: Ia5134f5091dbdcaf1118bf6ee121261fc27f7e05
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 5ff6a3b..43934af 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -728,16 +728,19 @@ IMAGE_SETEVENT:
}
}
- if( !sAltNm.isEmpty() )
- pGrfNd->SetTitle( sAltNm );
+ if (pGrfNd)
+ {
+ if( !sAltNm.isEmpty() )
+ pGrfNd->SetTitle( sAltNm );
- if( bSetTwipSize )
- pGrfNd->SetTwipSize( aGrfSz );
+ if( bSetTwipSize )
+ pGrfNd->SetTwipSize( aGrfSz );
- pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
+ pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
- if( bSetScaleImageMap )
- pGrfNd->SetScaleImageMap( sal_True );
+ if( bSetScaleImageMap )
+ pGrfNd->SetScaleImageMap( sal_True );
+ }
if( aAttrTab.pINetFmt )
{
@@ -793,7 +796,7 @@ IMAGE_SETEVENT:
// Wenn die Grafik gleich angeforder wird, muss dies geschehen,
// nachdem das Format vollstaendig aufgebaut ist, weil es evtl.
// gleich (synchron) angepasst wird (war bug #40983#)
- if( bRequestGrfNow )
+ if (bRequestGrfNow && pGrfNd)
{
pGrfNd->SwapIn();
}
commit 44d23b2c0ac9227e637229dc9845e269bc5a5905
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:10:31 2014 +0000
coverity#705508 Dereference null return value
Change-Id: Idbd70944ff637de32f5d2d11089efebe22692267
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 3721920..0d13a32 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3335,11 +3335,12 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
SwFrmFmt* pFmt = GetFrmFmt();
const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap().getByName(rPropertyName);
+
+ if (!pEntry)
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+
if(pFmt)
{
- if (!pEntry)
- throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
-
if(0xFF == pEntry->nMemberId)
{
aRet = lcl_GetSpecialProperty(pFmt, pEntry );
commit df9cd33b545e59745352f21c71aa897debf1858c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:07:44 2014 +0000
coverity#705506 Dereference null return value
Change-Id: Id5676b391037d5fbee3bba0df1ee1e312dcb775c
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 4d8cd3e..a6f6561 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2280,7 +2280,8 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
{
SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFmt->GetCntnt().GetCntntIdx()
->GetIndex()+1 ]->GetGrfNode();
- pGrfNd->SetChgTwipSize( !bSizeFound );
+ if (pGrfNd)
+ pGrfNd->SetChgTwipSize( !bSizeFound );
pFmt->Add(this);
if(!m_sName.isEmpty())
pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
commit 6cf39bbe4cef84ca94ad55618eaa3f063db119b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:06:28 2014 +0000
coverity#705505 Dereference null return value
Change-Id: Idd584ef2756076fc0fb73e0ee8981a38b0cf0649
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index df502eb..3a74264 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -941,7 +941,9 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
if( OUTDEV_VIRDEV == rInf.GetOut()->GetOutDevType() &&
pViewShell && pViewShell->GetWin() )
{
- ( (Graphic*) pBrush->GetGraphic() )->StopAnimation(0,nId);
+ Graphic* pGraph = (Graphic*)pBrush->GetGraphic();
+ if (pGraph)
+ pGraph->StopAnimation(0,nId);
rInf.GetTxtFrm()->getRootFrm()->GetCurrShell()->InvalidateWindows( aTmp );
}
@@ -951,8 +953,12 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
// #i9684# Stop animation during printing/pdf export.
pViewShell->GetWin() )
{
- ( (Graphic*) pBrush->GetGraphic() )->StartAnimation(
- (OutputDevice*)rInf.GetOut(), aPos, aSize, nId );
+ Graphic* pGraph = (Graphic*)pBrush->GetGraphic();
+ if (pGraph)
+ {
+ pGraph->StartAnimation(
+ (OutputDevice*)rInf.GetOut(), aPos, aSize, nId );
+ }
}
// pdf export, printing, preview, stop animations...
@@ -960,7 +966,12 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const
bDraw = true;
}
if( bDraw )
- ( (Graphic*) pBrush->GetGraphic() )->StopAnimation( 0, nId );
+ {
+
+ Graphic* pGraph = (Graphic*)pBrush->GetGraphic();
+ if (pGraph)
+ pGraph->StopAnimation( 0, nId );
+ }
}
SwRect aRepaint( rInf.GetPaintRect() );
commit 53a46e24cded1b92c9af337f392dc531b1422f10
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:03:29 2014 +0000
coverity#705503 Dereference null return value
Change-Id: I6d21ba4de5ab61f9141abf9de5da843a7ad5ed76
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 0277a0a..df502eb 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -794,14 +794,22 @@ SwGrfNumPortion::SwGrfNumPortion(
SwGrfNumPortion::~SwGrfNumPortion()
{
if ( IsAnimated() )
- ( (Graphic*) pBrush->GetGraphic() )->StopAnimation( 0, nId );
+ {
+ Graphic* pGraph = ( (Graphic*) pBrush->GetGraphic() );
+ if (pGraph)
+ pGraph->StopAnimation( 0, nId );
+ }
delete pBrush;
}
void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
{
if ( IsAnimated() )
- ( (Graphic*) pBrush->GetGraphic() )->StopAnimation( pOut, nId );
+ {
+ Graphic* pGraph = ( (Graphic*) pBrush->GetGraphic() );
+ if (pGraph)
+ pGraph->StopAnimation( pOut, nId );
+ }
}
bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
commit 89cf8bd7c6b1cba158d5d103b1599ac34f95e423
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 11:01:07 2014 +0000
coverity#705844 Dereference before null check
Change-Id: I6505b2825d99e3e294814f8ece0d54fe6fd74c1f
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index f6f915a..452038a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3052,20 +3052,17 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
aMenuPos.X() += bLayoutIsRTL ? -nSizeXPix : nSizeXPix;
aMenuPos.Y() += nSizeYPix;
- if (pViewData)
+ ScTabViewShell* pViewSh = pViewData->GetViewShell();
+ if (pViewSh)
{
- ScTabViewShell* pViewSh = pViewData->GetViewShell();
- if (pViewSh)
- {
- // Is a draw object selected?
+ // Is a draw object selected?
- SdrView* pDrawView = pViewSh->GetSdrView();
- if (pDrawView && pDrawView->AreObjectsMarked())
- {
- // #100442#; the conext menu should open in the middle of the selected objects
- Rectangle aSelectRect(LogicToPixel(pDrawView->GetAllMarkedBoundRect()));
- aMenuPos = aSelectRect.Center();
- }
+ SdrView* pDrawView = pViewSh->GetSdrView();
+ if (pDrawView && pDrawView->AreObjectsMarked())
+ {
+ // #100442#; the conext menu should open in the middle of the selected objects
+ Rectangle aSelectRect(LogicToPixel(pDrawView->GetAllMarkedBoundRect()));
+ aMenuPos = aSelectRect.Center();
}
}
}
commit ca9837247e5086a20e468832664b8a4c722dee2d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:59:11 2014 +0000
coverity#705789 Dereference before null check
Change-Id: Ie33efea9070d1ccd97572cfbb642db847a2f32f7
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 59d4c47..051e223 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -895,6 +895,9 @@ sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
sal_Int32 nOffset = nFirstOffset;
+ if (!m_pTable)
+ return sal_False;
+
const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
again:
commit 441ff2638bef1c22c829f50fef61f9cda01afd19
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:56:22 2014 +0000
coverity#705796 Dereference before null check
Change-Id: I31b576d3aafb00939e55e2a9abbbdb5442844ba1
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 99ae2f1..8e34cf4 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -418,7 +418,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
}
- if(*pSaveNum != *pActNum)
+ if(pActNum && *pSaveNum != *pActNum)
{
*pActNum = *pSaveNum;
m_pExamplesVS->SetNoSelection();
commit db8d9db4a341e254f103f99604022def798be36c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:55:43 2014 +0000
coverity#705797 Dereference before null check
Change-Id: If504fce5a437d9d4f5ea89be154fa324d5cca5a3
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0ec0d18..99ae2f1 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -258,7 +258,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
}
- if(*pSaveNum != *pActNum)
+ if(pActNum && *pSaveNum != *pActNum)
{
*pActNum = *pSaveNum;
m_pExamplesVS->SetNoSelection();
commit ec76f39ab52bbfa8d2ce18e28856a443c4fd1d6e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 13 10:54:33 2014 +0000
coverity#705808 Dereference before null check
Change-Id: Ibeaf8989e54017f7cf30a4ffc3f639cd43983d03
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 1843379..2cd7e56 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -969,11 +969,11 @@ sal_Bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) con
OQueryTableConnection* pTemp = static_cast<OQueryTableConnection*>(*aIter);
if (pTemp->IsVisited() &&
(pFrom == static_cast< OQueryTableWindow*>(pTemp->GetSourceWin()) || pFrom == static_cast< OQueryTableWindow*>(pTemp->GetDestWin())))
- return pTemp != NULL;
+ return true;
}
}
- return sal_False;
+ return false;
}
void OQueryTableView::onNoColumns_throw()
More information about the Libreoffice-commits
mailing list