[Libreoffice-commits] core.git: include/tools

Noel Grandin noel at peralex.com
Tue Jul 22 07:20:16 PDT 2014


 include/tools/ref.hxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 3f8a921471d8ed5423fb572a076d882392c77dba
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jul 10 16:23:59 2014 +0200

    remove dead code
    
    Change-Id: I0d3d1a14d8eb880a5a054fe2e736f8ac97f8b727
    Reviewed-on: https://gerrit.libreoffice.org/10284
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 1d5a37a..98740f0 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -229,17 +229,14 @@ public:                                                             \
     inline               ClassName##WeakRef( ) {}                   \
     inline               ClassName##WeakRef( ClassName* pObj ) {    \
         if( pObj ) _xHdl = pObj->GetHdl(); }                        \
-    inline void          Clear() { _xHdl.Clear(); }                 \
     inline ClassName##WeakRef& operator = ( ClassName * pObj ) {    \
         _xHdl = pObj ? pObj->GetHdl() : 0; return *this; }          \
     inline bool            Is() const {                         \
         return _xHdl.Is() && _xHdl->GetObj(); }                     \
-    inline ClassName *     operator &  () const {                   \
-        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
     inline ClassName *     operator -> () const {                   \
         return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
-    inline ClassName &     operator *  () const {                   \
-        return *(ClassName*) _xHdl->GetObj(); }                     \
+    inline ClassName *     operator &  () const {                   \
+        return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \
     inline operator ClassName * () const {                          \
         return (ClassName*) (_xHdl.Is() ? _xHdl->GetObj() : 0 ); }  \
 };


More information about the Libreoffice-commits mailing list