From baf03104b299fdfb3b9f5bd443fee9d7524c0b52 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 9 Sep 2010 20:11:57 +0200 Subject: sw34bf01: #i114412#: calc.cxx: change signature of Str2Double() for stupid Sun C++ and replace the other delete with an auto_ptr. --- 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 74c785c88e83..4db19fc9a29d 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -230,11 +230,11 @@ public: void SetCalcError( SwCalcError eErr ) { eError = eErr; } BOOL IsCalcError() const { return 0 != eError; } - static BOOL Str2Double( const String& rStr, xub_StrLen& rPos, + static bool Str2Double( const String& rStr, xub_StrLen& rPos, double& rVal, - const LocaleDataWrapper* pData = 0 ); - static BOOL Str2Double( const String& rStr, xub_StrLen& rPos, - double& rVal, SwDoc* pDoc ); + LocaleDataWrapper const*const pData = 0 ); + static bool Str2Double( const String& rStr, xub_StrLen& rPos, + double& rVal, SwDoc *const pDoc ); SW_DLLPUBLIC static BOOL IsValidVarName( const String& rStr, String* pValidName = 0 ); -- cgit