[Libreoffice-commits] core.git: 11 commits - include/unotools lotuswordpro/source sc/source sd/source svl/source svtools/source sw/source ucb/source unoxml/source vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Apr 8 04:19:19 PDT 2014
include/unotools/itemholderbase.hxx | 4 +-
lotuswordpro/source/filter/lwpoleobject.hxx | 7 +++
sc/source/filter/oox/commentsbuffer.cxx | 15 ++++++--
sd/source/filter/eppt/text.hxx | 17 +++++----
svl/source/numbers/zforscan.cxx | 3 +
svtools/source/contnr/svlbitm.cxx | 2 +
sw/source/core/crsr/crsrsh.cxx | 50 +++++++++++++++++++++-------
sw/source/core/undo/unmove.cxx | 20 +++++++----
ucb/source/ucp/ftp/ftpurl.cxx | 2 -
ucb/source/ucp/ftp/ftpurl.hxx | 2 -
unoxml/source/dom/attributesmap.cxx | 8 ++--
unoxml/source/dom/attributesmap.hxx | 8 ++--
vcl/source/filter/wmf/winmtf.hxx | 30 ++++++++++------
13 files changed, 116 insertions(+), 52 deletions(-)
New commits:
commit a5bcc75b9cfc4aa195782ca863c0ce3260bc89df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 11:34:18 2014 +0100
coverity#708210 Uninitialized scalar field
Change-Id: I9bf4182d4c6e7a61b057f3541cc4c2a4b0316edd
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 01dee81..fe98e3d 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -90,7 +90,9 @@ struct TItemInfo
{
TItemInfo()
: pItem(0)
- {}
+ , eItem(E_USEROPTIONS)
+ {
+ }
utl::detail::Options * pItem;
EItem eItem;
commit c5eddc903a7871e9a8eb1c5783266f200c026fe3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:49:37 2014 +0100
coverity#707425 Uncaught exception
Change-Id: I9c9fb5ed321e857aec58b10c9f8d028c06327113
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 9ec0183..69693d6f 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -675,7 +675,7 @@ void FTPURL::insert(bool replaceExisting,void* stream) const
void FTPURL::mkdir(bool ReplaceExisting) const
- throw(curl_exception)
+ throw (curl_exception, malformed_exception)
{
OString title;
if(!m_aPathSegmentVec.empty()) {
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 00f29a3..42d1415 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -131,7 +131,7 @@ namespace ftp {
throw(curl_exception);
void mkdir(bool ReplaceExisting) const
- throw(curl_exception);
+ throw(curl_exception, malformed_exception);
OUString ren(const OUString& NewTitle)
throw(curl_exception);
commit f193c1bdf17dba6d1c35b0d4d1456634a47d3974
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:44:35 2014 +0100
coverity#707456 Uncaught exception
also coverity#707455, coverity#707454, coverity#707453
Change-Id: Ife1c2959eeee00cf83762eccc559ed001f64b5c1
diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx
index 4514225..9652bc6 100644
--- a/unoxml/source/dom/attributesmap.cxx
+++ b/unoxml/source/dom/attributesmap.cxx
@@ -157,7 +157,7 @@ namespace DOM
*/
Reference< XNode > SAL_CALL
CAttributesMap::removeNamedItem(OUString const& name)
- throw (RuntimeException, std::exception)
+ throw (DOMException, RuntimeException, std::exception)
{
// no MutexGuard needed: m_pElement is const
Reference< XAttr > const xAttr(m_pElement->getAttributeNode(name));
@@ -178,7 +178,7 @@ namespace DOM
Reference< XNode > SAL_CALL
CAttributesMap::removeNamedItemNS(
OUString const& namespaceURI, OUString const& localName)
- throw (RuntimeException, std::exception)
+ throw (DOMException, RuntimeException, std::exception)
{
// no MutexGuard needed: m_pElement is const
Reference< XAttr > const xAttr(
@@ -199,7 +199,7 @@ namespace DOM
*/
Reference< XNode > SAL_CALL
CAttributesMap::setNamedItem(Reference< XNode > const& xNode)
- throw (RuntimeException, std::exception)
+ throw (DOMException, RuntimeException, std::exception)
{
Reference< XAttr > const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
@@ -219,7 +219,7 @@ namespace DOM
*/
Reference< XNode > SAL_CALL
CAttributesMap::setNamedItemNS(Reference< XNode > const& xNode)
- throw (RuntimeException, std::exception)
+ throw (DOMException, RuntimeException, std::exception)
{
Reference< XAttr > const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx
index 54537e9..94449df 100644
--- a/unoxml/source/dom/attributesmap.hxx
+++ b/unoxml/source/dom/attributesmap.hxx
@@ -77,28 +77,28 @@ namespace DOM
*/
virtual Reference< XNode > SAL_CALL
removeNamedItem(OUString const& name)
- throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (DOMException, RuntimeException, std::exception) SAL_OVERRIDE;
/**
// Removes a node specified by local name and namespace URI.
*/
virtual Reference< XNode > SAL_CALL removeNamedItemNS(
OUString const& namespaceURI, OUString const& localName)
- throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (DOMException, RuntimeException, std::exception) SAL_OVERRIDE;
/**
// Adds a node using its nodeName attribute.
*/
virtual Reference< XNode > SAL_CALL
setNamedItem(Reference< XNode > const& arg)
- throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (DOMException, RuntimeException, std::exception) SAL_OVERRIDE;
/**
Adds a node using its namespaceURI and localName.
*/
virtual Reference< XNode > SAL_CALL
setNamedItemNS(Reference< XNode > const& arg)
- throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (DOMException, RuntimeException, std::exception) SAL_OVERRIDE;
};
}
commit 7077fa3b0d83023ca06f13707695dd89df0ab0dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:39:35 2014 +0100
coverity#708288 Uninitialized scalar field
also coverity#708289 Uninitialized scalar field
Change-Id: I7fe8fb8073af6e66fc548e1e10969ca555ea9bab
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 9fabd7c..f42f86f 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -39,6 +39,8 @@ struct SvLBoxButtonData_Impl
void SvLBoxButtonData::InitData( bool bImagesFromDefault, bool _bRadioBtn, const Control* pCtrl )
{
+ nWidth = nHeight = 0;
+
pImpl = new SvLBoxButtonData_Impl;
bDataOk = false;
commit 6d767cab12d17265ad6e9b5648bba50d38d17430
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:38:13 2014 +0100
coverity#708261 Uninitialized scalar field
Change-Id: I997dad13c3b8931d1fd4eae09218b51cb4621263
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 45ea7b8..68959bc 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -68,6 +68,9 @@ namespace
}
ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
+ : eNewLnge(LANGUAGE_DONTKNOW)
+ , eTmpLnge(LANGUAGE_DONTKNOW)
+ , nCurrPos(-1)
{
pFormatter = pFormatterP;
bConvertMode = false;
commit 969b08ea73211503454f9a190391a40318348b92
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:35:25 2014 +0100
coverity#738720 Uninitialized scalar field
Change-Id: If5fc315467be2890fd733d930546b2c12fc97622
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index 1ab69c1..6386429 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -80,6 +80,13 @@ typedef struct tagAFID_CACHE
unsigned long LinkedFileTime; /* 0 if not linked */
long Width; /* -1 if not present */
long Height; /* -1 if not present */
+ tagAFID_CACHE()
+ : LinkedFileSize(0)
+ , LinkedFileTime(0)
+ , Width(0)
+ , Height(0)
+ {
+ }
} AFID_CACHE, * PAFID_CACHE;
/* Maximum string sizes - includes space for null terminator */
commit 8f2405dd5b63bb04cd34df51c350f31d771d9c55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:33:07 2014 +0100
coverity#738796 Uninitialized scalar field
Change-Id: I241b6cfba1e28d89c4517cf121f8465fd84f5adc
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index b52a376..7fe06e0 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -81,10 +81,17 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
}
}
-CommentModel::CommentModel() :
- mnAuthorId( -1 ),
- mnObjId( BIFF_OBJ_INVALID_ID ),
- mbVisible( false )
+CommentModel::CommentModel()
+ : mnAuthorId(-1)
+ , mnObjId(BIFF_OBJ_INVALID_ID)
+ , mbAutoFill(false)
+ , mbAutoScale(false)
+ , mbColHidden(false)
+ , mbLocked(false)
+ , mbRowHidden(false)
+ , mnTHA(0)
+ , mnTVA(0)
+ , mbVisible( false )
{
}
commit 001f44a7ca1c22ea386a4737e55b3ada1eefad78
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:30:31 2014 +0100
coverity#738818 Uninitialized scalar field
Change-Id: Ic2d6b70da3adcd99a35b63afcfacf55e566755c4
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 301842b..71abbba 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -85,14 +85,17 @@ struct SOParagraph
class PropStateValue : public PropValue
{
- protected :
-
- ::com::sun::star::beans::PropertyState ePropState;
- ::com::sun::star::uno::Reference
- < ::com::sun::star::beans::XPropertyState > mXPropState;
-
- sal_Bool ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState = sal_True );
+public:
+ PropStateValue()
+ : PropValue()
+ , ePropState(css::beans::PropertyState_AMBIGUOUS_VALUE)
+ {
+ }
+protected:
+ css::beans::PropertyState ePropState;
+ css::uno::Reference < css::beans::XPropertyState > mXPropState;
+ sal_Bool ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState = sal_True );
};
struct FieldEntry
commit 3b73bb510096e502e6c6cdea35129617839efb3e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:27:42 2014 +0100
coverity#738863 Uninitialized scalar field
Change-Id: I2e2c6c59d85183bb81ecd8fb7a73acdf6b17a27d
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 62a9f2a..035686c 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -842,21 +842,27 @@ private:
public:
- WMFReader(
- SvStream& rStreamWMF,
- GDIMetaFile& rGDIMetaFile,
- FilterConfigItem* pConfigItem = NULL,
- WMF_EXTERNALHEADER* pExtHeader = NULL
- )
- : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem )
- , pEMFStream(NULL),
- pExternalHeader(pExtHeader)
- {}
+ WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile,
+ FilterConfigItem* pConfigItem = NULL,
+ WMF_EXTERNALHEADER* pExtHeader = NULL)
+ : WinMtf(new WinMtfOutput(rGDIMetaFile) , rStreamWMF, pConfigItem)
+ , nUnitsPerInch(96)
+ , nRecSize(0)
+ , pEMFStream(NULL)
+ , nEMFRecCount(0)
+ , nEMFRec(0)
+ , nEMFSize(0)
+ , nSkipActions(0)
+ , nCurrentAction(0)
+ , nUnicodeEscapeAction(0)
+ , pExternalHeader(pExtHeader)
+ {
+ }
- ~WMFReader();
+ ~WMFReader();
// read WMF file from stream and fill the GDIMetaFile
- void ReadWMF();
+ void ReadWMF();
};
#endif
commit 290f7986a9030eaf1078ce65da5d78f834b0e3ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:21:54 2014 +0100
coverity#738883 Uninitialized scalar field
Change-Id: Ica1335690e9204a5e9b445ad9583da739dce5bff
and coverity#738882 Uninitialized scalar field
Change-Id: Ief58f36c70e16eabe8b4e3ccbc82fc9ca3309d94
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a9faaad..e71b044 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2581,12 +2581,25 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
All views of a document are in the ring of the shell.
*/
SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
- : SwViewShell( rShell, pInitWin ),
- SwModify( 0 ), m_pCrsrStk( 0 ), m_pBlockCrsr( 0 ), m_pTblCrsr( 0 ),
- m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ),
- m_eMvState( MV_NONE ),
- m_sMarkedListId(),
- m_nMarkedListLevel( 0 ), m_oldColFrm(0)
+ : SwViewShell( rShell, pInitWin )
+ , SwModify( 0 )
+ , m_pCrsrStk( 0 )
+ , m_pBlockCrsr( 0 )
+ , m_pTblCrsr( 0 )
+ , m_pBoxIdx( 0 )
+ , m_pBoxPtr( 0 )
+ , m_nUpDownX(0)
+ , m_nLeftFrmPos(0)
+ , m_nAktNode(0)
+ , m_nAktCntnt(0)
+ , m_nAktNdTyp(0)
+ , m_bAktSelection(false)
+ , m_nCrsrMove( 0 )
+ , m_nBasicActionCnt( 0 )
+ , m_eMvState( MV_NONE )
+ , m_sMarkedListId()
+ , m_nMarkedListLevel( 0 )
+ , m_oldColFrm(0)
{
SET_CURR_SHELL( this );
// only keep the position of the current cursor of the copy shell
@@ -2610,12 +2623,25 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
/// default constructor
SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
const SwViewOption *pInitOpt )
- : SwViewShell( rDoc, pInitWin, pInitOpt ),
- SwModify( 0 ), m_pCrsrStk( 0 ), m_pBlockCrsr( 0 ), m_pTblCrsr( 0 ),
- m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ),
- m_eMvState( MV_NONE ), // state for crsr-travelling - GetCrsrOfst
- m_sMarkedListId(),
- m_nMarkedListLevel( 0 ), m_oldColFrm(0)
+ : SwViewShell( rDoc, pInitWin, pInitOpt )
+ , SwModify( 0 )
+ , m_pCrsrStk( 0 )
+ , m_pBlockCrsr( 0 )
+ , m_pTblCrsr( 0 )
+ , m_pBoxIdx( 0 )
+ , m_pBoxPtr( 0 )
+ , m_nUpDownX(0)
+ , m_nLeftFrmPos(0)
+ , m_nAktNode(0)
+ , m_nAktCntnt(0)
+ , m_nAktNdTyp(0)
+ , m_bAktSelection(false)
+ , m_nCrsrMove( 0 )
+ , m_nBasicActionCnt( 0 )
+ , m_eMvState( MV_NONE ) // state for crsr-travelling - GetCrsrOfst
+ , m_sMarkedListId()
+ , m_nMarkedListLevel( 0 )
+ , m_oldColFrm(0)
{
SET_CURR_SHELL( this );
// create initial cursor and set it to first content position
commit 5e5ce3767f45a2df39b02c0be34cc4466d87d2e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 8 10:16:12 2014 +0100
coverity#738888 Uninitialized scalar field
Change-Id: Ifbc4db935e912907a5fc3988b1910db506040cdc
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index 45ad54c..6dc4a05 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -28,13 +28,21 @@
// MOVE
SwUndoMove::SwUndoMove( const SwPaM& rRange, const SwPosition& rMvPos )
- : SwUndo( UNDO_MOVE ), SwUndRng( rRange ),
- nMvDestNode( rMvPos.nNode.GetIndex() ),
- nMvDestCntnt( rMvPos.nContent.GetIndex() ),
- bMoveRedlines( false )
+ : SwUndo( UNDO_MOVE )
+ , SwUndRng( rRange )
+ , nDestSttNode(0)
+ , nDestEndNode(0)
+ , nInsPosNode(0)
+ , nMvDestNode(rMvPos.nNode.GetIndex())
+ , nDestSttCntnt(0)
+ , nDestEndCntnt(0)
+ , nInsPosCntnt(0)
+ , nMvDestCntnt(rMvPos.nContent.GetIndex())
+ , bJoinNext(false)
+ , bJoinPrev(false)
+ , bMoveRange(false)
+ , bMoveRedlines(false)
{
- bMoveRange = bJoinNext = bJoinPrev = sal_False;
-
// get StartNode from footnotes before delete!
SwDoc* pDoc = rRange.GetDoc();
SwTxtNode* pTxtNd = pDoc->GetNodes()[ nSttNode ]->GetTxtNode();
More information about the Libreoffice-commits
mailing list