[Libreoffice-commits] core.git: 8 commits - filter/source sc/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Fri Feb 15 13:33:01 PST 2013
filter/source/msfilter/escherex.cxx | 2 +-
sc/source/core/data/postit.cxx | 3 +++
sc/source/core/data/table2.cxx | 4 +---
sc/source/filter/dif/difimp.cxx | 2 ++
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 1 +
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 1 +
sc/source/filter/xml/xmlimprt.cxx | 2 +-
sc/source/ui/dbgui/filtdlg.cxx | 2 +-
8 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 9a73122622bc44e34d9e7c56d1a16de43ed3adae
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 22:19:10 2013 +0100
coverity: prevent use of unitialized variable
Change-Id: I17520b15d75467f8233f964ef99a4dd0eea7ed44
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index e3ae181..921949c 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1164,7 +1164,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
rItem.maString = aStrVal;
rItem.mfVal = 0.0;
- sal_uInt32 nIndex;
+ sal_uInt32 nIndex = 0;
bool bNumber = pDoc->GetFormatTable()->IsNumberFormat(
rItem.maString, nIndex, rItem.mfVal);
rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
commit 0885e37063e1c04e24bcf94d792b6bacc2d7d38a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 22:18:57 2013 +0100
coverity: fix memory leak
Change-Id: I5d9d240af15f3c7da1e6fe29a69dc0366684b55f
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index d587bf1..ff9bb374 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2395,7 +2395,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
{
ScXMLImport::MutexGuard aGuard(*this);
sal_Int16 nTemp16(0);
- ScChangeViewSettings* pViewSettings(new ScChangeViewSettings());
+ boost::scoped_ptr<ScChangeViewSettings> pViewSettings(new ScChangeViewSettings());
for (sal_Int32 i = 0; i < nCount; ++i)
{
rtl::OUString sName(rChangeProps[i].Name);
commit be64af3722e919f2a218f444daa04c4a70eb449c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 22:11:29 2013 +0100
coverity: fix memory leak
Change-Id: If5bd111bbf4c1df8e790f229165c682ecc0ed3b7
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 385431a..f5d8ce1 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -405,6 +405,7 @@ void ScXMLChangeTrackingImportHelper::AddGenerated(ScMyCellInfo* pCellInfo, cons
}
else
{
+ delete pGenerated;
OSL_FAIL("try to insert a generated action to a wrong action");
}
}
commit e4bd11d8b1cafdddf7a04113980f048f15d2521b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 22:04:21 2013 +0100
coverity: fix memory leak
Change-Id: I2bff2b1bee6d14ef237c62f02b9e1fddd2b63f11
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 1b405ec..040b005 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -262,6 +262,7 @@ void XclImpChangeTrack::ReadCell(
ReadFormula( pTokenArray, rPosition );
if( pStrm->IsValid() && pTokenArray )
rpCell = new ScFormulaCell( GetDocPtr(), rPosition, pTokenArray );
+ delete pTokenArray;
}
break;
default:
commit b8591e596bde12c800d763c2c8e00456a7ac0ce5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 21:50:02 2013 +0100
coverity: fix mismatch between new[] and delete
Change-Id: I33b2b8ffd1a6ba539346ca19f6a34bc7f1c61e3d
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index d456be6..217974f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -231,7 +231,7 @@ void EscherPropertyContainer::AddOpt( sal_uInt16 nPropID, sal_Bool bBlib, sal_uI
{
pTemp[ i ] = pSortStruct[ i ];
}
- delete pSortStruct;
+ delete[] pSortStruct;
pSortStruct = pTemp;
}
pSortStruct[ nSortCount ].nPropId = nPropID; // insert property
commit e2b2ffcccc1d78674a4f361f0da911de8303f54e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 21:45:11 2013 +0100
coverity: fix memory leak
Change-Id: I978dd7dbc520e5a53fd4ca245e871286dcc10ca6
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index ff84fbe..e03a9a8 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -929,6 +929,8 @@ DifAttrCache::~DifAttrCache()
if( ppCols[ nCnt ] )
delete ppCols[ nCnt ];
}
+
+ delete ppCols;
}
void DifAttrCache::SetLogical( const SCCOL nCol, const SCROW nRow )
commit 3918fdaa9acd4056161a67b75d8028c918b5c22b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 21:44:58 2013 +0100
use boost::scoped_ptr
Change-Id: Ib68b65a03be092f43a482e33966b7c1c103ace08
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 665db7c..0451561 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -875,7 +875,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCROW nAttrRow1;
SCROW nAttrRow2;
const ScPatternAttr* pPattern;
- ScAttrIterator* pAttrIter = aCol[nCol].CreateAttrIterator( nRow1, nRow2 );
+ boost::scoped_ptr<ScAttrIterator> pAttrIter(aCol[nCol].CreateAttrIterator( nRow1, nRow2 ));
while ( (pPattern = pAttrIter->Next( nAttrRow1, nAttrRow2 )) != 0 )
{
if ( !IsDefaultItem( pPattern ) )
@@ -934,8 +934,6 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
}
-
- delete pAttrIter;
}
}
commit 8426af90fce68eb1762f4774d7428cc2b2d20013
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Fri Feb 15 21:07:40 2013 +0100
don't access freed memory
Change-Id: I3839d9af55c7dcd29d34850618a33c6c3b1ee2ec
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index b9bec3f..5ca89b1 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -845,6 +845,9 @@ ScPostIt* ScNoteUtil::CreateNoteFromCaption(
// ScNoteCaptionCreator c'tor updates the caption object to be part of a note
ScNoteCaptionCreator aCreator( rDoc, rPos, rCaption, bShown );
}
+ else
+ return NULL;
+
return pNote;
}
More information about the Libreoffice-commits
mailing list