From c32e596e2457847afdac7b3162b19ad052d4da7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 11 Aug 2011 10:51:57 +0100 Subject: [PATCH] remove deprecated ByteString::ToInt64, which is a busted 32bit atoi anyway --- automation/source/testtool/tcommuni.cxx | 4 ++-- tools/inc/tools/string.hxx | 1 - tools/source/string/tstring.cxx | 9 --------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx index c726d5193640..32b97075f77c 100644 --- a/automation/source/testtool/tcommuni.cxx +++ b/automation/source/testtool/tcommuni.cxx @@ -170,7 +170,7 @@ sal_uLong GetTTPortConfig() GETSET( abPortToTalk, "TTPort", rtl::OString::valueOf(static_cast(TESTTOOL_DEFAULT_PORT)) ); - return (sal_uLong)abPortToTalk.ToInt64(); + return (sal_uLong)abPortToTalk.ToInt32(); } @@ -197,7 +197,7 @@ sal_uLong GetUnoPortConfig() GETSET( abPortToTalk, "UnoPort", rtl::OString::valueOf(static_cast(UNO_DEFAULT_PORT)) ); - return (sal_uLong)abPortToTalk.ToInt64(); + return (sal_uLong)abPortToTalk.ToInt32(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 0eaae971d663..72f7489ef324 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -203,7 +203,6 @@ public: } sal_Int32 ToInt32() const; - sal_Int64 ToInt64() const; ByteString& Assign( const ByteString& rStr ); ByteString& Assign( const rtl::OString& rStr ); diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index 509bc6270b7e..40310cf9591d 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -99,15 +99,6 @@ sal_Int32 ByteString::ToInt32() const // ----------------------------------------------------------------------- -sal_Int64 ByteString::ToInt64() const -{ - DBG_CHKTHIS( ByteString, DbgCheckByteString ); - - return atoi( mpData->maStr ); -} - -// ----------------------------------------------------------------------- - sal_Bool ByteString::IsLowerAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString );