diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-01 13:39:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-01 14:19:25 +0100 |
| commit | d05a9ae25e4a397834330d868b68d92ca919e33b (patch) | |
| tree | 3a9702d4c56ef0bd995f97dc3cfb382953d1f6d3 /sw/inc | |
| parent | 2655ef2d03b786b683723e92f3c76838fa012ab6 (diff) | |
Related: fdo#38838 remove UniString::AssignAscii
Change-Id: I263ef2594080ff7d47d5499c2b62e60e1689d2d6
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/calc.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 4b98c2dc67dd..4051e657b899 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -138,9 +138,9 @@ public: ******************************************************************************/ struct SwHash { - SwHash( const String& rStr ); + SwHash( const OUString& rStr ); virtual ~SwHash(); - String aStr; + OUString aStr; SwHash *pNext; }; @@ -149,18 +149,18 @@ struct SwCalcExp : public SwHash SwSbxValue nValue; const SwFieldType* pFldType; - SwCalcExp( const String& rStr, const SwSbxValue& rVal, + SwCalcExp( const OUString& rStr, const SwSbxValue& rVal, const SwFieldType* pFldType = 0 ); }; -SwHash* Find( const String& rSrch, SwHash** ppTable, +SwHash* Find( const OUString& rSrch, SwHash** ppTable, sal_uInt16 nTblSize, sal_uInt16* pPos = 0 ); void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize ); // if _CalcOp != 0, this is a valid operator struct _CalcOp; -_CalcOp* FindOperator( const String& rSearch ); +_CalcOp* FindOperator( const OUString& rSearch ); /****************************************************************************** * class SwCalc |