[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/source

Stephan Bergmann sbergman at redhat.com
Wed Oct 22 01:59:06 PDT 2014


 formula/source/core/api/token.cxx |    5 -----
 include/formula/token.hxx         |    1 -
 sc/inc/token.hxx                  |    1 -
 sc/source/core/tool/token.cxx     |   23 -----------------------
 4 files changed, 30 deletions(-)

New commits:
commit d9f303a030f35404b31654bcf7caa4cca5532165
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 22 10:58:21 2014 +0200

    Remove unused FormulaToken::Is3DRef
    
    Change-Id: Ib720bc4b3bfff8e428d14d65ff73144db82c60e0

diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 95a3f24..5ce44e8 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -74,11 +74,6 @@ FormulaToken::~FormulaToken()
 {
 }
 
-bool FormulaToken::Is3DRef() const
-{
-    return false;
-}
-
 bool FormulaToken::IsFunction() const
 {
     return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName &&
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 2efba0d..e3f6a26 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -156,7 +156,6 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaToken(*this); }
 
-    virtual bool                Is3DRef() const;    // reference with 3D flag set
     virtual bool                TextEqual( const formula::FormulaToken& rToken ) const;
     virtual bool                operator==( const FormulaToken& rToken ) const;
 
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 655c687..27c879a 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -89,7 +89,6 @@ public:
     virtual       ScRefList*    GetRefList();
 
     virtual bool                TextEqual( const formula::FormulaToken& rToken ) const SAL_OVERRIDE;
-    virtual bool                Is3DRef() const SAL_OVERRIDE;    // reference with 3D flag set
 
 #if DEBUG_FORMULA_COMPILER
     virtual void Dump() const;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index cb36699..dc1222e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -510,29 +510,6 @@ bool ScToken::TextEqual( const FormulaToken& _rToken ) const
         return *this == _rToken;     // else normal operator==
 }
 
-bool ScToken::Is3DRef() const
-{
-    switch ( eType )
-    {
-        case svDoubleRef :
-            if ( GetSingleRef2().IsFlag3D() )
-                return true;
-        //! fallthru
-        case svSingleRef :
-            if ( GetSingleRef().IsFlag3D() )
-                return true;
-            break;
-        case svExternalSingleRef:
-        case svExternalDoubleRef:
-            return true;
-        default:
-        {
-            // added to avoid warnings
-        }
-    }
-    return false;
-}
-
 #if DEBUG_FORMULA_COMPILER
 void ScToken::Dump() const
 {


More information about the Libreoffice-commits mailing list