[Libreoffice-commits] core.git: 38 commits - include/svtools lotuswordpro/source registry/source reportdesign/source sc/source sd/source svtools/source svx/source sw/source vbahelper/source
Caolán McNamara
caolanm at redhat.com
Wed Mar 19 08:40:06 PDT 2014
include/svtools/asynclink.hxx | 22 ++-
include/svtools/editbrowsebox.hxx | 1
lotuswordpro/source/filter/lwpcelllayout.cxx | 6 -
lotuswordpro/source/filter/lwplayout.cxx | 5
lotuswordpro/source/filter/lwppara.cxx | 155 +++++++++++++--------------
lotuswordpro/source/filter/lwpstory.cxx | 2
registry/source/reflwrit.cxx | 1
reportdesign/source/ui/dlg/GroupsSorting.cxx | 5
sc/source/core/data/dociter.cxx | 14 +-
sc/source/filter/excel/impop.cxx | 3
sc/source/filter/xml/XMLExportIterator.cxx | 3
sd/source/ui/func/fupage.cxx | 3
sd/source/ui/view/drtxtob1.cxx | 4
svtools/source/brwbox/editbrowsebox.cxx | 5
svtools/source/config/printoptions.cxx | 1
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/svdraw/svdopath.cxx | 1
svx/source/svdraw/svdotext.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 3
svx/source/toolbars/extrusionbar.cxx | 45 ++++---
svx/source/unodraw/unopool.cxx | 2
sw/source/core/attr/format.cxx | 5
sw/source/core/crsr/crstrvl.cxx | 4
sw/source/core/doc/doctxm.cxx | 4
sw/source/core/layout/fly.cxx | 23 ++--
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/table/swtable.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 1
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
vbahelper/source/msforms/vbauserform.cxx | 2
31 files changed, 185 insertions(+), 147 deletions(-)
New commits:
commit d1a8a119f267f0eda36dc28fece111a1b6c0b6ec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:21:44 2014 +0000
coverity#708279 Uninitialized pointer field
Change-Id: I65b245c3f262f2ad2665e7d0c3c246104e36eacd
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 53fb5ef..fc0f0c1 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -504,6 +504,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
}
SvtBasePrintOptions::SvtBasePrintOptions()
+ : m_pDataContainer(NULL)
{
}
commit 60211f44fd1fe27497f1a599091437a65ca4094b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:20:17 2014 +0000
coverity#708277 Uninitialized pointer field
Change-Id: I9877ef518b68afada1abaf47ebb167fcaf7bda16
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 783aa72..ec048fe 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -138,6 +138,7 @@ namespace svt
,nStartEvent(0)
,nEndEvent(0)
,nCellModifiedEvent(0)
+ ,m_pFocusWhileRequest(0)
,nPaintRow(-1)
,nEditRow(-1)
,nOldEditRow(-1)
@@ -147,8 +148,8 @@ namespace svt
,bPaintStatus(sal_True)
,bActiveBeforeTracking( sal_False )
,m_nBrowserFlags(nBrowserFlags)
+ ,pHeader(NULL)
{
-
impl_construct();
}
@@ -158,6 +159,7 @@ namespace svt
,nStartEvent(0)
,nEndEvent(0)
,nCellModifiedEvent(0)
+ ,m_pFocusWhileRequest(0)
,nPaintRow(-1)
,nEditRow(-1)
,nOldEditRow(-1)
@@ -169,7 +171,6 @@ namespace svt
,m_nBrowserFlags(nBrowserFlags)
,pHeader(NULL)
{
-
impl_construct();
}
commit e2363a12a613e04c39bb2bf88ea2bdec4b42e04c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:18:42 2014 +0000
unused pMouseEvent member
Change-Id: I4d3d9bcdfdb43a2a628dcd1411962f78f81a81e2
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index d02a83b..62fa334 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -471,7 +471,6 @@ namespace svt
void Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown);
} aMouseEvent;
- const BrowserMouseEvent* pMouseEvent; // is set during a mouse event
CellControllerRef aController,
aOldController;
commit 011f1e6c90a1fb50d73493b931b73559388826e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:14:43 2014 +0000
coverity#708192 Uninitialized pointer field
Change-Id: Iaccc034f61442242ce1b864457f0d048cdeae98d
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index af10d73..1428cd5 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -43,11 +43,23 @@ class SVT_DLLPUBLIC AsynchronLink
SVT_DLLPRIVATE void Call_Impl( void* pArg );
public:
- AsynchronLink( const Link& rLink ) :
- _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ),
- _pDeleted( 0 ), _pMutex( 0 ){}
- AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ),
- _pDeleted( 0 ), _pMutex( 0 ){}
+ AsynchronLink( const Link& rLink )
+ : _aLink( rLink )
+ , _nEventId( 0 )
+ , _pTimer( 0 )
+ , _bInCall( sal_False )
+ , _pDeleted( 0 )
+ , _pArg( 0 )
+ , _pMutex( 0 )
+ {}
+ AsynchronLink()
+ : _nEventId( 0 )
+ , _pTimer( 0 )
+ , _bInCall( sal_False )
+ , _pDeleted( 0 )
+ , _pArg( 0 )
+ , _pMutex( 0 )
+ {}
~AsynchronLink();
void CreateMutex();
commit 9891fcf7c8e88261a5b85b65a7f1f7705a3a26b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:11:47 2014 +0000
coverity#708133 Uninitialized pointer field
Change-Id: I4d835ae5d01cf29a86e3515d43b3acd4d7d2bc82
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index f12f3e1..57513e7 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -112,7 +112,8 @@ FuPage::FuPage( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
mbPageBckgrdDeleted( false ),
mbMasterPage( false ),
mbDisplayBackgroundTabPage( true ),
- mpPage(0)
+ mpPage(0),
+ mpDrawViewShell(0)
{
}
commit b9122276fa6072316f0fe549e8df4791bf28f33f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:10:32 2014 +0000
coverity#708064 Uninitialized pointer field
Change-Id: I83abe55a758a6900942de4ba337f9fb5444cd866
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index edccba9..329ee78 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -595,7 +595,10 @@ void ScMyDetectiveOpContainer::Sort()
ScMyCell::ScMyCell() :
aShapeList(),
aDetectiveObjVec(),
+ pNote(NULL),
nValidationIndex(-1),
+ nStyleIndex(-1),
+ nNumberFormat(-1),
bIsAutoStyle( false ),
bHasShape( false ),
bIsMergedBase( false ),
commit 6ac4f497ef7cb6d884d914803fe46f676076c3c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 14:05:46 2014 +0000
coverity#708030 Uninitialized pointer field
Change-Id: I9ccd976bc384e6bee078caf693db737f9b0ef0e1
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index d79c1d8..4bc69bb 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -114,6 +114,9 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
maStrm( rStrm, GetRoot() ),
aIn( maStrm ),
maScOleSize( ScAddress::INITIALIZE_INVALID ),
+ pColOutlineBuff(NULL),
+ pRowOutlineBuff(NULL),
+ pColRowBuff(NULL),
mpLastFormula(NULL),
mnLastRefIdx( 0 ),
mnIxfeIndex( 0 ),
commit a8c9edffd4014485d84b50e0a403a34d8e63bb74
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 13:24:21 2014 +0000
coverity#707994 Uninitialized pointer field
Change-Id: I667f93be72bd5d6cc68725b7cb5d97e30d8df521
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3a1e7d9..70b2c83 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2413,11 +2413,15 @@ inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
}
ScUsedAreaIterator::ScUsedAreaIterator( ScDocument* pDocument, SCTAB nTable,
- SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) :
- aCellIter( pDocument, nTable, nCol1, nRow1, nCol2, nRow2 ),
- aAttrIter( pDocument, nTable, nCol1, nRow1, nCol2, nRow2 ),
- nNextCol( nCol1 ),
- nNextRow( nRow1 )
+ SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
+ : aCellIter( pDocument, nTable, nCol1, nRow1, nCol2, nRow2 )
+ , aAttrIter( pDocument, nTable, nCol1, nRow1, nCol2, nRow2 )
+ , nNextCol( nCol1 )
+ , nNextRow( nRow1 )
+ , nFoundStartCol( 0 )
+ , nFoundEndCol( 0 )
+ , nFoundRow( 0 )
+ , pFoundPattern( NULL )
{
pCell = aCellIter.GetNext( nCellCol, nCellRow );
pPattern = aAttrIter.GetNext( nAttrCol1, nAttrCol2, nAttrRow );
commit 497603f8ffa3572de8e389ba258b64658ab32271
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 13:20:33 2014 +0000
coverity#707966 Uninitialized pointer field
Change-Id: Id82e970423dd044c597271b2fa9459cabddd7e26
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 23b065d..a4161ec 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -701,6 +701,7 @@ TypeWriter::TypeWriter(typereg_Version version,
, m_fieldCount(fieldCount)
, m_methodCount(methodCount)
, m_referenceCount(referenceCount)
+ , m_references(NULL)
, m_blop(NULL)
, m_blopSize(0)
{
commit d8833c45de6f5d0341817590bf051bcbbfcd95db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 13:14:43 2014 +0000
coverity#735336 Unchecked return value
Change-Id: Ic5bd2ecf827be68510877589b64305b5704d7488
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index cfe17cb..646c4eb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2989,7 +2989,7 @@ void WW8PLCFx_Fc_FKP::advance()
pFkp->advance();
if( pFkp->Where() == WW8_FC_MAX )
- NewFkp();
+ (void)NewFkp();
}
sal_uInt16 WW8PLCFx_Fc_FKP::GetIstd() const
commit 2196d1b7508e5e4da1be485c37adbd980f59b97f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 13:13:46 2014 +0000
coverity#982489 Unchecked dynamic_cast
Change-Id: I6211295884a2ddd4d2b1bfa2a9e1c2d31e6559da
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 70fd50e..85a1265 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -263,7 +263,7 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr
{
uno::Reference< msforms::XControl > xVBAControl = ScVbaControlFactory::createUserformControl( mxContext, xControl, xDialogControl, m_xModel, mpGeometryHelper->getOffsetX(), mpGeometryHelper->getOffsetY() );
ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
- if ( !m_sLibName.isEmpty() )
+ if (pControl && !m_sLibName.isEmpty())
pControl->setLibraryAndCodeName( m_sLibName.concat( "." ).concat( getName() ) );
aResult = uno::makeAny( xVBAControl );
}
commit c2a27dda25943a148f30cad44b71052a606879ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:40:47 2014 +0000
coverity#735760 Unchecked dynamic_cast
Change-Id: I0ef7b6a35fe5f23a2572e6a6746fe39567d33079
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 8bb7b86..d8983b9 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -491,6 +491,8 @@ OUString LwpStory::GetContentText(sal_Bool bAllText)
OUString LwpStory::RegisterFirstFribStyle()
{
LwpPara* pPara = dynamic_cast<LwpPara*>(GetFirstPara()->obj());
+ if (!pPara)
+ return OUString("");
pPara->SetFoundry(m_pFoundry);
LwpFribPtr* pFribs = pPara->GetFribs();
if (pFribs)
commit eecb2b8db8125294d85a37cbb184743b659eeaf3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:36:34 2014 +0000
coverity#735758 Unchecked dynamic_cast
Change-Id: I7d995f0f54034e1ab4927e1aaa3632b975b8d7fc
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 1dc1ad0..7a00278 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -377,7 +377,7 @@ void LwpPara::RegisterStyle()
pOverStyle->SetStyleName("");
LwpParaProperty* pProps = m_pProps;
sal_uInt32 PropType;
- LwpParaStyle* pParaStyle = dynamic_cast<LwpParaStyle*>(m_ParaStyle.obj());
+ LwpParaStyle& rParaStyle = dynamic_cast<LwpParaStyle&>(*m_ParaStyle.obj());
while (pProps)
{
PropType = pProps->GetType();
@@ -385,12 +385,12 @@ void LwpPara::RegisterStyle()
{
case PP_LOCAL_ALIGN:
{
- if (!pParaStyle->GetAlignment())
+ if (!rParaStyle.GetAlignment())
OverrideAlignment(NULL,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle);
else
{
boost::scoped_ptr<LwpAlignmentOverride> const pAlign(
- pParaStyle->GetAlignment()->clone());
+ rParaStyle.GetAlignment()->clone());
OverrideAlignment(pAlign.get(),
static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),
pOverStyle);
@@ -400,7 +400,7 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_INDENT:
{
noIndent = sal_False;
- if (!pParaStyle->GetIndent())
+ if (!rParaStyle.GetIndent())
OverrideIndent(NULL,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
else
@@ -412,12 +412,12 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_SPACING:
{
noSpacing = sal_False;
- if (!pParaStyle->GetSpacing())
+ if (!rParaStyle.GetSpacing())
OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
else
{
boost::scoped_ptr<LwpSpacingOverride> const
- pSpacing(pParaStyle->GetSpacing()->clone());
+ pSpacing(rParaStyle.GetSpacing()->clone());
OverrideSpacing(pSpacing.get(),
static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),
pOverStyle);
@@ -450,7 +450,7 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_TABRACK:
{
//, 01/28/05
- /*LwpTabOverride* pTabOverride=pParaStyle->GetTabOverride();
+ /*LwpTabOverride* pTabOverride=rParaStyle.GetTabOverride();
if(!pTabOverride)
{
OverrideTab(NULL,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle);
@@ -464,11 +464,11 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_BACKGROUND:
{
/* LwpBackgroundOverride aBackground;
- if (!pParaStyle->GetBackground())
+ if (!rParaStyle.GetBackground())
OverrideBackground(NULL,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
else
{
- aBackground = *(pParaStyle->GetaBackground());
+ aBackground = *(rParaStyle.GetaBackground());
OverrideBackground(&aBackground,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
}
*/
commit 69255b7ca8e6c5c6166ae88fe892d64b185cc62a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:28:16 2014 +0000
fix indent
Change-Id: Ibc1f8cf36730d862cced166e25e306284773f6ad
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index de58aa6..1dc1ad0 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -378,7 +378,7 @@ void LwpPara::RegisterStyle()
LwpParaProperty* pProps = m_pProps;
sal_uInt32 PropType;
LwpParaStyle* pParaStyle = dynamic_cast<LwpParaStyle*>(m_ParaStyle.obj());
- while(pProps)
+ while (pProps)
{
PropType = pProps->GetType();
switch(PropType)
@@ -424,97 +424,96 @@ void LwpPara::RegisterStyle()
}
}
break;
- // 01/25/2005
- case PP_LOCAL_BORDER:
- {
- OverrideParaBorder(pProps, pOverStyle);
- break;
- }
- case PP_LOCAL_BREAKS:
- {
- OverrideParaBreaks(pProps, pOverStyle);
- break;
- }
- case PP_LOCAL_BULLET:
- {
- pBulletProps = pProps;
-// OverrideParaBullet(pProps);
- break;
- }
- case PP_LOCAL_NUMBERING:
- {
- pNumberingProps = pProps;
-// OverrideParaNumbering(pProps);
- break;
- }
- //end
- case PP_LOCAL_TABRACK:
- {
- //, 01/28/05
- /*LwpTabOverride* pTabOverride=pParaStyle->GetTabOverride();
- if(!pTabOverride)
+ case PP_LOCAL_BORDER:
{
- OverrideTab(NULL,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle);
+ OverrideParaBorder(pProps, pOverStyle);
+ break;
}
- else
+ case PP_LOCAL_BREAKS:
{
- OverrideTab(pTabOverride,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle);
- }*/
- break;
- }
- case PP_LOCAL_BACKGROUND:
- {
-/* LwpBackgroundOverride aBackground;
- if (!pParaStyle->GetBackground())
- OverrideBackground(NULL,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
- else
+ OverrideParaBreaks(pProps, pOverStyle);
+ break;
+ }
+ case PP_LOCAL_BULLET:
{
- aBackground = *(pParaStyle->GetaBackground());
- OverrideBackground(&aBackground,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
+ pBulletProps = pProps;
+ // OverrideParaBullet(pProps);
+ break;
+ }
+ case PP_LOCAL_NUMBERING:
+ {
+ pNumberingProps = pProps;
+ // OverrideParaNumbering(pProps);
+ break;
}
-*/
- // modified by , 06/03/2005
- LwpBackgroundOverride* pBGOver = static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground();
- if (pBGOver)
+ //end
+ case PP_LOCAL_TABRACK:
{
- LwpBackgroundStuff* pBGStuff = pBGOver->GetBGStuff();
- if (pBGStuff && !pBGStuff->IsTransparent() )
+ //, 01/28/05
+ /*LwpTabOverride* pTabOverride=pParaStyle->GetTabOverride();
+ if(!pTabOverride)
{
- if (pBGStuff->IsPatternFill())
- {
- XFBGImage* pXFBGImage = pBGStuff->GetFillPattern();
- pOverStyle->SetBackImage(pXFBGImage);
- }
- else
+ OverrideTab(NULL,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle);
+ }
+ else
+ {
+ OverrideTab(pTabOverride,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle);
+ }*/
+ break;
+ }
+ case PP_LOCAL_BACKGROUND:
+ {
+ /* LwpBackgroundOverride aBackground;
+ if (!pParaStyle->GetBackground())
+ OverrideBackground(NULL,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
+ else
+ {
+ aBackground = *(pParaStyle->GetaBackground());
+ OverrideBackground(&aBackground,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle);
+ }
+ */
+ // modified by , 06/03/2005
+ LwpBackgroundOverride* pBGOver = static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground();
+ if (pBGOver)
+ {
+ LwpBackgroundStuff* pBGStuff = pBGOver->GetBGStuff();
+ if (pBGStuff && !pBGStuff->IsTransparent() )
{
- LwpColor* pColor = pBGStuff->GetFillColor();
- if (pColor && pColor->IsValidColor())
+ if (pBGStuff->IsPatternFill())
{
- XFColor aXFColor( pColor->To24Color());
- pOverStyle->SetBackColor( aXFColor );
+ XFBGImage* pXFBGImage = pBGStuff->GetFillPattern();
+ pOverStyle->SetBackImage(pXFBGImage);
+ }
+ else
+ {
+ LwpColor* pColor = pBGStuff->GetFillColor();
+ if (pColor && pColor->IsValidColor())
+ {
+ XFColor aXFColor( pColor->To24Color());
+ pOverStyle->SetBackColor( aXFColor );
+ }
}
}
}
+ // end modified
+ break;
+ }
+ default:
+ break;
}
- // end modified
- break;
- }
- default:
- break;
- }
pProps = pProps->GetNext();
}
if (noIndent && m_pIndentOverride)
+ {
+ if (m_pIndentOverride->IsUseRelative() && GetParent())
{
- if (m_pIndentOverride->IsUseRelative() && GetParent())
- {
OverrideIndent(NULL,m_pIndentOverride,pOverStyle);
- }
}
- if (!m_ParentStyleName.isEmpty())
- pOverStyle->SetParentStyleName(m_ParentStyleName);
- m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
+ }
+ if (!m_ParentStyleName.isEmpty())
+ pOverStyle->SetParentStyleName(m_ParentStyleName);
+ m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName();
}
else //use named style
commit 3d1b1eea83703919c43620f9adef05e5b24c4bed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:27:07 2014 +0000
coverity#735757 Unchecked dynamic_cast
Change-Id: I268b9c4df81598f68b8da2c258d70c2118b69d82
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 5dbf65f..c0fd96d 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -921,7 +921,10 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
if(m_nAttributes & OVER_TABS)
{
if(!m_TabPiece.IsNull())
- return (LwpTabOverride*) dynamic_cast<LwpTabPiece*>(m_TabPiece.obj())->GetOverride();
+ {
+ LwpTabPiece *pPiece = dynamic_cast<LwpTabPiece*>(m_TabPiece.obj());
+ return (LwpTabOverride*)(pPiece ? pPiece->GetOverride() : NULL);
+ }
return NULL;
}
else if( !m_BasedOnStyle.IsNull() )
commit b9b8ddb60ec57df04828e9386c97d8bc6d12d34c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:25:25 2014 +0000
coverity#735756 Unchecked dynamic_cast
Change-Id: Iaa2bc4bca3e0fe3d88cefb8c9285f771ecb49cb4
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 169af71..a92720d 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -873,7 +873,7 @@ XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow,
return NULL;
LwpConnectedCellLayout* pConnCell = dynamic_cast<LwpConnectedCellLayout* >(cconnectedlayout.obj());
- if (nRow < (pConnCell->GetNumrows()+pConnCell->GetRowID()))
+ if (!pConnCell || nRow < (pConnCell->GetNumrows()+pConnCell->GetRowID()))
return NULL;
// if the hidden cell should be displayed for limit of SODC
// use the default cell layout
commit 6ebaafcc8b8dcce42f2752943dc0b76ad2edce0c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 12:24:45 2014 +0000
coverity#735755 Unchecked dynamic_cast
Change-Id: Ica94951214a33713844d5a9209d74eb4c67409f7
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index d82e207..169af71 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -663,8 +663,8 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
{
// judge whole table
LwpTable * pTable = dynamic_cast<LwpTable *>(aTableID.obj());
- LwpTableLayout * pTableLayout = static_cast<LwpTableLayout *>(pTable->GetTableLayout());
- LwpSuperTableLayout * pSuper = pTableLayout->GetSuperTableLayout();
+ LwpTableLayout * pTableLayout = pTable ? static_cast<LwpTableLayout *>(pTable->GetTableLayout()) : NULL;
+ LwpSuperTableLayout * pSuper = pTableLayout ? pTableLayout->GetSuperTableLayout() : NULL;
if (pSuper && pSuper->IsProtected())
{
bProtected = sal_True;
commit 2c75e2953e80d0523d1807aac1f4d303d63807b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:54:12 2014 +0000
coverity#736065 Missing break in switch
Change-Id: I8a94b7ab0fb7ca30da1665ae4745aafbaeed687b
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 0c4e001..ddb30bd 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4789,6 +4789,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
default:
//Can't get an unknown type here
OSL_FAIL("Unknown frame direction");
+ //fall-through
case FRMDIR_HORI_LEFT_TOP:
nTextFlow = 0;
break;
commit 754fb98bd2c65d35e2ade6eaf78e89fabc85374c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:53:25 2014 +0000
coverity#736064 Missing break in switch
Change-Id: If57e5e4459bc8e07d980c0f5d68151e26b9b8bf2
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index da25acc..0c4e001 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3794,6 +3794,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
{
default:
OSL_FAIL("Unknown grid type");
+ //fall-through
case GRID_NONE:
nGridType = 0;
break;
commit 06116f0d41e7813bf606211af8cfb5b5941adf30
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:52:45 2014 +0000
coverity#736063 Missing break in switch
Change-Id: I4d0e9057007aebfe9ed37899b36f8db6f51d95d2
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 5554666..fa54ab8 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2993,6 +2993,7 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId,
{
default:
OSL_ENSURE(!this, "unknown direction type");
+ //fall-through
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
break;
commit 5b009d883cdc7a1ea497317097771e08953dc08c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:51:26 2014 +0000
coverity#705262 Missing break in switch
Change-Id: I21e38364cc709defb7d3ece4a549944bfde9a9f3
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 4e9c2c0..cbf030e 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1310,6 +1310,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
SdrObjKind eNewKind=(SdrObjKind)nIdent;
switch (eNewKind) {
case OBJ_CARC: case OBJ_CIRC: case OBJ_CCUT: case OBJ_SECT: eNewKind=OBJ_CARC;
+ //fall-through
case OBJ_RECT:
case OBJ_LINE: case OBJ_PLIN: case OBJ_POLY:
case OBJ_PATHLINE: case OBJ_PATHFILL:
commit d8c25ba6e499f99a25adf0c70a14c066bc612b42
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:45:45 2014 +0000
coverity#735861 Explicit null dereferenced
Change-Id: I6aab9f94804ea3de4b7a8f17589df9ebc54be42d
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9fd0bde..749f83d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3076,7 +3076,7 @@ sal_Bool DbGridControl::SaveModified()
size_t Location = GetModelColumnPos( GetCurColumnId() );
DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
- sal_Bool bOK = pColumn->Commit();
+ sal_Bool bOK = pColumn ? pColumn->Commit() : sal_False;
DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" );
if ( !Controller().Is() )
// this might happen if the callbacks implicitly triggered by Commit
commit ae70ec25de95fbdb039a245ab01e7bf633d5960f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:39:13 2014 +0000
coverity#705874 Dereference before null check
Change-Id: I41388981823b4e27a63aa6ecb860da8abc05f5b4
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 9605277..9008f55 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -100,7 +100,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( pArgs )
{
SdDrawDocument& rDoc = mpView->GetDoc();
- OSL_ASSERT (mpViewShell->GetViewShell()!=NULL);
+ assert(mpViewShell->GetViewShell());
rtl::Reference<FuPoor> xFunc( FuTemplate::Create( mpViewShell, static_cast< ::sd::Window*>( mpViewShell->GetViewShell()->GetWindow()), mpView, &rDoc, rReq ) );
if(xFunc.is())
@@ -110,7 +110,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( rReq.GetSlot() == SID_STYLE_APPLY )
{
- if( mpViewShell && mpViewShell->GetViewFrame() )
+ if (mpViewShell->GetViewFrame())
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_APPLY );
}
}
commit c9c1fa961c437b1ba9d393070453bef9b0543771
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:23:28 2014 +0000
coverity#705822 Dereference before null check
Change-Id: I1b54b89254211f5f6191a8f1b6af9181f90bd071
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index bfe8255..c704062 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1204,7 +1204,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(nRow);
if ( pListBox != &m_aHeaderLst && pListBox != &m_aFooterLst)
{
- if ( pListBox && pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() )
+ if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() )
SaveData(nRow);
if ( pListBox == &m_aGroupOnLst )
m_aGroupIntervalEd.Enable( pListBox->GetSelectEntryPos() != 0 );
commit e19cbd4ce855365eb157e1a619712c9c194ba90d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:22:51 2014 +0000
coverity#705821 Dereference before null check
Change-Id: I3467f6be08794a663b9836ac02195ce2bf9ff4f2
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d84b3d87..bfe8255 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1223,8 +1223,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
aArgs[0].Value <<= pListBox->GetSelectEntryPos() == 0;
m_pController->executeChecked(&m_aHeaderLst == pListBox ? SID_GROUPHEADER : SID_GROUPFOOTER,aArgs);
- if ( m_pFieldExpression )
- m_pFieldExpression->InvalidateHandleColumn();
+ m_pFieldExpression->InvalidateHandleColumn();
}
}
return 1L;
commit 984fa4ca0ba09d4a5201c6c2a7a92aea27485bde
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:21:01 2014 +0000
coverity#704905 Dereference after null check
Change-Id: I3b66764c6c783d2a076d6b201be2d4473891bd83
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 1da9bd4..a8850aa 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1430,7 +1430,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
//Close the section, where appropriate activate the surrounding
//section again.
- SwActualSection *pTmp = pActualSection->GetUpper();
+ SwActualSection *pTmp = pActualSection ? pActualSection->GetUpper() : NULL;
delete pActualSection;
pLay = pLay->FindSctFrm();
if ( 0 != (pActualSection = pTmp) )
commit d61357486901659a4d719c4a7361c35ecea165f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:19:30 2014 +0000
coverity#704904 Dereference after null check
Change-Id: I605a8c7f0dc1519a70db1fc6d6dd9acff32e3bd5
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 288f53b..b5b7926 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -677,7 +677,7 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
{
sal_uInt8 nInvFlags = 0;
- if( pNew && RES_ATTRSET_CHG == pNew->Which() )
+ if (pNew && pOld && RES_ATTRSET_CHG == pNew->Which())
{
SfxItemIter aNIter( *((SwAttrSetChg*)pNew)->GetChgSet() );
SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() );
commit 136e16955a5bc68fd1f33f7f7b26154ec68b1a32
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:18:24 2014 +0000
coverity#704902 Dereference after null check
Change-Id: Ie7ab3fa80cb7231cee1f741f53af541633fa427e
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 809f140..288f53b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -791,19 +791,19 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
break;
case RES_PROTECT:
+ if (pNew)
{
- const SvxProtectItem *pP = (SvxProtectItem*)pNew;
- GetVirtDrawObj()->SetMoveProtect( pP->IsPosProtected() );
- GetVirtDrawObj()->SetResizeProtect( pP->IsSizeProtected() );
- if( pSh )
- {
- SwRootFrm* pLayout = getRootFrm();
- if( pLayout && pLayout->IsAnyShellAccessible() )
- pSh->Imp()->InvalidateAccessibleEditableState( true, this );
+ const SvxProtectItem *pP = (SvxProtectItem*)pNew;
+ GetVirtDrawObj()->SetMoveProtect( pP->IsPosProtected() );
+ GetVirtDrawObj()->SetResizeProtect( pP->IsSizeProtected() );
+ if( pSh )
+ {
+ SwRootFrm* pLayout = getRootFrm();
+ if( pLayout && pLayout->IsAnyShellAccessible() )
+ pSh->Imp()->InvalidateAccessibleEditableState( true, this );
+ }
}
break;
- }
-
case RES_COL:
if (pOld && pNew)
{
commit c2ea2e6ca99395cc6d9ea8f2edf009252dc87957
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:17:01 2014 +0000
coverity#704901 Dereference after null check
Change-Id: I3e2ad2d3dd1713336b1a01cb7a2b1ff28bb833ea
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 48ab36b..809f140 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -805,6 +805,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
}
case RES_COL:
+ if (pOld && pNew)
{
ChgColumns( *(const SwFmtCol*)pOld, *(const SwFmtCol*)pNew );
const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize();
commit 5caeb976d56f9df2cffbf98fa0bc0c552c60e1f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:16:11 2014 +0000
coverity#704895 Dereference after null check
Change-Id: I7d180e0386d50f0a943b68494a9458016a6a51a4
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 74ad3f3..68253f7 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -252,7 +252,8 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
{
case 0: break; // Which-Id of 0?
- case RES_OBJECTDYING :
+ case RES_OBJECTDYING:
+ if (pNewValue)
{
// If the dying object is the parent format of this format so
// attach this to the parent of the parent
commit e9cf7d29cbb675ca9cfe88a7638920831cbc6fa2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:14:50 2014 +0000
coverity#704884 Dereference after null check
Change-Id: Icd1922a47ea3b59bdec0ef21481df5f4a969a4e0
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 12f3e59..6edee7b 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -397,7 +397,7 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
if( RES_ATTRSET_CHG == nWhich )
{
- if (pOld && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
+ if (pOld && pNew && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState(
RES_FRM_SIZE, false, (const SfxPoolItem**)&pNewSize))
{
pOldSize = &((SwAttrSetChg*)pOld)->GetChgSet()->GetFrmSize();
commit 888287c45b5af50d6e8f0558957c6b34bc4c9e1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:13:20 2014 +0000
coverity#704872 Dereference after null check
Change-Id: I83b2335ffe215c36d5d69bec7489f8f025d6b930
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 486a597..9b3cc25 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -767,9 +767,9 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
SwDoc* pDoc = (SwDoc*)pSectNd->GetDoc();
- OSL_ENSURE(pDoc != NULL, "Where is the document?");
+ assert(pDoc); //Where is the document?
- if(pAttr && pDoc && GetFmt())
+ if (pAttr && GetFmt())
pDoc->ChgFmt(*GetFmt(), *pAttr);
// determine default page description, which will be used by the content nodes,
commit f1287b9b25bd87d9bcd7fec7f735aeaedb5849c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:11:44 2014 +0000
coverity#704850 Dereference after null check
Change-Id: I466c795b53a0e9b9f282ff225134d2f6e2edf52c
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e1d9075..a7085b8 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1830,11 +1830,11 @@ sal_Bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
GetDoc()->GetIDocumentUndoRedo().StartUndo( nUndoId, NULL );
SwTxtFmtColl* pNextFmt = 0;
- SwTxtNode* pTNd = pCNd->GetTxtNode();
+ SwTxtNode* pTNd = pCNd ? pCNd->GetTxtNode() : NULL;
if( pTNd )
pNextFmt = &pTNd->GetTxtColl()->GetNextTxtFmtColl();
- const SwSectionNode* pSectNd = pCNd->FindSectionNode();
+ const SwSectionNode* pSectNd = pCNd ? pCNd->FindSectionNode() : NULL;
if( pSectNd && aFPos.nParaCnt )
{
SwNodeIndex aEnd( aPos.nNode, 1 );
commit 62e16c69530b8f0920d8fb3f22a5f36b5d718e05
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:09:55 2014 +0000
coverity#704848 Dereference after null check
Change-Id: I454f350863a540c2e686550e3e7ff16b3a33ba19
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 34da276..74ad3f3 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -277,7 +277,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
}
break;
case RES_ATTRSET_CHG:
- if( ((SwAttrSetChg*)pOldValue)->GetTheChgdSet() != &aSet )
+ if (pOldValue && pNewValue && ((SwAttrSetChg*)pOldValue)->GetTheChgdSet() != &aSet)
{
// pass only those that are not set
SwAttrSetChg aOld( *(SwAttrSetChg*)pOldValue );
commit 742f22b474ede538382a6bd8ee550ce3924355a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:08:43 2014 +0000
coverity#704841 Dereference after null check
Change-Id: I40b98b73f38c384625e3d2187684cc070fb57334
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 4a14b58..ad3a3e5 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -118,7 +118,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
}
default:
{
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
+ const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( eMapUnit == SFX_MAPUNIT_100TH_MM )
commit 947ab4b38955677cb041e1a061c3f8fe71eb1b6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:07:39 2014 +0000
coverity#704838 Dereference after null check
Change-Id: I6f2f6fce9361c26775561539c63725abfb72b25e
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 1a0cfbc..486aaff 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -561,31 +561,34 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
if ( !nStrResId )
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
- const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
-
- for(i=0; i<nCount; i++)
+ if (pSdrView)
{
- SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
- if( pObj->ISA(SdrObjCustomShape) )
+ const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
+
+ for(i=0; i<nCount; i++)
{
- if( bUndo )
+ SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
+ if( pObj->ISA(SdrObjCustomShape) )
{
- OUString aStr( SVX_RESSTR( nStrResId ) );
- pSdrView->BegUndo( aStr );
- pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
+ if( bUndo )
+ {
+ OUString aStr( SVX_RESSTR( nStrResId ) );
+ pSdrView->BegUndo( aStr );
+ pSdrView->AddUndo( pSdrView->GetModel()->GetSdrUndoFactory().CreateUndoAttrObject( *pObj ) );
+ }
+ SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
+ impl_execute( pSdrView, rReq, aGeometryItem, pObj );
+ pObj->SetMergedItem( aGeometryItem );
+ pObj->BroadcastObjectChange();
+ if( bUndo )
+ pSdrView->EndUndo();
+
+ // simulate a context change:
+ // force SelectionHasChanged() being called
+ // so that extrusion bar will be visible/hidden
+ pSdrView->MarkListHasChanged();
}
- SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
- impl_execute( pSdrView, rReq, aGeometryItem, pObj );
- pObj->SetMergedItem( aGeometryItem );
- pObj->BroadcastObjectChange();
- if( bUndo )
- pSdrView->EndUndo();
-
- // simulate a context change:
- // force SelectionHasChanged() being called
- // so that extrusion bar will be visible/hidden
- pSdrView->MarkListHasChanged();
}
}
}
commit d4d5a91dd85de621b637c03ec499e3bdfa46d808
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:04:59 2014 +0000
coverity#704837 Dereference after null check
Change-Id: I3b26473c6af7426b28818a4fa73f27295408acc3
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index a8946a9..4c13913 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -277,7 +277,8 @@ SvxColorDockingWindow::SvxColorDockingWindow
SetSize();
aColorSet.Show();
- StartListening( *_pBindings, true );
+ if (_pBindings != NULL)
+ StartListening( *_pBindings, true );
}
commit 61309b2b49c91d31719f63d30e87ac6801216101
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 19 11:03:59 2014 +0000
coverity#704834 Dereference after null check
Change-Id: If26b47fa8c2888e4fe7a5b45c4659c5c66e1461b
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 07e4e9d..214f22a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1370,7 +1370,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
if( pText )
pText->SetOutlinerParaObject( pTextObject );
- if( pText->GetOutlinerParaObject() )
+ if (pText && pText->GetOutlinerParaObject())
{
SvxWritingModeItem aWritingMode(pText->GetOutlinerParaObject()->IsVertical()
? com::sun::star::text::WritingMode_TB_RL
More information about the Libreoffice-commits
mailing list