cppuhelper/source/exc_thrower.cxx | 2 +- sw/source/core/inc/frame.hxx | 2 +- sw/source/core/inc/txtfrm.hxx | 2 +- vcl/osx/a11ytablewrapper.mm | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit c620b70a19c05f2805ede41005dd9215593a912e Author: Stephan Bergmann <[email protected]> Date: Mon Dec 22 11:10:45 2014 +0100 -Werror,-Wshadow Change-Id: I0e9ff9efd685f17e45ada29fc2bd6134229b28c7 diff --git a/vcl/osx/a11ytablewrapper.mm b/vcl/osx/a11ytablewrapper.mm index f772efc..1b24dd8 100644 --- a/vcl/osx/a11ytablewrapper.mm +++ b/vcl/osx/a11ytablewrapper.mm @@ -135,8 +135,6 @@ using namespace ::com::sun::star::uno; NSMutableArray * cells = [ [ NSMutableArray alloc ] init ]; try { - // find out number of rows - sal_Int32 nRows = accessibleTable->getAccessibleRowCount(); for( sal_Int32 n = 0; n < nRows; n++ ) { Reference < XAccessible > rAccessibleCell = accessibleTable -> getAccessibleCellAt ( n, 0 ); commit 7b58b777bd15d5f34375e0325e4838e07f22dedc Author: Stephan Bergmann <[email protected]> Date: Mon Dec 22 11:10:24 2014 +0100 -Werror,-Winfinite-recursion Change-Id: I445302a2f51bbd244fcf7dbf2058efc30ac0b886 diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index a8bae4a..6894905 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -656,7 +656,7 @@ public: SwFrm* GetIndNext() { return ( mpNext || !IsInSct() ) ? mpNext : _GetIndNext(); } - const SwFrm* GetIndNext() const { return static_cast<const SwFrm*>(this)->GetIndNext(); } + const SwFrm* GetIndNext() const { return const_cast<SwFrm*>(this)->GetIndNext(); } sal_uInt16 GetPhyPageNum() const; // page number without offset sal_uInt16 GetVirtPageNum() const; // page number with offset diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 3317c27..b29cb18 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -427,7 +427,7 @@ public: inline SwTwips GetFtnFrmHeight() const; SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ); inline const SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ) const - { return FindFtnRef( pFtn ); } + { return const_cast<SwTxtFrm *>(this)->FindFtnRef( pFtn ); } void ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ); /** commit 9598e9061f76439daa841f991fbec05412826971 Author: Stephan Bergmann <[email protected]> Date: Mon Dec 22 11:09:57 2014 +0100 -Werror,-Winfinite-recursion Change-Id: I483cd3f3a3ba87c416985fd86b9d5b711a2a18fb diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 0b54a78..f5bc1d5 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -157,7 +157,7 @@ void ExceptionThrower::release() throw () void ExceptionThrower::throwException( Any const & exc ) throw (Exception, std::exception) { OSL_FAIL( "unexpected!" ); - throwException( exc ); + cppu::throwException( exc ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
