[Libreoffice-commits] core.git: 15 commits - cui/source include/canvas include/svx sc/source sdext/source sd/source sfx2/source svx/source sw/source

Caolán McNamara caolanm at redhat.com
Wed Apr 30 03:44:18 PDT 2014


 cui/source/customize/cfg.cxx                    |    3 +++
 include/canvas/base/canvasbase.hxx              |    2 +-
 include/canvas/base/integerbitmapbase.hxx       |    8 ++++----
 include/svx/unoshape.hxx                        |    6 +++---
 sc/source/ui/view/cellsh2.cxx                   |    2 +-
 sd/source/ui/dlg/custsdlg.cxx                   |    2 +-
 sdext/source/pdfimport/tree/genericelements.hxx |   11 +++++++++--
 sfx2/source/view/viewprn.cxx                    |    4 ++++
 svx/source/unodraw/shapeimpl.hxx                |    2 +-
 svx/source/unodraw/tableshape.cxx               |    2 +-
 svx/source/unodraw/unoshap3.cxx                 |    6 +++---
 sw/source/core/uibase/inc/glossary.hxx          |    1 -
 12 files changed, 31 insertions(+), 18 deletions(-)

New commits:
commit 225cc70f398963f39dfe7d986d61462e07417a8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:25:07 2014 +0100

    coverity#704598 Dereference after null check
    
    Change-Id: I37bb96ae15c2e96ed4592f1a2a13d4f932be0d2b

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8135610..c9a485b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -266,6 +266,9 @@ generateCustomName(
         name = prefix + OUString::number( suffix );
     }
 
+    if (!entries)
+        return name;
+
     // now check is there is an already existing entry with this name
     SvxEntries::const_iterator iter = entries->begin();
 
commit 7210621e0367f2bcac8509c7701ebd272ad5ee3c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:22:44 2014 +0100

    coverity#704714 Dereference after null check
    
    Change-Id: Ib15d4f52ed57dae053d3b21b476b4e595145e38b

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 42b6316..097fa19 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -1166,7 +1166,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet )
 
             case SID_DEFINE_DBNAME:
                 {
-                    if ( pDocSh && pDocSh->IsDocShared() )
+                    if ( pDocSh->IsDocShared() )
                     {
                         rSet.DisableItem( nWhich );
                     }
commit fd223840fe9c6e72965a45f74cf4d046a7891152
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:20:50 2014 +0100

    coverity#704742 Dereference after null check
    
    Change-Id: Ieb6d49041d3b540caacfb469291636213a465e62

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index cf6ee4a..3b53661 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -98,7 +98,7 @@ void SdCustomShowDlg::CheckState()
     m_pCbxUseCustomShow->Enable( bEnable );
     m_pBtnStartShow->Enable( true );
 
-    if( bEnable )
+    if (bEnable && pCustomShowList)
         pCustomShowList->Seek( nPos );
 }
 
commit 04503ecdbeccd6e46dc8f716a996d6d894bc1825
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:19:27 2014 +0100

    coverity#704797 Dereference after null check
    
    Change-Id: I4faf814dff06a2a5627af1c74ff46d2eb11bc62b

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 72555b1..8007221 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -448,6 +448,10 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute)
             _pOptions = ( (SfxPrinter*)_pSetupParent->GetPrinter() )->GetOptions().Clone();
     }
 
+    assert(_pOptions);
+    if (!_pOptions)
+        return 0;
+
     // Create Dialog
     SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( static_cast<Window*>(_pSetupParent),
                                                              _pViewSh, _pOptions );
commit 03bc0110e2926c7246e113ae5d45e14f26c4fe73
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:14:47 2014 +0100

    coverity#1210085 Uncaught exception
    
    Change-Id: Id73c7c0fcea319ddcb08ae95d28fb776e9bc05f3

diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index d0a6500..0acd079 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -42,7 +42,7 @@ namespace canvas
     public:
         // XIntegerBitmap
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                                              const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+                                                                              const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             tools::verifyArgs(rect,
                               BOOST_CURRENT_FUNCTION,
commit bb68bbc3ec5925011ab176fc45a9f54eedd335d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:14:14 2014 +0100

    coverity#1210086 Uncaught exception
    
    Change-Id: I33b50aa5934e37adeae041ca8ad3751b3bdc8ac6

diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 7c4ab6a..d0a6500 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -57,7 +57,7 @@ namespace canvas
 
         virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&      data,
                                        const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-                                       const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+                                       const ::com::sun::star::geometry::IntegerRectangle2D&   rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             tools::verifyArgs(bitmapLayout, rect,
                               BOOST_CURRENT_FUNCTION,
commit 24ef62fcd40505f2c9d294b0ee60e59277718dea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:13:41 2014 +0100

    coverity#1210087 Uncaught exception
    
    Change-Id: Iedd8376ac8c28f8af34bb7817f101b43d526be10

diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 3c02186..7c4ab6a 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -90,7 +90,7 @@ namespace canvas
         }
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-                                                                               const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+                                                                               const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             tools::verifyArgs(pos,
                               BOOST_CURRENT_FUNCTION,
commit ee56bc89b42300e785d69e27bfbf7fa77686e670
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:13:06 2014 +0100

    coverity#1210088 Uncaught exception
    
    Change-Id: If501c455a168c9f1e8721e87efd25f2dbaad756e

diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 6b24afe..3c02186 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -74,7 +74,7 @@ namespace canvas
 
         virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&      color,
                                         const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
-                                        const ::com::sun::star::geometry::IntegerPoint2D&       pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+                                        const ::com::sun::star::geometry::IntegerPoint2D&       pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             tools::verifyArgs(bitmapLayout, pos,
                               BOOST_CURRENT_FUNCTION,
commit 27410e5cb51c27e683d2a9f04d4ad33fa6de8b1e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:12:01 2014 +0100

    coverity#1210089 Uncaught exception
    
    Change-Id: I1ab008b814146d79cdab136a5d1fdeeb670c086c

diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 4a3944b..faf98ec 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -122,7 +122,7 @@ namespace canvas
         }
 
         // XCanvas
-        virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+        virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
         {
             MutexType aGuard( BaseType::m_aMutex );
 
commit 9331f7bcc75267ad99bf1b558ce8f859ef803908
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:06:11 2014 +0100

    coverity#1210119 Uncaught exception
    
    Change-Id: Ibbf45bb58a0e5c4bea1b3432bee104c8d5aea3f2

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index d9e4589..54caa33 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -746,7 +746,7 @@ public:
 protected:
     // overide these for special property handling in subcasses. Return true if property is handled
     virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual ~Svx3DSphereObject() throw();
 
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 88a5e74..325c074 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -667,7 +667,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
 
 
 
-bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
commit de1f7e367f4828b7de32d512e469e01935c92739
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:05:07 2014 +0100

    coverity#1210120 Uncaught exception
    
    Change-Id: I08645981a8d4d54fb6eb90489739204c4e34f883

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index b4afd58..d9e4589 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -782,7 +782,7 @@ public:
 protected:
     // overide these for special property handling in subcasses. Return true if property is handled
     virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual ~Svx3DExtrudeObject() throw();
 
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 20a9dfa..88a5e74 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -981,7 +981,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
 
 
 
-bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
commit 2d32d56243c880032feb3c9c7fed6e621557b498
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 21:03:53 2014 +0100

    coverity#1210121 Uncaught exception
    
    Change-Id: Ib64ba845f2f59b7db95f43acd14c45a139c17899

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 92106f9..b4afd58 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -798,7 +798,7 @@ class Svx3DPolygonObject : public SvxShape
 protected:
     // overide these for special property handling in subcasses. Return true if property is handled
     virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 public:
     Svx3DPolygonObject( SdrObject* pObj ) throw();
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 8a5d59a..20a9dfa 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -1129,7 +1129,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
 }
 
 
-bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
commit 4d82d12fd5f42d72844a403ba486e2a696ef00f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 20:56:49 2014 +0100

    coverity#1210130 Uncaught exception
    
    Change-Id: I6f4523a70caac6f3d43a11df78b58575b7c7a720

diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index d9a5d7a..3f54110 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -109,7 +109,7 @@ class SvxTableShape : public SvxShape
 protected:
     // overide these for special property handling in subcasses. Return true if property is handled
     virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual void lock() SAL_OVERRIDE;
     virtual void unlock() SAL_OVERRIDE;
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index f93464c..b5c0c22 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -107,7 +107,7 @@ bool SvxTableShape::getPropertyValueImpl(
     const OUString& rName,
     const SfxItemPropertySimpleEntry* pProperty,
     ::com::sun::star::uno::Any& rValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
commit a464e4cf4b64c6ac870b7c07aab87d5af97a08da
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 20:49:22 2014 +0100

    coverity#1210166 Uninitialized pointer field
    
    Change-Id: I8a37c86982bb5cfe707e9141def2a8c790c8403b

diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index 2dd41d1..aead0c1e 100644
--- a/sw/source/core/uibase/inc/glossary.hxx
+++ b/sw/source/core/uibase/inc/glossary.hxx
@@ -97,7 +97,6 @@ class SwGlossaryDlg : public SvxStandardDialog
     CheckBox*       m_pNetRelCB;
     Window*         m_pExampleWIN;
     PushButton*     m_pInsertBtn;
-    CloseButton*    m_pCloseBtn;
     MenuButton*     m_pEditBtn;
     PushButton*     m_pBibBtn;
     PushButton*     m_pPathBtn;
commit c625058886f6aec0bff2df29647688c213d57877
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 20:48:26 2014 +0100

    coverity#1210167 Uninitialized scalar field
    
    Change-Id: Ibc314d95e2b673995a4c089f6e132a43c3706e9b

diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 810e10a..1aedb15 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -126,8 +126,15 @@ namespace pdfi
     struct GraphicalElement : public Element
     {
     protected:
-        GraphicalElement( Element* pParent, sal_Int32 nGCId )
-        : Element( pParent ), GCId( nGCId ), MirrorVertical( false ), IsForText (false) {}
+        GraphicalElement(Element* pParent, sal_Int32 nGCId)
+            : Element(pParent)
+            , GCId(nGCId)
+            , MirrorVertical(false)
+            , IsForText(false)
+            , FontSize(0.0)
+            , TextStyleId(0)
+        {
+        }
 
     public:
         sal_Int32 GCId;


More information about the Libreoffice-commits mailing list