chart2/source/model/main/ChartModel.cxx | 3 - connectivity/source/drivers/odbc/OStatement.cxx | 4 -- connectivity/source/inc/odbc/OStatement.hxx | 2 - include/vbahelper/vbashapes.hxx | 3 + include/vcl/toolbox.hxx | 2 - oovbaapi/ooo/vba/word/XSelection.idl | 8 ++-- pyuno/source/module/pyuno_runtime.cxx | 2 - sc/source/filter/oox/excelfilter.cxx | 42 ++++++++++++------------ sc/source/ui/vba/vbaworksheets.cxx | 3 + sc/source/ui/vba/vbaworksheets.hxx | 4 +- sfx2/source/appl/app.cxx | 4 ++ sfx2/source/appl/appserv.cxx | 3 + sw/source/ui/vba/vbarange.cxx | 6 +-- sw/source/ui/vba/vbarange.hxx | 6 +-- sw/source/ui/vba/vbaselection.cxx | 8 ++-- sw/source/ui/vba/vbaselection.hxx | 8 ++-- sw/source/ui/vba/vbastyles.cxx | 2 - sw/source/ui/vba/vbastyles.hxx | 4 +- unoidl/source/unoidl-check.cxx | 1 unoidl/source/unoidl-read.cxx | 1 vbahelper/source/vbahelper/vbashapes.cxx | 3 + vcl/generic/fontmanager/parseAFM.cxx | 8 ++-- vcl/source/outdev/outdev.cxx | 1 vcl/source/window/toolbox.cxx | 15 ++++++++ 24 files changed, 85 insertions(+), 58 deletions(-)
New commits: commit 8e0520acc72f45dbd35700dd129fe3e2dd1b6fd3 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 13:21:42 2014 +0100 setting WB_SCROLL on a toolbar only works from ctor Change-Id: Iafd4d132abb63d698f8907c4aa71bd09c35babde diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 9a8f7e2..f3328e4 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -480,7 +480,7 @@ public: void SetFloatingLines( sal_uInt16 nFloatLines ); sal_uInt16 GetFloatingLines() const; - void SetStyle( WinBits nNewStyle ) { mnWinStyle = nNewStyle; } + void SetStyle( WinBits nNewStyle ); WinBits GetStyle() const { return mnWinStyle; } // enable/disable undocking diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5149136..1517c15 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4470,6 +4470,21 @@ bool ToolBox::PrepareToggleFloatingMode() return DockingWindow::PrepareToggleFloatingMode(); } +void ToolBox::SetStyle(WinBits nNewStyle) +{ + mnWinStyle = nNewStyle; + if (!ImplIsFloatingMode()) + { + bool bOldScroll = mbScroll; + mbScroll = (mnWinStyle & WB_SCROLL) ? true : false; + if (mbScroll != bOldScroll) + { + mbFormat = true; + ImplFormat(); + } + } +} + void ToolBox::ToggleFloatingMode() { DockingWindow::ToggleFloatingMode(); commit afbc907de41f30988fed69c7e8eada9bfd43aef4 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:31:03 2014 +0100 coverity#737268 Uncaught exception Change-Id: Ia3cf5588892aba017991024e7890006828bf7b29 diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 60c0318..d577e53 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -99,33 +99,33 @@ bool ExcelFilter::importDocument() throw() if( aWorkbookPath.isEmpty() ) return false; - /* Construct the WorkbookGlobals object referred to by every instance of - the class WorkbookHelper, and execute the import filter by constructing - an instance of WorkbookFragment and loading the file. */ - WorkbookGlobalsRef xBookGlob; try { - xBookGlob = WorkbookHelper::constructGlobals( *this ); + /* Construct the WorkbookGlobals object referred to by every instance of + the class WorkbookHelper, and execute the import filter by constructing + an instance of WorkbookFragment and loading the file. */ + WorkbookGlobalsRef xBookGlob(WorkbookHelper::constructGlobals(*this)); + if (xBookGlob.get() && importFragment(new WorkbookFragment(*xBookGlob, aWorkbookPath))) + { + try + { + importDocumentProperties(); + } + catch( const Exception& e ) + { + SAL_WARN("sc", "exception when importing document properties " << e.Message); + } + catch( ... ) + { + SAL_WARN("sc", "exception when importing document properties"); + } + return true; + } } catch (...) { } - if ( xBookGlob.get() && importFragment( new WorkbookFragment( *xBookGlob, aWorkbookPath ) ) ) - { - try - { - importDocumentProperties(); - } - catch( const Exception& e ) - { - SAL_WARN("sc", "exception when importing document properties " << e.Message); - } - catch( ... ) - { - SAL_WARN("sc", "exception when importing document properties"); - } - return true; - } + return false; } commit 52153a08a5b1a4be88198d777ec293d394aeeb0e Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:18:05 2014 +0100 coverity#1224989 Uncaught exception and coverity#1224990 Uncaught exception coverity#1224991 Uncaught exception Change-Id: I10c1d5a5d8a2f3e3f12699d1f2bec9febe3df126 diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index fca5ae1..6bc033e 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -43,18 +43,18 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) { uno::Reference< text::XTextRange > xEnd; initialize( rStart, xEnd ); } -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) { initialize( rStart, rEnd ); } -SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, bool _bMaySpanEndOfDocument ) throw (uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument ) { initialize( rStart, rEnd ); } diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index a81f7ae..59bbad2 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -44,9 +44,9 @@ private: void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException); void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException ); public: - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException); - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException); - SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, bool _bMaySpanEndOfDocument = false ) throw (css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ~SwVbaRange(); css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; } commit 6b9cc44922ed9527dde9a54544173bf581942b6f Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:14:25 2014 +0100 coverity#1224987 Uncaught exception and coverity#1224988 Uncaught exception Change-Id: Idba0a2d289f00c8629be59b990a121044a099aa1 diff --git a/oovbaapi/ooo/vba/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl index 81ae13a5..21234d5 100644 --- a/oovbaapi/ooo/vba/word/XSelection.idl +++ b/oovbaapi/ooo/vba/word/XSelection.idl @@ -54,8 +54,8 @@ interface XSelection void Delete( [in] any Unit, [in] any Count ); void MoveRight( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); - void MoveDown( [in] any Unit, [in] any Count, [in] any Extend ); - void MoveUp( [in] any Unit, [in] any Count, [in] any Extend ); + void MoveDown( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); + void MoveUp( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); void TypeParagraph(); void InsertParagraph(); void InsertParagraphBefore(); diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index bf2afec..0cd1cef 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -420,7 +420,7 @@ SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const u } void SAL_CALL -SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) +SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nCount = 1; if( _count.hasValue() ) @@ -439,7 +439,7 @@ SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const u } void SAL_CALL -SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nCount = 1; @@ -459,7 +459,7 @@ SwVbaSelection::MoveDown( const uno::Any& _unit, const uno::Any& _count, const u } void SAL_CALL -SwVbaSelection::MoveUp( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nCount = 1; diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index af08e1e..14cf630 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -64,8 +64,8 @@ public: virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; commit e0ec561059feced3bf61324cd688c1cbaac9629b Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:10:28 2014 +0100 coverity#707480 Uncaught exception Change-Id: I27732316c42face6750ffb7eccc238f66519e4e6 diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 5c6800f..e67a18d 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -66,7 +66,8 @@ public: virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2) + throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; }; #endif // INCLUDED_VBAHELPER_VBASHAPES_HXX diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 200fdeb..e23dd07 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -166,7 +166,8 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti } uno::Any SAL_CALL -ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException) +ScVbaShapes::Item(const uno::Any& Index, const uno::Any& Index2) + throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { // I don't think we need to support Array of indices for shapes /* commit d16cc33b491c9424ee825b1ca36f0dbd8bce16aa Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:08:08 2014 +0100 coverity#707407 Uncaught exception Change-Id: Ib77be2231878dcb89524e6a5c5c4f1fe30e4e7d8 diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 66cd12c..b413b1c 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -294,7 +294,7 @@ SwVbaStyles::createEnumeration() throw (uno::RuntimeException) uno::Any SAL_CALL SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) - throw (script::BasicErrorException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { //handle WdBuiltinStyle sal_Int32 nIndex = 0; diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 8b1ebc3..78b85ab 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -31,7 +31,9 @@ public: SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& Index2) + throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, + css::uno::RuntimeException) SAL_OVERRIDE; // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; commit 160c41759e4b7c3b4cd609ff10d882a5e0ff9c4e Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 12:04:51 2014 +0100 coverity#707401 Uncaught exception and coverity#707404 Uncaught exception Change-Id: I710963e601121d736ecd55c9dd8f9ec0a17ed815 diff --git a/oovbaapi/ooo/vba/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl index 3706acb..81ae13a5 100644 --- a/oovbaapi/ooo/vba/word/XSelection.idl +++ b/oovbaapi/ooo/vba/word/XSelection.idl @@ -52,8 +52,8 @@ interface XSelection void HomeKey( [in] any Unit, [in] any Extend ); void EndKey( [in] any Unit, [in] any Extend ); void Delete( [in] any Unit, [in] any Count ); - void MoveRight( [in] any Unit, [in] any Count, [in] any Extend ); - void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend ); + void MoveRight( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); + void MoveLeft( [in] any Unit, [in] any Count, [in] any Extend ) raises (com::sun::star::script::BasicErrorException); void MoveDown( [in] any Unit, [in] any Count, [in] any Extend ); void MoveUp( [in] any Unit, [in] any Count, [in] any Extend ); void TypeParagraph(); diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index c3b2e20..92ec4b2 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -62,8 +62,8 @@ public: virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaWorksheets_BASE - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw -(css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) + throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 9f855ae..bf2afec 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -400,7 +400,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection) } void SAL_CALL -SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nCount = 1; @@ -420,7 +420,7 @@ SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const } void SAL_CALL -SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception ) +SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { sal_Int32 nCount = 1; if( _count.hasValue() ) diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index daccd7c..af08e1e 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -62,8 +62,8 @@ public: virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; commit 0df43cc217b6382000a109f86e706b139a8e5c29 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:56:06 2014 +0100 coverity#982756 Dereference null return value Change-Id: I5bfb5c86093aca4b88b2abf39836a1c6d7cb0bea diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index cb2ba90..0f16d99 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -495,7 +495,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const if( com::sun::star::uno::TypeClass_EXCEPTION == a.getValueTypeClass() ) { // add the message in a standard python way ! - PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE ); + PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL ); // assuming that the Message is always the first member, wuuuu void *pData = (void*)a.getValue(); commit 462f7e43a059c10e431e66d8237ab1279620f685 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:53:51 2014 +0100 coverity#1224984 Dereference before null check Change-Id: I05d54983d6231ec0b4293df51c7d55570d10cee7 diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index d765e95..3d47c77 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1427,8 +1427,7 @@ void ChartModel::update() mpChartView->setViewDirty(); mpChartView->update(); - if(mpChartView) - mpChartView->updateOpenGLWindow(); + mpChartView->updateOpenGLWindow(); } } // namespace chart commit e38307c4c0b16c733d52f5b6b8ff68136234c0cc Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:49:41 2014 +0100 coverity#708898 Unused pointer value Change-Id: I2097507b223d45c880c25d51c47f1d347055db40 diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index 4e34697..4219615 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -611,7 +611,7 @@ static int parseCharWidths( FileInputStream* fp, int* cwi) break; case XYWIDTH: /* PROBLEM: Should be no Y-WIDTH when doing "quick & dirty" */ - token(fp,tokenlen); keyword = token(fp,tokenlen); /* eat values */ + token(fp,tokenlen); token(fp,tokenlen); /* eat values */ error = parseError; break; case CODEHEX: @@ -637,11 +637,11 @@ static int parseCharWidths( FileInputStream* fp, int* cwi) token(fp,tokenlen); break; case CHARBBOX: - token(fp,tokenlen); keyword = token(fp,tokenlen); - token(fp,tokenlen); keyword = token(fp,tokenlen); + token(fp,tokenlen); token(fp,tokenlen); + token(fp,tokenlen); token(fp,tokenlen); break; case LIGATURE: - token(fp,tokenlen); keyword = token(fp,tokenlen); + token(fp,tokenlen); token(fp,tokenlen); break; case VVECTOR: token(fp,tokenlen); /*eat token*/ commit b2273b106384fbf22d35c70c50845f6126805443 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:47:09 2014 +0100 coverity#707059 Uncaught exception Change-Id: If5d009647f3475d0c3ecf0ef621c92eff40a11dc diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 38b944b..a59b8c8 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -434,7 +434,8 @@ ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (cs //ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException) +ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) + throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) { if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) { commit 31a1eb48247e2e0f79c8ba34058eed04e04af336 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:45:19 2014 +0100 coverity#706372 Uncaught exception Change-Id: If3b3395bbe44720540e9619bba6088c6cd29ed37 diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 2855ddf..4870337 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -256,9 +256,7 @@ SQLLEN OStatement_Base::getRowCount() // If the given SQL statement contains a 'FOR UPDATE' clause, change // the concurrency to lock so that the row can then be updated. Returns // true if the concurrency has been changed - - -bool OStatement_Base::lockIfNecessary (const OUString& sql) throw( SQLException) +bool OStatement_Base::lockIfNecessary (const OUString& sql) throw (SQLException, RuntimeException) { bool rc = false; diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 16b9317..9c2ecfd 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -107,7 +107,7 @@ namespace connectivity void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); - bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); + bool lockIfNecessary (const OUString& sql) throw (css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getColumnCount() throw (css::sdbc::SQLException, css::uno::RuntimeException); commit 5fb8f03be61add8320045471edc55ce3f7c4fa8d Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:43:10 2014 +0100 coverity#1224981 Dereference null return value Change-Id: I1623f7d61e849a59c8f23f2df18827df4a9c25c0 diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 635c937..e30cd78 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -609,7 +609,6 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!"); - if (!pSymbol) return; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index bb71221..f3aaed6 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -858,6 +858,9 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose // get symbol OUString aSymbol( "basicide_choose_macro" ); basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); + SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!"); + if (!pSymbol) + return OUString(); #else #define pSymbol basicide_choose_macro #endif commit c6fc2647c8df5b9a7c41a192f2b78812d1f3656d Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:41:42 2014 +0100 coverity#1132691 Dereference null return value Change-Id: I0da2f6956cf7675cce0d7d82a0ec797b50542c7f diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index da43bfa..635c937 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -608,6 +608,11 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); + SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!"); + + if (!pSymbol) + return; + // call basicide_macro_organizer in basctl pSymbol( nTabId ); commit 73a8c2d6efa05f5c8ee44ff9468f00aed056aac2 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:38:28 2014 +0100 coverity#1224979 Missing break in switch Change-Id: I539ba11497a8c7384b5ca8ee4792548dca139811 diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx index ea995d6..113acee 100644 --- a/unoidl/source/unoidl-read.cxx +++ b/unoidl/source/unoidl-read.cxx @@ -610,6 +610,7 @@ void writeEntity( switch (ent->getSort()) { case unoidl::Entity::SORT_MODULE: assert(false && "this cannot happen"); + //deliberate fall-through anyway case unoidl::Entity::SORT_ENUM_TYPE: { rtl::Reference<unoidl::EnumTypeEntity> ent2( commit 1d088b04027ec4d0058c89203350bdca6d28cc3f Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:37:40 2014 +0100 coverity#1224980 Missing break in switch Change-Id: I17379f596fd8b48bd1015538eacc5265cfa83a82 diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx index 3cf9bcc..137d950 100644 --- a/unoidl/source/unoidl-check.cxx +++ b/unoidl/source/unoidl-check.cxx @@ -194,6 +194,7 @@ void checkMap( switch (entA->getSort()) { case unoidl::Entity::SORT_MODULE: assert(false && "this cannot happen"); + //deliberate fall-through anyway case unoidl::Entity::SORT_ENUM_TYPE: { rtl::Reference<unoidl::EnumTypeEntity> ent2A( commit 07dcd679ff58d2f3ab991b5e3e66a2046a8dfde6 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 10 11:36:05 2014 +0100 coverity#1225002 Uninitialized scalar field Change-Id: Iec71c9b509b785a6fe043c62e103cb4a930fd416 diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 7be114a..a104609 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -148,6 +148,7 @@ OutputDevice::OutputDevice() : mbKerning = false; mbNewFont = true; mbTextLines = false; + mbTextBackground = false; mbTextSpecial = false; mbRefPoint = false; mbEnableRTL = false; // mirroring must be explicitly allowed (typically for windows only)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits