[Libreoffice-commits] core.git: 18 commits - lotuswordpro/source reportdesign/source sc/source sd/source starmath/source sw/source
Caolán McNamara
caolanm at redhat.com
Sun Feb 23 08:04:11 PST 2014
lotuswordpro/source/filter/lwpobj.cxx | 2
lotuswordpro/source/filter/lwppara.cxx | 2
reportdesign/source/ui/report/dlgedfunc.cxx | 2
sc/source/core/tool/compiler.cxx | 15 ++++--
sc/source/core/tool/interpr4.cxx | 14 +++++
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/pptin.cxx | 2
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/inc/slideshow.hxx | 8 ++-
sd/source/ui/slideshow/slideshow.cxx | 6 +-
starmath/source/cursor.cxx | 5 --
sw/source/core/access/accpara.cxx | 6 +-
sw/source/core/access/accpara.hxx | 12 +++--
sw/source/filter/ww8/ww8par.cxx | 67 ++++++++++++----------------
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 3 -
sw/source/ui/ribbar/inputwin.cxx | 11 ++--
17 files changed, 94 insertions(+), 67 deletions(-)
New commits:
commit 38940e29e3181ab7ecf83da5454b48f43188d5e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:54:27 2014 +0000
coverity#735534 Dead default in switch
Change-Id: I686cfdf2c876123aa72b2dcfc1c6abcabcad5ab7
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c913499..c31b267 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -765,44 +765,37 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
{
while (nTextRotationAngle > 360000)
nTextRotationAngle-=9000;
- switch (nTextRotationAngle)
+ if (nTextRotationAngle == 9000)
{
- case 9000:
- {
- long nWidth = rTextRect.GetWidth();
- rTextRect.Right() = rTextRect.Left() + rTextRect.GetHeight();
- rTextRect.Bottom() = rTextRect.Top() + nWidth;
-
- sal_Int32 nOldTextLeft = nTextLeft;
- sal_Int32 nOldTextRight = nTextRight;
- sal_Int32 nOldTextTop = nTextTop;
- sal_Int32 nOldTextBottom = nTextBottom;
-
- nTextLeft = nOldTextBottom;
- nTextRight = nOldTextTop;
- nTextTop = nOldTextLeft;
- nTextBottom = nOldTextRight;
- }
- break;
- case 27000:
- {
- long nWidth = rTextRect.GetWidth();
- rTextRect.Right() = rTextRect.Left() + rTextRect.GetHeight();
- rTextRect.Bottom() = rTextRect.Top() + nWidth;
-
- sal_Int32 nOldTextLeft = nTextLeft;
- sal_Int32 nOldTextRight = nTextRight;
- sal_Int32 nOldTextTop = nTextTop;
- sal_Int32 nOldTextBottom = nTextBottom;
-
- nTextLeft = nOldTextTop;
- nTextRight = nOldTextBottom;
- nTextTop = nOldTextRight;
- nTextBottom = nOldTextLeft;
- }
- break;
- default:
- break;
+ long nWidth = rTextRect.GetWidth();
+ rTextRect.Right() = rTextRect.Left() + rTextRect.GetHeight();
+ rTextRect.Bottom() = rTextRect.Top() + nWidth;
+
+ sal_Int32 nOldTextLeft = nTextLeft;
+ sal_Int32 nOldTextRight = nTextRight;
+ sal_Int32 nOldTextTop = nTextTop;
+ sal_Int32 nOldTextBottom = nTextBottom;
+
+ nTextLeft = nOldTextBottom;
+ nTextRight = nOldTextTop;
+ nTextTop = nOldTextLeft;
+ nTextBottom = nOldTextRight;
+ }
+ else if (nTextRotationAngle == 27000)
+ {
+ long nWidth = rTextRect.GetWidth();
+ rTextRect.Right() = rTextRect.Left() + rTextRect.GetHeight();
+ rTextRect.Bottom() = rTextRect.Top() + nWidth;
+
+ sal_Int32 nOldTextLeft = nTextLeft;
+ sal_Int32 nOldTextRight = nTextRight;
+ sal_Int32 nOldTextTop = nTextTop;
+ sal_Int32 nOldTextBottom = nTextBottom;
+
+ nTextLeft = nOldTextTop;
+ nTextRight = nOldTextBottom;
+ nTextTop = nOldTextRight;
+ nTextBottom = nOldTextLeft;
}
}
commit bbaad0e03d04c2b2606823ce85f12a80803ed5af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:51:00 2014 +0000
coverity#736165
Change-Id: I04c1474b2042deb3027369fe1102aef2eb5320a4
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 76b44d3..743eec8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2183,7 +2183,8 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN)
{
failure = true;
- sal_Size nLastFkpPos = ( ( nPN + nIMax - 1 ) << 9 );
+ sal_Size nLastFkpPos = nPN + nIMax - 1;
+ nLastFkpPos = nLastFkpPos << 9;
// Anz. Fkp-Eintraege des letzten Fkp
if (!checkSeek(rSt, nLastFkpPos + 511))
break;
commit 8444cd780268afba0b38840370acd07966d630d5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:40:35 2014 +0000
coverity#704661 Unchecked dynamic_cast
Change-Id: I50bdab52c8758a71656f47e3bf053181c7831c46
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 1af8f10..7badb0e 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -402,7 +402,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
if (!bIsInplaceOle)
{
SdrOle2Obj* pOleObj = dynamic_cast<SdrOle2Obj*>(_pObj);
- if ( pOleObj->GetObjRef().is() )
+ if (pOleObj && pOleObj->GetObjRef().is())
{
if (m_rView.IsTextEdit())
{
commit f5224665b8d613afca9cd57f9af0c88e4518e2c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:38:31 2014 +0000
coverity#738077 Uncaught exception
Change-Id: I85a482945c3851bf13aa6d2c65b6b297ea885bca
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 9d44d63..8570081 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2648,7 +2648,7 @@ OUString SwAccessibleParagraph::getSelectedText()
}
sal_Int32 SwAccessibleParagraph::getSelectionStart()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 4b8f0d9..ddf1e5c 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -334,7 +334,9 @@ public:
virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL getSelectedText( )
throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getSelectionStart()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Int32 SAL_CALL getSelectionEnd()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
commit 3a06d4837e7f476f1781b83fdd86cdde3c6e9b5b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:37:35 2014 +0000
coverity#738075 Uncaught exception
Change-Id: I426c57dce1eb97a36800399e78b176ae0474cc6d
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 922c013..9d44d63 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1364,7 +1364,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
// XAccesibleText
sal_Int32 SwAccessibleParagraph::getCaretPosition()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 61356df..4b8f0d9 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -320,7 +320,9 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
// XAccessibleText
- virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getCaretPosition()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes )
commit 7f94ebaf00dcd18c19c7b46608439c51d4f7bca9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:36:38 2014 +0000
coverity#738074 Uncaught exception
Change-Id: If51117d24e64413b6c340967c039d02c483ed0da
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 95477d8..922c013 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2660,7 +2660,7 @@ sal_Int32 SwAccessibleParagraph::getSelectionStart()
}
sal_Int32 SwAccessibleParagraph::getSelectionEnd()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 1dbfa32..61356df 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -333,7 +333,9 @@ public:
virtual OUString SAL_CALL getSelectedText( )
throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getSelectionEnd()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
commit 8d5def6dc4973c0727a2b508bad1de03967f8063
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:33:48 2014 +0000
coverity#707114 Uncaught exception
Change-Id: I556c326e537faeb3d125a0a8f1cb0c749df29f24
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index a06daa7..abee9ea 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -132,7 +132,9 @@ public:
// XPresentation
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL end( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL end()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException);
// XPresentation2
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 13fb141..de37676 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -678,7 +678,8 @@ WorkWindow *SlideShow::GetWorkWindow()
return dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
}
-void SAL_CALL SlideShow::end() throw(RuntimeException)
+void SAL_CALL SlideShow::end()
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
commit 379b98741ac6780db0d6d50aa7c321e6b25246e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:32:57 2014 +0000
coverity#707113 Uncaught exception
Change-Id: I612503ef40682820821dbf61dd12afbc62e4eb39
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 83918d2..a06daa7 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -136,7 +136,9 @@ public:
virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException);
// XPresentation2
- virtual void SAL_CALL startWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL startWithArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 8f3f757..13fb141 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -834,7 +834,8 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException)
// XPresentation2
-void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rArguments ) throw (RuntimeException)
+void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments)
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ThrowIfDisposed();
commit 7db1dbaa70b4b1ef52d66215e15fc44c9650ef1f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:24:27 2014 +0000
coverity#706831 Uncaught exception
also
coverity#706839 Uncaught exception
coverity#706840 Uncaught exception
and probably a gadzillion more
Change-Id: I3c3ceebb259cccc9c41f5a49bd0c95b151dd7c58
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 114ffb8..135b01c 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3150,8 +3150,18 @@ void ScInterpreter::ScMacro()
// Funktion ueber den einfachen Namen suchen,
// dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen
- StarBASIC* pRoot = pDocSh->GetBasic();
- SbxVariable* pVar = pRoot->Find( aMacro, SbxCLASS_METHOD );
+ StarBASIC* pRoot;
+
+ try
+ {
+ pRoot = pDocSh->GetBasic();
+ }
+ catch (...)
+ {
+ pRoot = NULL;
+ }
+
+ SbxVariable* pVar = pRoot ? pRoot->Find(aMacro, SbxCLASS_METHOD) : NULL;
if( !pVar || pVar->GetType() == SbxVOID || !pVar->ISA(SbMethod) )
{
PushError( errNoMacro );
commit 1cd5a550073411ea85a1eeaaa4acf1f2ee64f586
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:16:58 2014 +0000
coverity#706826 Uncaught exception
also
coverity#706827 Uncaught exception
and probably a gadzillion more
Change-Id: Ia924e33b188035e8dcb4f345d6c20d6c7bbcf4ea
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 8835026..1ddbcfb 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2796,10 +2796,17 @@ bool ScCompiler::IsMacro( const OUString& rName )
SfxApplication* pSfxApp = SFX_APP();
- if( pDocSh )//XXX
- pObj = pDocSh->GetBasic();
- else
- pObj = pSfxApp->GetBasic();
+ try
+ {
+ if( pDocSh )//XXX
+ pObj = pDocSh->GetBasic();
+ else
+ pObj = pSfxApp->GetBasic();
+ }
+ catch (...)
+ {
+ return false;
+ }
// ODFF recommends to store user-defined functions prefixed with "USER.",
// use only unprefixed name if encountered. BASIC doesn't allow '.' in a
commit 64e439edc097f23d34a859125fd00501aa6746fb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 15:10:58 2014 +0000
coverity#735495 logically dead code
Change-Id: I8f2bc4ebd4d7c476495c5f1d92e8536c7be50c51
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 9288879..18f9a84 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -882,7 +882,7 @@ bool SmCursor::InsertRow() {
}
}
//If we're in the context of a matrix
- else if(pMatrix) {
+ else {
//Find position after insert and patch the list
PosAfterInsert = PatchLineList(pLineList, it);
//Move other children
@@ -898,8 +898,7 @@ bool SmCursor::InsertRow() {
pMatrix->SetSubNode(i, pNewLine);
}
pMatrix->SetRowCol(rows + 1, cols);
- } else
- SAL_WARN("starmath", "We must be either the context of a table or matrix!");
+ }
//Finish editing
FinishEdit(pLineList, pLineParent, nParentIndex, PosAfterInsert);
commit 8f91c4ad5d8e967e125c55e9947177493117ee24
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:56:24 2014 +0000
coverity#736781 Dereference before null check
Change-Id: Iea5cf576ec5bea21a58a5733950ebacf94802e55
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 12d647b..deff61d 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -685,7 +685,7 @@ void LwpPara::RegisterStyle()
}
}
- if (pPara && pPara->GetPrevious())
+ if (pPara->GetPrevious())
pPrePara = dynamic_cast<LwpPara*>(pPara->GetPrevious()->obj(VO_PARA));
else
pPrePara=NULL;
commit 2039c2b6bdd6103858af37ff5a8aa9eb88f2b397
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:53:59 2014 +0000
coverity#736780 Dereference before null check
Change-Id: I8e4eb351c4e623f33dded02e1c78f01f76452f83
diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx
index be52cda..7e15b62 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -84,9 +84,9 @@ LwpObject::~LwpObject()
void LwpObject::QuickRead()
{
Read();
- m_pObjStrm->ReadComplete();
if(m_pObjStrm)
{
+ m_pObjStrm->ReadComplete();
delete m_pObjStrm;
m_pObjStrm = NULL;
}
commit 1e26ecab41391e2fd8bead2161735e9f33b9c008
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:52:29 2014 +0000
coverity#705021 Dereference after null check
Change-Id: I95eb92cf3b6df7a25d99164b97a96fc568671d26
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 1b3b85c..da6ea41 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -146,11 +146,14 @@ void SwInputWindow::CleanupUglyHackWithUndo()
{
if (m_bResetUndo)
{
- DelBoxCntnt();
- pWrtShell->DoUndo(m_bDoesUndo);
- if (m_bCallUndo)
+ if (pWrtShell)
{
- pWrtShell->Undo();
+ DelBoxCntnt();
+ pWrtShell->DoUndo(m_bDoesUndo);
+ if (m_bCallUndo)
+ {
+ pWrtShell->Undo();
+ }
}
m_bResetUndo = false; // #i117122# once is enough :)
}
commit 627de4229b08ca0bf704fcd536216028b5b61c07
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:50:38 2014 +0000
coverity#705003 Dereference after null check
Change-Id: I8dff9d0c2257e4fd9f9a5676e30698da08484134
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0ccf6d6..ef260cb 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2815,6 +2815,8 @@ void WW8TabDesc::EndMiserableHackForUnsupportedDirection(short nWwCol)
bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
{
OSL_ENSURE( pActBand, "pActBand ist 0" );
+ if (!pActBand)
+ return false;
sal_uInt16 nCol = pActBand->transCell(nWwCol);
commit 66c8930012caf53721614e1591e519bf8ab03c73
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:47:18 2014 +0000
coverity#704737 Dereference after null check
Change-Id: Icf30f9acf70c0dd367bad3f5711e71d9ab125ce9
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 7310418..584b5df 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -286,7 +286,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest)
::sd::ViewShell* pViewSh = pDocSh->GetViewShell();
- if (pViewSh)
+ if (pViewSh && pDoc)
{
// AutoLayouts have to be finished
pDoc->StopWorkStartupDelay();
commit 6cccfd6c63a0aac35770de3f712de14fc32fbb1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:45:55 2014 +0000
coverity#704736 Dereference after null check
Change-Id: Ib11b59696135f29375ec53332c526f0b5bcd638d
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index fed3b94..37ae2cb 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1506,7 +1506,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
}
}
DffRecordHeader aPageRecHd;
- if ( pPage && SeekToAktPage( &aPageRecHd ) )
+ if ( SeekToAktPage( &aPageRecHd ) )
{
sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos();
commit ad346fb791cac4637cfaf9a14093f87833a4e617
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 23 14:43:37 2014 +0000
coverity#704735 Dereference after null check
Change-Id: Ib2804949024dc3967d3eb2bcc7a82844f225be2f
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 7b16e80..cc603f2 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -407,7 +407,7 @@ HtmlExport::~HtmlExport()
/** get common export parameters from item set */
void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams )
{
- mbImpress = mpDoc && mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
+ mbImpress = mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS;
sal_Int32 nArgs = rParams.getLength();
const PropertyValue* pParams = rParams.getConstArray();
More information about the Libreoffice-commits
mailing list