[Libreoffice-commits] core.git: 6 commits - chart2/source connectivity/source cui/source framework/source sc/source sd/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Thu May 9 14:31:53 PDT 2013
chart2/source/view/charttypes/BubbleChart.cxx | 1 -
connectivity/source/drivers/mork/MDriver.cxx | 1 -
connectivity/source/drivers/mork/MDriver.hxx | 1 -
cui/source/dialogs/hangulhanjadlg.cxx | 1 +
framework/source/uiconfiguration/imagemanagerimpl.cxx | 3 ---
sc/source/core/data/subtotalparam.cxx | 2 --
sc/source/filter/xml/xmldpimp.cxx | 14 ++++++--------
sd/source/filter/ppt/pptin.cxx | 4 +---
8 files changed, 8 insertions(+), 19 deletions(-)
New commits:
commit e68205f2b8f995e080412579afc21384a6a09895
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu May 9 05:13:27 2013 +0200
coverity#736132: comparison of array against NULL
Change-Id: Icba7557140d65b769bef17df57e2cdc1bdba3193
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 78d5156..facc0e4 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1427,9 +1427,6 @@ void ImageManagerImpl::clear()
{
ResetableGuard aGuard( m_aLock );
- if (!m_pUserImageList)
- return;
-
for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ )
{
delete m_pUserImageList[n];
commit 26d7485ab30062c654612b2b8496af6331dade43
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu May 9 05:11:08 2013 +0200
icoverity#705451: comparison of array against NULL
Change-Id: I544760548866d55807a3291a31b4ce948a751946
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index a0a5900..30e90f2 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1413,9 +1413,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide
pPage->NbcInsertObject( pObj, 0 );
}
}
- String aPlaceHolderString;
- if ( pHFE->pPlaceholder )
- aPlaceHolderString = pHFE->pPlaceholder[ i ];
+ String aPlaceHolderString = pHFE->pPlaceholder[ i ];
sd::HeaderFooterSettings rHeaderFooterSettings( pPage->getHeaderFooterSettings() );
switch( i )
commit 67b944c021703f82b62b1faeaa8665a630ab425f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu May 9 05:02:51 2013 +0200
coverity#705449: comparing array against NULL
Change-Id: I92ba78e96ad4f7c4a661dd879a721e422b6d0d2e
diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx
index 00c9bc1..b2e9b1b 100644
--- a/sc/source/core/data/subtotalparam.cxx
+++ b/sc/source/core/data/subtotalparam.cxx
@@ -162,8 +162,6 @@ bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
if ( bEqual && (nSubTotals[i] > 0) )
{
- bEqual = (pSubTotals != NULL) && (pFunctions != NULL);
-
for (SCCOL j=0; (j<nSubTotals[i]) && bEqual; j++)
{
bEqual = bEqual
commit 67c7ef9525308341aed98ecf6ebd06c75cb90466
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu May 9 05:01:01 2013 +0200
coverity#705446: self assignment
Change-Id: I950a6d971b1be742fa7c0ce26697cd84121a14d0
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index c06ebd5e..f3feec1 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -62,7 +62,6 @@ BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel
if( !m_pMainPosHelper )
m_pMainPosHelper = new PlottingPositionHelper();
PlotterBase::m_pPosHelper = m_pMainPosHelper;
- VSeriesPlotter::m_pMainPosHelper = m_pMainPosHelper;
}
BubbleChart::~BubbleChart()
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 1b9260b..83f58f7 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -541,16 +541,14 @@ void ScXMLDataPilotTableContext::EndElement()
if (pDPDimSaveData)
pDPSave->SetDimensionData(pDPDimSaveData);
pDPObject->SetSaveData(*pDPSave);
- if (pDoc)
- {
- ScDPCollection* pDPCollection = pDoc->GetDPCollection();
- // #i94570# Names have to be unique, or the tables can't be accessed by API.
- if ( pDPCollection->GetByName(pDPObject->GetName()) )
- pDPObject->SetName( String() ); // ignore the invalid name, create a new name in AfterXMLLoading
+ ScDPCollection* pDPCollection = pDoc->GetDPCollection();
- pDPCollection->InsertNewTable(pDPObject);
- }
+ // #i94570# Names have to be unique, or the tables can't be accessed by API.
+ if ( pDPCollection->GetByName(pDPObject->GetName()) )
+ pDPObject->SetName( String() ); // ignore the invalid name, create a new name in AfterXMLLoading
+
+ pDPCollection->InsertNewTable(pDPObject);
SetButtons();
}
commit 615d8be81a89edc73702534db8a0a7a4b81ef877
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed May 8 07:18:57 2013 +0200
coverity#982277: reosurce leak
Change-Id: I5d2b99645faf18e8af9bc0f0b4bff210f9ee8743
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 5e94ecc..2cd17fc 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -33,7 +33,6 @@ MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > const
{
SAL_INFO("connectivity.mork", "=> MorkDriver::MorkDriver()" );
// css::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceFactory(;
- m_ProfileAccess = new ProfileAccess();
assert(context.is());
}
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index cc816a0..04b7a20 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -60,7 +60,6 @@ public:
css::uno::Reference< com::sun::star::lang::XMultiServiceFactory > getFactory(){return m_xFactory;}
private:
- ProfileAccess* m_ProfileAccess;
virtual ~MorkDriver() {}
virtual OUString SAL_CALL getImplementationName()
commit fbc4e96901a743bc846078529c627e2e02808f05
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed May 8 06:34:57 2013 +0200
coverity#704141: resource leak
Change-Id: I4147dfa5d0d1fb2324a6441580212f25ce9d4a01
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 6d1eb82..edbd7c2 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1290,6 +1290,7 @@ namespace svx
SuggestionList::~SuggestionList()
{
Clear();
+ delete[] m_ppElements;
}
bool SuggestionList::Set( const String& _rElement, sal_uInt16 _nNumOfElement )
More information about the Libreoffice-commits
mailing list