From 7a2206ce0d78a26acff3d60b471cfcc93e827559 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 25 Jun 2012 16:24:29 +0200
Subject: Convert Svptrarr to std::vector<const SwUserFieldType*>

Also convert method return type from sal_Bool to bool

Change-Id: I259e99709297d4c3b9b74643920e2afefa469a93
---
 sw/inc/calc.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sw/inc/calc.hxx')

diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 69ab36a84e38..191480c49411 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -28,7 +28,6 @@
 #ifndef _CALC_HXX
 #define _CALC_HXX
 
-#include <svl/svarray.hxx>
 #include <unotools/syslocale.hxx>
 
 #ifndef __SBX_SBXVALUE //autogen
@@ -40,6 +39,7 @@ class CharClass;
 class LocaleDataWrapper;
 class SwFieldType;
 class SwDoc;
+class SwUserFieldType;
 
 #define TBLSZ 47                // should be a prime, because of hash table
 
@@ -176,7 +176,7 @@ class SwCalc
     SwHash*     VarTable[ TBLSZ ];
     String      aVarName, sCurrSym;
     String      sCommand;
-    SvPtrarr    aRekurStk;
+    std::vector<const SwUserFieldType*> aRekurStk;
     SwSbxValue  nLastLeft;
     SwSbxValue  nNumberValue;
     SwCalcExp   aErrExpr;
@@ -221,8 +221,8 @@ public:
     void        VarChange( const String& rStr, double );
     SwHash**    GetVarTable()                       { return VarTable; }
 
-    sal_Bool        Push( const VoidPtr pPtr );
-    void        Pop( const VoidPtr pPtr );
+    bool        Push(const SwUserFieldType* pUserFieldType);
+    void        Pop();
 
     void        SetCalcError( SwCalcError eErr )    { eError = eErr; }
     sal_Bool        IsCalcError() const                 { return 0 != eError; }
-- 
cgit