diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-11 10:57:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:40 +0200 |
| commit | f94b7f6507820fe0b57336338f8fb84f4c33bf83 (patch) | |
| tree | b3eae9bc22ef6cdd39342e02c7443e881bc22f27 /sw/inc/calc.hxx | |
| parent | 9eace9e083ea3114c6404b14fa779c67d4efbc3d (diff) | |
convert sw/inc/calc.hxx from String to OUString
Change-Id: Ifff5ef5243b54905cf6d03ea675f3a7f23c84c85
Diffstat (limited to 'sw/inc/calc.hxx')
| -rw-r--r-- | sw/inc/calc.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 417d1b94cbfe..fa3d0fffbe1c 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -168,7 +168,7 @@ _CalcOp* FindOperator( const OUString& rSearch ); class SwCalc { SwHash* VarTable[ TBLSZ ]; - String aVarName, sCurrSym; + OUString aVarName, sCurrSym; OUString sCommand; std::vector<const SwUserFieldType*> aRekurStk; SwSbxValue nLastLeft; @@ -194,8 +194,8 @@ class SwCalc sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); - String GetColumnName( const String& rName ); - String GetDBName( const String& rName ); + OUString GetColumnName( const OUString& rName ); + OUString GetDBName( const OUString& rName ); // dont call this methods SwCalc( const SwCalc& ); @@ -205,14 +205,14 @@ public: SwCalc( SwDoc& rD ); ~SwCalc(); - SwSbxValue Calculate( const String &rStr ); - String GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True ); - String GetStrResult( double, sal_Bool bRound = sal_True ); + SwSbxValue Calculate( const OUString &rStr ); + OUString GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True ); + OUString GetStrResult( double, sal_Bool bRound = sal_True ); - SwCalcExp* VarInsert( const String& r ); - SwCalcExp* VarLook( const String &rStr, sal_uInt16 ins = 0 ); - void VarChange( const String& rStr, const SwSbxValue& rValue ); - void VarChange( const String& rStr, double ); + SwCalcExp* VarInsert( const OUString& r ); + SwCalcExp* VarLook( const OUString &rStr, sal_uInt16 ins = 0 ); + void VarChange( const OUString& rStr, const SwSbxValue& rValue ); + void VarChange( const OUString& rStr, double ); SwHash** GetVarTable() { return VarTable; } bool Push(const SwUserFieldType* pUserFieldType); |