oox/source/drawingml/textbodyproperties.cxx | 5 +++--
sc/source/ui/dbgui/pfiltdlg.cxx | 6 +++---
sd/source/core/stlfamily.cxx | 4 ----
sd/source/ui/dlg/gluectrl.cxx | 2 +-
sd/source/ui/remotecontrol/DiscoveryService.cxx | 16 ++++++++++------
sw/source/core/layout/flowfrm.cxx | 7 ++++---
6 files changed, 21 insertions(+), 19 deletions(-)
New commits:
commit f754176e0fe5a4780694450f65810466e0f4bd99
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 21:13:34 2014 +0000
coverity#1194898 Logically dead code
Change-Id: Iceef129ed11ab4551008eedf765ec0fe5a72c09a
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index e75c9f1..d59d6c1 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -83,10 +83,6 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
{
// we assume that we have only SdStyleSheets
SdStyleSheet* pSdStyle = static_cast< SdStyleSheet* >( pStyle
);
- if (!pSdStyle)
- {
- continue;
- }
if (pSdStyle->GetName().startsWith(aLayoutName))
{
maStyleSheets[ pSdStyle->GetApiName() ] = rtl::Reference<
SdStyleSheet >( pSdStyle );
commit 77e662100c5f84752fd26fbfb24f4dd458d2e66f
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 21:09:32 2014 +0000
coverity#1194941 Uninitialized scalar field
Change-Id: Ieedd977bc45136f087639b8d785fd75335b49087
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 42563ed..d37dc3b 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -55,17 +55,21 @@ using namespace rtl;
using namespace sd;
DiscoveryService::DiscoveryService()
- : zService( 0 )
+ : mSocket(-1)
+ , zService(0)
{
}
DiscoveryService::~DiscoveryService()
{
- #ifdef WNT
- closesocket( mSocket );
- #else
- close( mSocket );
- #endif
+ if (mSocket != -1)
+ {
+#ifdef WNT
+ closesocket( mSocket );
+#else
+ close( mSocket );
+#endif
+ }
if (zService)
zService->clear();
commit dbd6bb6a62ec9740fd008c9ec1f7dceca74db953
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 21:07:08 2014 +0000
coverity#1194942 Uninitialized scalar field
Change-Id: I21733cb3fc0dd32a39826b0eaa7b2064d50a9c90
diff --git a/oox/source/drawingml/textbodyproperties.cxx
b/oox/source/drawingml/textbodyproperties.cxx
index 73fb9fb..850092c 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -31,8 +31,9 @@ namespace drawingml {
-TextBodyProperties::TextBodyProperties():
- meVA( TextVerticalAdjust_TOP )
+TextBodyProperties::TextBodyProperties()
+ : mbAnchorCtr(false)
+ , meVA( TextVerticalAdjust_TOP )
{
}
commit 99780fcf66f12df6be6f8c1bd636e5e44f1918b2
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 21:03:47 2014 +0000
coverity#1194920 Overflowed array index read
Change-Id: I2f5dc0c4cd56e8304ef3dcd83221a1428fdda194
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index a4ed47d..da5fe9a 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -80,7 +80,7 @@ GlueEscDirLB::~GlueEscDirLB()
*/
void GlueEscDirLB::Select()
{
- sal_uInt16 nPos = GetSelectEntryPos();
+ sal_Int32 nPos = GetSelectEntryPos();
SfxUInt16Item aItem( SID_GLUE_ESCDIR, aEscDirArray[ nPos ] );
if ( m_xFrame.is() )
commit c08baae30c62d8bac45c8d49dd556ed1b770889c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 21:03:04 2014 +0000
coverity#1194918 Overflowed array index read
Change-Id: Ic9cec3fc6749672b30bb1e0c96159897e50a84e5
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 752bc46..43d9e871 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -284,9 +284,9 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
if ( pDoc && nList>0 && nList<=3 )
{
ComboBox* pValList = aValueEdArr[nList-1];
- sal_uInt16 nFieldSelPos =
aFieldLbArr[nList-1]->GetSelectEntryPos();
- sal_uInt16 nListPos = 0;
- OUString aCurValue = pValList->GetText();
+ sal_Int32 nFieldSelPos =
aFieldLbArr[nList-1]->GetSelectEntryPos();
+ sal_Int32 nListPos = 0;
+ OUString aCurValue = pValList->GetText();
pValList->Clear();
pValList->InsertEntry( aStrNotEmpty, 0 );
commit 1ee6577a0eae3d189d11233bccf90d11e48d771d
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Mar 29 20:58:57 2014 +0000
coverity#704900 Dereference after null check
Change-Id: I5ffac44f4fa48be0a4158c9eb234e94d2a22f5ed
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 5b51242..05c166a 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1672,14 +1672,15 @@ SwTwips SwFlowFrm::CalcAddLowerSpaceAsLastInTableCell(
}
}
- SwBorderAttrAccess* pAttrAccess = 0L;
- if ( !_pAttrs || pFrm != &m_rThis )
+ SwBorderAttrAccess* pAttrAccess = NULL;
+ if (pFrm && (!_pAttrs || pFrm != &m_rThis))
{
pAttrAccess = new SwBorderAttrAccess( SwFrm::GetCache(), pFrm );
_pAttrs = pAttrAccess->Get();
}
- nAdditionalLowerSpace += _pAttrs->GetULSpace().GetLower();
+ if (_pAttrs)
+ nAdditionalLowerSpace += _pAttrs->GetULSpace().GetLower();
delete pAttrAccess;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
