basegfx/source/polygon/b2dpolygontools.cxx | 5 basic/source/classes/sb.cxx | 4 connectivity/source/drivers/dbase/DTable.cxx | 6 - cui/source/options/optdict.cxx | 4 cui/source/options/optjava.cxx | 13 -- dbaccess/source/ui/dlg/advancedsettings.cxx | 8 - sc/source/core/opencl/opencl_device_selection.h | 1 sc/source/ui/condformat/condformatmgr.cxx | 11 +- sc/source/ui/inc/tabsplit.hxx | 2 sc/source/ui/view/tabsplit.cxx | 16 --- sc/source/ui/view/tabvwshg.cxx | 3 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 5 sfx2/source/view/viewfrm.cxx | 5 svx/source/unodraw/unoshtxt.cxx | 2 sw/source/core/crsr/crsrsh.cxx | 4 sw/source/ui/index/cnttab.cxx | 2 sw/source/uibase/dochdl/gloshdl.cxx | 53 +++++----- sw/source/uibase/docvw/edtwin.cxx | 2 sw/source/uibase/inc/glosdoc.hxx | 1 sw/source/uibase/misc/glosdoc.cxx | 9 - sw/source/uibase/misc/glshell.cxx | 5 sw/source/uibase/uno/unoatxt.cxx | 4 sw/source/uibase/utlui/content.cxx | 24 ++-- sw/source/uibase/utlui/gloslst.cxx | 2 vcl/source/filter/sgvtext.cxx | 2 25 files changed, 84 insertions(+), 109 deletions(-)
New commits: commit c11389f14136cb9b30a6e903d08385b9cec68ecc Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:34:30 2014 +0100 coverity#1242443 Identical code for different branches Splitter derives from Window and doesn't override MouseMove so both branches are the same Change-Id: Id74f12e2efb458ac2ae183686a57befdf0225778 diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 1572a7c..a81e803 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -31,7 +31,6 @@ private: bool bFixed; protected: - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Splitting( Point& rSplitPos ) SAL_OVERRIDE; diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 89b9ed4..755aeef 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -35,14 +35,6 @@ ScTabSplitter::~ScTabSplitter() { } -void ScTabSplitter::MouseMove( const MouseEvent& rMEvt ) -{ - if (bFixed) - Window::MouseMove( rMEvt ); - else - Splitter::MouseMove( rMEvt ); -} - void ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) { if (bFixed) commit 130354cf8e506798900b01460ae5cd7b5ff82bc0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:33:01 2014 +0100 coverity#1242454 Identical code for different branches Splitter derives from Window and doesn't override MouseButtonUp so both branches are the same Change-Id: I9072d24b60dacfdb1d3e9ca1c97f08002f7e24ba diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index a05aca5..1572a7c 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -32,7 +32,6 @@ private: protected: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Splitting( Point& rSplitPos ) SAL_OVERRIDE; diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index c2f15e4..89b9ed4 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -43,14 +43,6 @@ void ScTabSplitter::MouseMove( const MouseEvent& rMEvt ) Splitter::MouseMove( rMEvt ); } -void ScTabSplitter::MouseButtonUp( const MouseEvent& rMEvt ) -{ - if (bFixed) - Window::MouseButtonUp( rMEvt ); - else - Splitter::MouseButtonUp( rMEvt ); -} - void ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) { if (bFixed) commit b8ddd25acb0f47db6ccaefd9e1ae7edd40d44d73 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:42:30 2014 +0100 coverity#1242431 Explicit null dereferenced Change-Id: I96cbc59931400ad2f348ffb44925e8fe34b782ed diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index d61fd36..a46095f 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -47,15 +47,18 @@ void ScCondFormatManagerWindow::Init() { SetUpdateMode(false); - for(ScConditionalFormatList::iterator itr = mpFormatList->begin(); itr != mpFormatList->end(); ++itr) + if (mpFormatList) { - SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), TREELIST_APPEND, 0xffff ); - maMapLBoxEntryToCondIndex.insert(std::pair<SvTreeListEntry*,sal_Int32>(pEntry,itr->GetKey())); + for(ScConditionalFormatList::iterator itr = mpFormatList->begin(); itr != mpFormatList->end(); ++itr) + { + SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), TREELIST_APPEND, 0xffff ); + maMapLBoxEntryToCondIndex.insert(std::pair<SvTreeListEntry*,sal_Int32>(pEntry,itr->GetKey())); + } } SetUpdateMode(true); - if (mpFormatList->size()) + if (mpFormatList && mpFormatList->size()) SelectRow(0); } commit 4ed190494fc06e6486ca9c4860886605183a53e0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:41:12 2014 +0100 coverity#1242432 Dereference after null check Change-Id: I07525411e1c09b49acb64262459d6d6b70cf6e9c diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a5abefd..7bf7da3 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4303,7 +4303,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) { SdrObject* pObj; SdrPageView* pPV; - if (pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER )) + if (pSdrView && pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER )) { std::map<SwFrmFmt*, SwFrmFmt*> aTextBoxShapes = SwTextBoxHelper::findShapes(rSh.GetDoc()); SwDrawContact* pDrawContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); commit 377efa8fed08331108e6ffbb0f0871b8c5e5a9ac Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:39:48 2014 +0100 coverity#1242434 Dereference after null check Change-Id: Ia18c904d9fe5dc347f5fc7f478a4b31adfdb5b2b diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 80953c4..3d47d91 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1357,20 +1357,22 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) { for(sal_uInt16 i = 0; i < nCount; i++) { - const SwContent* pCnt = pCntType->GetMember(i); - if(pCnt) - { - OUString sEntry = pCnt->GetName(); - if (sEntry.isEmpty()) - sEntry = sSpace; - SvTreeListEntry* pChild = InsertEntry(sEntry, pParent, - false, TREELIST_APPEND, (void*)pCnt); - + SvTreeListEntry* pChild = NULL; + const SwContent* pCnt = pCntType->GetMember(i); + if (pCnt) + { + OUString sEntry = pCnt->GetName(); + if (sEntry.isEmpty()) + sEntry = sSpace; + pChild = InsertEntry(sEntry, pParent, + false, TREELIST_APPEND, (void*)pCnt); + } + if (pChild) + { //If object is marked , the corresponding entry is set true, //else the corresponding entry is set false . + pChild->SetMarked(false); SdrObject * pObj = GetDrawingObjectsByContent(pCnt); - if(pChild) - pChild->SetMarked(false); if(pObj) { SdrView* pDrawView = pActiveShell->GetDrawView(); commit e6e7e5deb320962e31a4d8c49028002c3aa061df Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:31:30 2014 +0100 coverity#1242477 Dereference null return value Change-Id: Ic2d8dab00d5af47f6274433ee811f567f990400b diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 1f61bdf..0387b74 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -61,6 +61,9 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, pDrView->GetSdrPageView()->GetPage(), pModel); SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj); + OSL_ENSURE( pUnoCtrl, "no SdrUnoObj"); + if( !pUnoCtrl ) + return; uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" ); commit d904d6d15d8072348d5394fc367d5a6db18fe16f Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:30:07 2014 +0100 coverity#1242478 Dereference null return value Change-Id: I037218d5c6afc3df6862b0c0ce2b6379568767cd diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index e9c7d65..0bbc2c1 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -824,7 +824,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, (SdrOutliner*)0L, 0L, false, false)) { SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); - if( pTextObj->IsTextEditActive() ) + if (pTextObj && pTextObj->IsTextEditActive()) { // create new view forwarder mpViewForwarder = CreateViewForwarder(); commit d059f5160e9666e0a27a990d0a27320c83679fcc Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:28:56 2014 +0100 coverity#1242479 Dereference null return value Change-Id: Ie9a9a3438408900d4a5e07b50f4e636e06f94026 diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 0dac4a7..12cbb94 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1624,14 +1624,11 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... } } - - bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const { - return PTR_CAST(SfxViewFrameItem, &rItem)->pFrame== pFrame; + return dynamic_cast<const SfxViewFrameItem&>(rItem).pFrame == pFrame; } - OUString SfxViewFrameItem::GetValueText() const { return OUString(); commit bfe345e8b7e4fc4ea5ee480398f64fadd1fe91e6 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:20:47 2014 +0100 coverity#1242480 Dereference null return value Change-Id: I9818e647915bd2b973c617feb7efd256621cf2de diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index dadbb5c..d21a590 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -223,13 +223,13 @@ namespace dbaui aValue.reset(); SFX_ITEMSET_GET( _rSet, pItem, SfxPoolItem, setting->nItemId, true ); - if ( pItem->ISA( SfxBoolItem ) ) + if (const SfxBoolItem *pBoolItem = PTR_CAST(SfxBoolItem, pItem)) { - aValue.reset( PTR_CAST( SfxBoolItem, pItem )->GetValue() ); + aValue.reset( pBoolItem->GetValue() ); } - else if ( pItem->ISA( OptionalBoolItem ) ) + else if (const OptionalBoolItem *pOptionalItem = PTR_CAST(OptionalBoolItem, pItem)) { - aValue = PTR_CAST( OptionalBoolItem, pItem )->GetFullValue(); + aValue = pOptionalItem->GetFullValue(); } else OSL_FAIL( "SpecialSettingsPage::implInitControls: unknown boolean item type!" ); commit 0f6c6baf61324db4d872411773fbf4ad18653f7f Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:18:34 2014 +0100 coverity#1242481 Dereference null return value Change-Id: I21e6bdd643d898a3515a96e4c9c17c2d6f98b0e4 diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index bfcde23..19eb91e 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -543,8 +543,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj); SbxDimArray* pDest = new SbxDimArray( pVar->GetType() ); - pDest->setHasFixedSize( pSource->hasFixedSize() ); - if ( pSource->GetDims() && pSource->hasFixedSize() ) + pDest->setHasFixedSize( pSource ? pSource->hasFixedSize() : false ); + if ( pSource && pSource->GetDims() && pSource->hasFixedSize() ) { sal_Int32 lb = 0; sal_Int32 ub = 0; commit 2e048774847c649c946b7bd809cb873ef2416dcb Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:15:20 2014 +0100 PutGroupDoc(foo) is just delete foo so just replace it with delete and simplify the code around it now we know exactly what it does Change-Id: Ie23bc46583684bda35b47022ea9853f25a415b0d diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 84cf737..12d7cfb 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -141,11 +141,7 @@ void SwGlossaryHdl::SetCurGroup(const OUString &rGrp, bool bApi, bool bAlwaysCre aCurGrp = sGroup; if(!bApi) { - if(pCurGrp) - { - rStatGlossaries.PutGroupDoc(pCurGrp); - pCurGrp = 0; - } + delete pCurGrp; pCurGrp = rStatGlossaries.GetGroupDoc(aCurGrp, true); } } @@ -169,7 +165,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) *pTitle = sRet.getToken(0, GLOS_DELIM); pGroup->SetName(*pTitle); } - rStatGlossaries.PutGroupDoc( pGroup ); + delete pGroup; } else { @@ -199,7 +195,7 @@ bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt if(pGroup) { pGroup->SetName(rNewTitle); - rStatGlossaries.PutGroupDoc( pGroup ); + delete pGroup; bRet = true; } } @@ -237,8 +233,8 @@ bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSou // the index must be existing nRet = pSourceGroup->Delete( nDeleteIdx ) ? 0 : 1; } - rStatGlossaries.PutGroupDoc( pSourceGroup ); - rStatGlossaries.PutGroupDoc( pDestGroup ); + delete pSourceGroup; + delete pDestGroup; return !nRet; } @@ -290,7 +286,7 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName) if( nIdx != (sal_uInt16) -1 ) sReturn = pTmp->GetShortName( nIdx ); if( !pCurGrp ) - rStatGlossaries.PutGroupDoc( pTmp ); + delete pTmp; } return sReturn; } @@ -302,7 +298,7 @@ bool SwGlossaryHdl::HasShortName(const OUString& rShortName) const : rStatGlossaries.GetGroupDoc( aCurGrp ); bool bRet = pBlock->GetIndex( rShortName ) != (sal_uInt16) -1; if( !pCurGrp ) - rStatGlossaries.PutGroupDoc( pBlock ); + delete pBlock; return bRet; } @@ -341,7 +337,7 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam MessageDialog(pWrtShell->GetView().GetWindow(), SW_RES(STR_ERR_INSERT_GLOS), VCL_MESSAGE_INFO).Execute(); } if( !pCurGrp ) - rStatGlossaries.PutGroupDoc( pTmp ); + delete pTmp; return nSuccess != (sal_uInt16) -1; } @@ -358,7 +354,7 @@ bool SwGlossaryHdl::DelGlossary(const OUString &rShortName) if( nIdx != (sal_uInt16) -1 ) pGlossary->Delete( nIdx ); if( !pCurGrp ) - rStatGlossaries.PutGroupDoc( pGlossary ); + delete pGlossary; return true; } @@ -444,7 +440,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, } if( !aFoundArr.empty() ) // one was found { - pGlossaries->PutGroupDoc(pGlossary); + delete pGlossary; if(1 == aFoundArr.size()) { TextBlockInfo_Impl* pData = &aFoundArr.front(); @@ -488,7 +484,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, { if( !bCancel ) { - pGlossaries->PutGroupDoc(pGlossary); + delete pGlossary; const sal_Int32 nMaxLen = 50; if(pWrtShell->IsSelection() && aShortName.getLength() > nMaxLen) @@ -534,7 +530,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, if( aFldLst.BuildSortLst() ) pWrtShell->UpdateInputFlds( &aFldLst ); } - pGlossaries->PutGroupDoc(pGlossary); + delete pGlossary; return true; } @@ -578,7 +574,7 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName) pWrtShell->UpdateInputFlds( &aFldLst ); if(!pCurGrp) - rStatGlossaries.PutGroupDoc(pGlos); + delete pGlos; return true; } @@ -601,7 +597,7 @@ void SwGlossaryHdl::SetMacros(const OUString& rShortName, ErrorHandler::HandleError( pGlos->GetError() ); if(!pCurGrp && !pGlossary) - rStatGlossaries.PutGroupDoc(pGlos); + delete pGlos; } void SwGlossaryHdl::GetMacros( const OUString &rShortName, @@ -629,7 +625,7 @@ void SwGlossaryHdl::GetMacros( const OUString &rShortName, } if( !pCurGrp && !pGlossary ) - rStatGlossaries.PutGroupDoc( pGlos ); + delete pGlos; } // ctor, dtor @@ -644,8 +640,7 @@ SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh) SwGlossaryHdl::~SwGlossaryHdl() { - if( pCurGrp ) - rStatGlossaries.PutGroupDoc( pCurGrp ); + delete pCurGrp; } // rename an autotext @@ -672,7 +667,7 @@ bool SwGlossaryHdl::Rename(const OUString& rOldShort, const OUString& rNewShortN bRet = pGlossary->GetError() == 0; } if( !pCurGrp ) - rStatGlossaries.PutGroupDoc(pGlossary); + delete pGlossary; } return bRet; } @@ -721,7 +716,7 @@ bool SwGlossaryHdl::CopyToClipboard(SwWrtShell& rSh, const OUString& rShortName) int nRet = pTransfer->CopyGlossary( *pGlossary, rShortName ); if( !pCurGrp ) - rStatGlossaries.PutGroupDoc( pGlossary ); + delete pGlossary; return 0 != nRet; } diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx index 8ed3214..c043f36 100644 --- a/sw/source/uibase/inc/glosdoc.hxx +++ b/sw/source/uibase/inc/glosdoc.hxx @@ -112,7 +112,6 @@ public: SwTextBlocks* GetGroupDoc(const OUString &rName, bool bCreate = false); SwTextBlocks* GetDefGroupDoc() { return GetGroupDoc(GetDefName()); } - void PutGroupDoc(SwTextBlocks *pBlock); static OUString GetDefName(); static OUString GetExtension(); diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index 743dbd4..38bdfc6 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -152,7 +152,7 @@ OUString SwGlossaries::GetGroupTitle( const OUString& rGroupName ) if(pGroup) { sRet = pGroup->GetName(); - PutGroupDoc( pGroup ); + delete pGroup; } return sRet; } @@ -178,11 +178,6 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName, return GetGlosDoc( rName, bCreate ); } -// delete a text block -void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) { - delete pBlock; -} - // Creates a new document with the group name. temporarly also created as file // so that groups remain there later (without access). bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) @@ -199,7 +194,7 @@ bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) { GetNameList().push_back(sNewGroup); pBlock->SetName(rTitle); - PutGroupDoc(pBlock); + delete pBlock; rGroupName = sNewGroup; return true; } diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 47e00a2..162ec57 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -425,8 +425,6 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const { throw uno::RuntimeException(); } - pGlossaries->PutGroupDoc( pGlosGroup ); - pGlosGroup = 0; } delete pGlosGroup; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 00005e0..41449c9 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -371,7 +371,7 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) pGroup->sShortNames += pBlock->GetShortName(j); pGroup->sShortNames += OUString(STRING_DELIM); } - pGlossaries->PutGroupDoc(pBlock); + delete pBlock; } // Give back all (not exceeding FIND_MAX_GLOS) found modules commit 1573a63339c0e8d3a88a3c3ec520a2c4e75655a4 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:10:57 2014 +0100 coverity#1242498 Resource leak Change-Id: I832bbf09756e616877621f186ddba17784de9f43 diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 7b17c84..84cf737 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -161,7 +161,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) if(pTitle) { SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet, false); - if(pGroup && !pGroup->GetError()) + if (pGroup && !pGroup->GetError()) { *pTitle = pGroup->GetName(); if (pTitle->isEmpty()) @@ -172,7 +172,10 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) rStatGlossaries.PutGroupDoc( pGroup ); } else + { + delete pGroup; sRet = OUString(); + } } return sRet; } commit 2b862165fac771f69c22aba61993e53abf76540f Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:09:25 2014 +0100 coverity#1242499 Resource leak Change-Id: Ie1de3270723e36f7fd4bfdc4192745c521c61ea4 diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 7c368a1..7b17c84 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -217,11 +217,11 @@ bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSou const OUString& rDestGroupName, const OUString& rLongName, bool bMove ) { SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, false); - SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, false); if (pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) ) { delete pDestGroup; + delete pSourceGroup; return false; } commit 74e26e0b7a9903259912b8cf7092b0252b74a2f2 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:08:48 2014 +0100 coverity#1242500 Resource leak Change-Id: I8680049ce810ca30ade33d168486bd589d434a4e diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 99194ae..0721437 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -205,7 +205,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString SwDocShellRef xDocSh; SwTextBlocks* pGroup = GetGroupDoc( rGroup ); - if( pGroup && pGroup->GetCount() ) + if (pGroup && pGroup->GetCount()) { // query which view is registered. In WebWriter there is no normal view sal_uInt16 nViewId = 0 != SwView::Factory() ? 2 : 6; @@ -269,9 +269,8 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString xDocSh->GetDoc()->getIDocumentState().ResetModified(); if ( bShow ) pFrame->GetFrame().Appear(); - - delete pGroup; } + delete pGroup; return xDocSh; } commit 20a5a03603d28e53cfcfa3c9d52bc7668e912c26 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:07:51 2014 +0100 coverity#1242502 Resource leak Change-Id: I4185bbcc40419fced50ca684c35d1090cf361c4c diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 686efcd..7c368a1 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -219,8 +219,11 @@ bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSou SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, false); SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, false); - if(pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) ) + if (pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) ) + { + delete pDestGroup; return false; + } //The index must be determined here because rSourceShortName maybe changed in CopyBlock sal_uInt16 nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName ); commit c4e608fa9b2452faca71fbb536d3caa5d697f3bc Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:05:34 2014 +0100 coverity#1242503 Resource leak Change-Id: If9a6c1e5353364238ce4a888ecc80ead28497c76 diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 0eacc65..47e00a2 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -371,7 +371,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0; OUString sShortName(aName); OUString sLongName(aTitle); - if(pGlosGroup && !pGlosGroup->GetError()) + if (pGlosGroup && !pGlosGroup->GetError()) { uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY); SwXTextRange* pxRange = 0; @@ -426,7 +426,9 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const throw uno::RuntimeException(); } pGlossaries->PutGroupDoc( pGlosGroup ); + pGlosGroup = 0; } + delete pGlosGroup; uno::Reference< text::XAutoTextEntry > xEntry; commit 8c73431fb9b9116c1c54481b287930f8bb44303f Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:55:30 2014 +0100 coverity#1242762 Unused value Change-Id: I5bba3f999782af77ee2211d8666d57feb91165ab diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 860c898..4a146a1 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2667,7 +2667,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) if(TOKEN_TEXT == aToken.eTokenType) { - OSL_ENSURE(!bLastWasText, "text following text is invalid"); + SAL_WARN_IF(bLastWasText, "sw", "text following text is invalid"); Control* pCtrl = InsertItem(aToken.sText, aToken); bLastWasText = true; if(!GetActiveControl()) commit 4fb93e98990c1fefa6bcaafdcf80c3f49d346af2 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:50:37 2014 +0100 coverity#1242792 Unused value Change-Id: I66000e2e3ae8d28f5f04bb6404c73feb2a1e8905 diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 3c5f80d..eb6f210 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -22,6 +22,7 @@ #include <osl/diagnose.h> #include <rtl/math.hxx> #include <rtl/instance.hxx> +#include <sal/log.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> @@ -3446,8 +3447,8 @@ namespace basegfx // two or no control points are consumed, another one would be an error. // It's also an error if only one control point was read - OSL_ENSURE(com::sun::star::drawing::PolygonFlags_CONTROL != ePolygonFlag && bControlA == bControlB, - "UnoPolygonBezierCoordsToB2DPolygon: Illegal source polygon (!)"); + SAL_WARN_IF(com::sun::star::drawing::PolygonFlags_CONTROL == ePolygonFlag || bControlA != bControlB, + "basegfx", "UnoPolygonBezierCoordsToB2DPolygon: Illegal source polygon (!)"); // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter // which did not create minimal PolyPolygons, but created all control points commit beadebc0f7eb5582fcb8dcb082d19afdf2751876 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:47:29 2014 +0100 coverity#1242802 coverity gold(?) Structurally dead code, loop doesn't loop Change-Id: I2be3e6d88472ba8b69f012aaf975a91f0ab4f693 diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index da4c328..10ea920 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -108,11 +108,8 @@ void ConfigurationUpdater::RequestUpdate ( do { UpdateConfiguration(); - - if (mbUpdatePending && IsUpdatePossible()) - continue; } - while (false); + while (mbUpdatePending && IsUpdatePossible()); } else { commit 6b78f7fd8503451b82d659f1eca564f772d1b363 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:42:48 2014 +0100 coverity#1242803 Unused value Change-Id: I674f8ef309052737d742802ca4756c8e51e4385c diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index a214b59..e936a87 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -675,7 +675,6 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { - SvTreeListEntry* pFirstSel = pWordsLB->FirstSelected(); OUString rEntry = pEdt->GetText(); sal_Int32 nWordLen = rEntry.getLength(); @@ -705,7 +704,6 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) bDoNothing=true; pWordsLB->SetCurEntry(pEntry); bDoNothing=false; - pFirstSel = pEntry; pReplaceED->SetText(pWordsLB->GetEntryText(pEntry, 1)); if (CDE_SIMILAR == eCmpRes) @@ -733,7 +731,6 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) if(!bFound) { pWordsLB->SelectAll(false); - pFirstSel = 0; aNewReplaceText = sNew; bEnableNewReplace = true; @@ -752,6 +749,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { OUString aReplaceText; OUString aWordText; + SvTreeListEntry* pFirstSel = pWordsLB->FirstSelected(); if (pFirstSel) // a pWordsLB entry is selected { aWordText = pWordsLB->GetEntryText( pFirstSel, 0 ); commit f49e6e8b6062b5d2718764e320be8b8d052e60d0 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:38:19 2014 +0100 coverity#1242834 Unused value Change-Id: I2a68873d335f5efc27679c7bae619d942bbc5efe diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 70bce9c..cf3b2b5 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -672,7 +672,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) for ( i = 0; i < nSize; ++i ) pParamArr[i] = pList[i].pData; eErr = jfw_setVMParameters( pParamArrIter, nSize ); - SAL_WARN_IF("cui.options", JFW_E_NONE != eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters"); + SAL_WARN_IF(JFW_E_NONE != eErr, "cui.options", "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters"); pParamArrIter = pParamArr; rtl_freeMemory( pParamArr ); bModified = true; @@ -684,8 +684,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) if ( m_pPathDlg->GetOldPath() != sPath ) { eErr = jfw_setUserClassPath( sPath.pData ); - DBG_ASSERT( JFW_E_NONE == eErr, - "SvxJavaOptionsPage::FillItemSet(): error in jfw_setUserClassPath" ); + SAL_WARN_IF(JFW_E_NONE != eErr, "cui.options", "SvxJavaOptionsPage::FillItemSet(): error in jfw_setUserClassPath"); bModified = true; } } @@ -720,7 +719,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) } eErr = jfw_setSelectedJRE( pInfo ); - SAL_WARN_IF("cui.options", JFW_E_NONE != eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE"); + SAL_WARN_IF(JFW_E_NONE != eErr, "cui.options", "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE"); bModified = true; } } commit dcda099e8afb6d3404a08812ae916263aa94e612 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:36:24 2014 +0100 coverity#1242849 Unused value status gets overwritten after the switch ends Change-Id: I60d4f61e6e1f31f9dd79c178c9a6f7060d154013 diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h index 6e258f9..1d5086d 100644 --- a/sc/source/core/opencl/opencl_device_selection.h +++ b/sc/source/core/opencl/opencl_device_selection.h @@ -319,7 +319,6 @@ inline ds_status writeProfileToFile(ds_profile* profile, ds_score_serializer ser } break; default: - status = DS_UNKNOWN_DEVICE_TYPE; break; }; commit 61a84259e6a9604eb5ce0cd152256bf91d6571f5 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:34:20 2014 +0100 coverity#1242871 Unused value Change-Id: I1204b904b446c2ec3132064e89aa6f20c5523470 diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 70aceaf..70bce9c 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -720,8 +720,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) } eErr = jfw_setSelectedJRE( pInfo ); - DBG_ASSERT( JFW_E_NONE == eErr, - "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE" ); + SAL_WARN_IF("cui.options", JFW_E_NONE != eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE"); bModified = true; } } commit 19c283eaa88248277a28fb1717bd30f0193e817c Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:28:26 2014 +0100 coverity#1242888 Unused value Change-Id: I3adde518347208cb1ab7a2013c519d9eabcf7b3d diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index a0b3213..895f0de8 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2553,10 +2553,12 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) } } bOk = _pNewTable->InsertRow(*aInsertRow,true,_pNewTable->m_pColumns); - OSL_ENSURE(bOk,"Row could not be inserted!"); + SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be inserted!"); } else - OSL_ENSURE(bOk,"Row could not be fetched!"); + { + SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be fetched!"); + } } else { commit 01539155df5dda580ff248a86e192ced0150fb1b Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:26:13 2014 +0100 coverity#1242900 Unused value Change-Id: Ic556e9ca669af5d514ebe4d6bcff7bdc9271dc7a diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 4f9a796..70aceaf 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -275,9 +275,9 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) else if ( xFolderPicker.is() && xFolderPicker->execute() == ExecutableDialogResults::OK ) AddFolder( xFolderPicker->getDirectory() ); } - catch (const Exception&) + catch (const Exception& e) { - SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception" ); + SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception: " << e.Message); } return 0; @@ -672,8 +672,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) for ( i = 0; i < nSize; ++i ) pParamArr[i] = pList[i].pData; eErr = jfw_setVMParameters( pParamArrIter, nSize ); - DBG_ASSERT( JFW_E_NONE == eErr, - "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters" ); + SAL_WARN_IF("cui.options", JFW_E_NONE != eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters"); pParamArrIter = pParamArr; rtl_freeMemory( pParamArr ); bModified = true; commit 575c372fb987dd0a055a5521d0a6d95fb8483992 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 09:17:46 2014 +0100 coverity#1242968 Unused value Change-Id: I1cd88014175fe061d4db291b8d1430897c2c0084 diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 797a6da..e8c31aa 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -758,7 +758,7 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& } while (!(AbsEnd || (Border && ((WordEndCnt>0) || WordEnd || Trenn)))); while (WErec0->Index<WErec->Index) { // to assure Line[] matches } - c=ProcessChar(vOut,TBuf,*WErec0,Atr0,WEnChar0,WEnChar-WEnChar0-1,Line,cLine); + ProcessChar(vOut,TBuf,*WErec0,Atr0,WEnChar0,WEnChar-WEnChar0-1,Line,cLine); } (*R)=(*WErec); nChars=WEnChar; commit 6ca332cd9bfa5448d82bd4f853ddf95486f7d311 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Oct 3 10:51:11 2014 +0100 coverity#1212487 try and silence Copy-paste error Change-Id: Ib0b1b997b95a40c86d446cfee681982bb475b7e9 diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 0a1cdf8..dc9fc32 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2015,8 +2015,8 @@ bool SwCrsrShell::Pop( bool bOldCrsr ) SwCrsrSaveState aSaveState( *m_pCurCrsr ); // If the visible SSelection was not changed - if( pOldStk->GetPtPos() == m_pCurCrsr->GetPtPos() || - pOldStk->GetPtPos() == m_pCurCrsr->GetMkPos() ) + const Point& rPoint = pOldStk->GetPtPos(); + if (rPoint == m_pCurCrsr->GetPtPos() || rPoint == m_pCurCrsr->GetMkPos()) { // move "Selections Rectangles" m_pCurCrsr->insert( m_pCurCrsr->begin(), pOldStk->begin(), pOldStk->end() );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits