[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cppuhelper/source starmath/inc sw/source

[Don Lewis]

 cppuhelper/source/exc_thrower.cxx |    2 +-
 starmath/inc/smcommands.h         |    2 +-
 sw/source/core/inc/txtfrm.hxx     |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1adcdc2d7895f8e873f6fbd1530b65ff1156e3f5
Author: Don Lewis <truckman at apache.org>
Date:   Wed Aug 31 16:00:16 2016 +0000

    Get rid of the inline version of FindFtnRef() that just calls itself,
    
    which causes infinite recursion.  Callers should just use the external
    method.

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 4c84cff..d0a0f4b 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -432,8 +432,6 @@ public:
                     const xub_StrLen nLen = STRING_LEN );
     inline SwTwips GetFtnFrmHeight() const;
     SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn );
-    inline const SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ) const
-    { return FindFtnRef( pFtn ); }
     void ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine );
 
     // Wenn wir eine Ftn sind, die auf ihre Referenz zu waechst...
commit b21a60bf36456a800fb862c4302480c82e639f7e
Author: Don Lewis <truckman at apache.org>
Date:   Wed Aug 31 15:51:05 2016 +0000

    Fix a typo on a header guard.
    
    The other instances of the -Wheader-guard warning are in ext_sources code.

diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
index c742f58..0019542 100644
--- a/starmath/inc/smcommands.h
+++ b/starmath/inc/smcommands.h
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-#ifndef SM_SNCOMMANDS_HRC
+#ifndef SM_SMCOMMANDS_HRC
 #define SM_SMCOMMANDS_HRC
 
 #define CMD_SID_ADJUST                              ".uno:Adjust"
commit 92afbd9a164db8616dce4b8947b8f37fc96d4d43
Author: Don Lewis <truckman at apache.org>
Date:   Wed Aug 31 15:48:05 2016 +0000

    In ExceptionThrower::throwException(), call ::cppu::throwException()
    
    instead of recursing infinitely.

diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 01908aa..c295ec5 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -166,7 +166,7 @@ void ExceptionThrower::release() throw ()
 void ExceptionThrower::throwException( Any const & exc ) throw (Exception)
 {
     OSL_ENSURE( 0, "unexpected!" );
-    throwException( exc );
+    ::cppu::throwException( exc );
 }
 
 //______________________________________________________________________________