[Libreoffice-commits] core.git: 3 commits - sc/source sw/inc sw/source

[Caolán McNamara]

 sc/source/core/data/dpgroup.cxx    |    2 +-
 sw/inc/unodraw.hxx                 |    3 ++-
 sw/source/core/unocore/unodraw.cxx |    3 ++-
 sw/source/ui/vba/vbaselection.cxx  |    3 ++-
 sw/source/ui/vba/vbaselection.hxx  |    3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 4e3e1420af51f7776dceb6b2800b761e57ddfe63
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 28 16:19:36 2014 +0100

    coverity#1078626 Missing break in switch
    
    Change-Id: I4b9b846049d9802a319b403e1f45734b7bd604f2

diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 6459b72..f2a68f5 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -283,7 +283,7 @@ bool isDateInGroup(const ScDPItemData& rGroupItem, const ScDPItemData& rChildIte
             if (nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS)
                 // months and quarters are both 1-based
                 return (nGroupValue - 1 == (nChildValue - 1) / 3);
-
+            break;
         case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS:
             // a day is only contained in its quarter or month
             if (nGroupPart == com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS ||
commit 1af37550cf48e270a6039eafc752d11da46415fc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 28 16:08:34 2014 +0100

    coverity#738461 Uncaught exception
    
    Change-Id: Iecc2653faae6bebd31909139392586fe66a17cb4

diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index ccbb4de..0360615 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -348,7 +348,8 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
     }
 }
 
-void SwVbaSelection::NextCell( sal_Int32 nCount, word::E_DIRECTION eDirection ) throw ( uno::RuntimeException )
+void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection)
+    throw (css::script::BasicErrorException, uno::RuntimeException)
 {
     uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextTable > xTextTable;
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index abe70b3..9d416a2 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -42,7 +42,8 @@ private:
 
 private:
     void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException);
-    void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection ) throw ( css::uno::RuntimeException );
+    void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection )
+        throw (css::script::BasicErrorException, css::uno::RuntimeException);
     css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
     void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException );
     css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException );
commit 444125a8aa7826f7357451bcd743afaf44b4cff7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 28 15:53:30 2014 +0100

    coverity#707290 Uncaught exception
    
    Change-Id: Ia1d09b753270cca82cadf8779abec44c8a0180b1

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 0ef486d..04dceff 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -46,7 +46,8 @@ protected:
 
     // Create a SdrObject according to a description. Can be used by derived classes to
     // support own ::com::sun::star::drawing::Shapes (e.g. controls).
-    virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) throw (std::exception) SAL_OVERRIDE;
+    virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 public:
     SwFmDrawPage( SdrPage* pPage );
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index c020b0f..7c49f44 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -291,7 +291,8 @@ uno::Reference< uno::XInterface >   SwFmDrawPage::GetInterface( SdrObject* pObj
     return xShape;
 }
 
-SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) throw (std::exception)
+SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape )
+    throw (uno::RuntimeException, std::exception)
 {
     //TODO: stimmt das so - kann die Methode weg?
     return SvxFmDrawPage::_CreateSdrObject( xShape );