[Libreoffice-commits] core.git: 8 commits - sc/source sd/source svx/source vcl/source
Norbert Thiebaud
nthiebaud at gmail.com
Fri Jul 4 04:32:06 PDT 2014
sc/source/ui/Accessibility/AccessibleDocument.cxx | 4 ++--
sc/source/ui/dbgui/filtdlg.cxx | 9 ++++++---
sd/source/filter/html/htmlex.cxx | 2 +-
sd/source/filter/html/pubdlg.cxx | 1 -
svx/source/form/fmshimp.cxx | 2 --
vcl/source/gdi/gdimtf.cxx | 4 ++--
vcl/source/window/splitwin.cxx | 8 +++++++-
7 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit a89f979dea265d68f22daee013ee8c4ee30e6c5b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 12:43:43 2014 +0200
coverity#735805 dereference null value
Change-Id: I3782cffb19e45635076f19eb568fc547b9680b0d
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 572e07e..ca0fdee 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -270,9 +270,12 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
pDoc->GetFormatTable()->GetInputLineString( rItem.mfVal, 0, aValStr);
else if (rItem.meType == ScQueryEntry::ByDate)
{
- SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
- pFormatter->GetInputLineString( rItem.mfVal,
- pFormatter->GetStandardFormat( NUMBERFORMAT_DATE), aValStr);
+ if(pDoc)
+ {
+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ pFormatter->GetInputLineString( rItem.mfVal,
+ pFormatter->GetStandardFormat( NUMBERFORMAT_DATE), aValStr);
+ }
}
else
{
commit d3c3ba075c485e97c658d145319b36a69c60a5c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 12:35:22 2014 +0200
coverity#736163 Dereference Null return
Change-Id: I62046a619315d53dbeefbe0ebd26d24917adca14
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index be04473..0f20582 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2637,7 +2637,6 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
{
#ifdef DBG_UTIL
sal_uInt16 nDbgDummy;
- DBG_ASSERT( ImplFindSet( mpMainSet, nSetId ), "SplitWindow::InsertItem() - Set not exists" );
DBG_ASSERT( !ImplFindItem( mpMainSet, nId, nDbgDummy ), "SplitWindow::InsertItem() - Id already exists" );
#endif
@@ -2646,6 +2645,13 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
nSize = 1;
ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId );
+#ifdef DBG_UTIL
+ DBG_ASSERT( pSet, "SplitWindow::InsertItem() - Set not exists" );
+#endif
+ if(!pSet)
+ {
+ return;
+ }
ImplSplitSet* pNewSet;
ImplSplitItem* pItem;
commit a387d3c96c414da65396957b18df3202a720e2ba
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 12:29:39 2014 +0200
coverity#736159 Dereference Null return
Change-Id: I6581efb320a9e43cb242dabecfd500d4e04b058b
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7158d4d..4fc7d3f 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -324,7 +324,7 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos )
for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ )
{
- if( !Hook() )
+ if( !Hook() && pAction )
{
pAction->Duplicate();
rMtf.AddAction( pAction );
@@ -360,7 +360,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
size_t i = 0;
for( size_t nCurPos = nCurrentActionElement; nCurPos < nPos; nCurPos++ )
{
- if( !Hook() )
+ if( !Hook() && pAction )
{
MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
if( pAction->GetType() == META_COMMENT_ACTION &&
commit 1b35b63e7bb5fd37c7db8575c55a273c59354175
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 11:40:55 2014 +0200
coverity#704033 Uncheck return value
Change-Id: I7c119d41d2419f1181f6fe30d501e5142d2586ec
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 72c47a6..8d8c536 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -894,7 +894,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
void FmXFormShell::disposing()
{
- impl_checkDisposed();
FmXFormShell_BASE::disposing();
commit bff3cba118eb43142b98be627ca6bdf31d7485fa
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 11:38:28 2014 +0200
coverity#704032 Uncheck return value
Change-Id: Ibb37a059f740580f1d02ed58172451ad5efdd8d5
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index ba76540..72c47a6 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -770,7 +770,6 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE
void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException, std::exception )
{
- impl_checkDisposed();
if (m_xActiveController == e.Source)
{
commit 59b94d5e133e829f7cecbd0df2d3757cfe4e0008
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 11:29:41 2014 +0200
coverity#704008 Uncheck return value
Change-Id: I0bfd2c59782869b232a5705bbb05a06c3476f754
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 5506dd4..3537b02 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1503,7 +1503,6 @@ bool SdPublishingDlg::Save()
INetURLObject aURL( SvtPathOptions().GetUserConfigPath() );
aURL.Append( OUString( "designs.sod" ) );
SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
- aMedium.IsRemote();
SvStream* pStream = aMedium.GetOutStream();
commit 42927fbdf4113a0c92cb19f101e2f33f2ea5040f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 11:23:39 2014 +0200
coverity#704007 Uncheck return value
Change-Id: Ia8fc871123982b77a9313e56fac7f5e09f545610
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 54db936..50245c4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3154,7 +3154,7 @@ EasyFile::EasyFile()
EasyFile::~EasyFile()
{
if( bOpen )
- close();
+ (void)close();
}
sal_uLong EasyFile::createStream( const OUString& rUrl, SvStream* &rpStr )
commit 7e57b5ad17c96af2d92cbf22fe3362a246786c24
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jul 4 10:10:23 2014 +0200
coverity#703995 Uncheck return value
Change-Id: I84d219e65966c18092d1deef163efcf7b189af79
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 262eff3..6411318 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -471,8 +471,8 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
{
OSL_ENSURE(pCurrentChild->GetXShape().get() == pReplacement->GetXShape().get(), "XShape changes and should be inserted sorted");
SortedShapes::iterator aItr;
- FindShape(pCurrentChild->GetXShape(), aItr);
- if (aItr != maZOrderedShapes.end() && (*aItr))
+
+ if (FindShape(pCurrentChild->GetXShape(), aItr) || (aItr != maZOrderedShapes.end() && (*aItr)))
{
if ((*aItr)->pAccShape)
{
More information about the Libreoffice-commits
mailing list