Make these methods non-inline again.

Change-Id: I30c7969ab386f4cba2f0b44cbebe306ce6430b15

2 files changed, 47 insertions, 8 deletions

diff --git a/formula/source/core/api/vectortoken.cxx b/formula/source/core/api/vectortoken.cxx
index 4cf764faf9e2..b0077aa83b45 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -36,6 +36,10 @@ VectorRefArray::VectorRefArray( const double* pNumArray, rtl_uString** pStrArray
     mpStringArray(pStrArray),
     mbValid(true) {}
 
+bool VectorRefArray::isValid() const
+{
+    return mbValid;
+}
 
 SingleVectorRefToken::SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ) :
     FormulaToken(svSingleVectorRef, ocPush), maArray(rArray), mnRequestedLength(nReqLength), mnArrayLength(nArrayLength) {}
@@ -45,6 +49,16 @@ FormulaToken* SingleVectorRefToken::Clone() const
     return new SingleVectorRefToken(maArray, mnRequestedLength, mnArrayLength);
 }
 
+const VectorRefArray& SingleVectorRefToken::GetArray() const
+{
+    return maArray;
+}
+
+size_t SingleVectorRefToken::GetArrayLength() const
+{
+    return mnArrayLength;
+}
+
 DoubleVectorRefToken::DoubleVectorRefToken(
     const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength,
     size_t nRefRowSize, bool bStartFixed, bool bEndFixed ) :
@@ -58,6 +72,31 @@ FormulaToken* DoubleVectorRefToken::Clone() const
         maArrays, mnRequestedLength, mnArrayLength, mnRefRowSize, mbStartFixed, mbEndFixed);
 }
 
+const std::vector<VectorRefArray>& DoubleVectorRefToken::GetArrays() const
+{
+    return maArrays;
+}
+
+size_t DoubleVectorRefToken::GetArrayLength() const
+{
+    return mnArrayLength;
+}
+
+size_t DoubleVectorRefToken::GetRefRowSize() const
+{
+    return mnRefRowSize;
+}
+
+bool DoubleVectorRefToken::IsStartFixed() const
+{
+    return mbStartFixed;
+}
+
+bool DoubleVectorRefToken::IsEndFixed() const
+{
+    return mbEndFixed;
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 7f015b76d064..b1853ea7316d 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -47,7 +47,7 @@ struct FORMULA_DLLPUBLIC VectorRefArray
     VectorRefArray( rtl_uString** pArray );
     VectorRefArray( const double* pNumArray, rtl_uString** pStrArray );
 
-    bool isValid() const { return mbValid;}
+    bool isValid() const;
 };
 
 /**
@@ -65,8 +65,8 @@ public:
 
     virtual FormulaToken* Clone() const SAL_OVERRIDE;
 
-    inline const VectorRefArray& GetArray() const { return maArray; }
-    inline size_t GetArrayLength() const { return mnArrayLength; }
+    const VectorRefArray& GetArray() const;
+    size_t GetArrayLength() const;
 };
 
 /**
@@ -93,11 +93,11 @@ public:
 
     virtual FormulaToken* Clone() const SAL_OVERRIDE;
 
-    inline const std::vector<VectorRefArray>& GetArrays() const { return maArrays; }
-    inline size_t GetArrayLength() const { return mnArrayLength; }
-    inline size_t GetRefRowSize() const { return mnRefRowSize; }
-    inline bool IsStartFixed() const { return mbStartFixed; }
-    inline bool IsEndFixed() const { return mbEndFixed; }
+    const std::vector<VectorRefArray>& GetArrays() const;
+    size_t GetArrayLength() const;
+    size_t GetRefRowSize() const;
+    bool IsStartFixed() const;
+    bool IsEndFixed() const;
 };
 
 }