[Libreoffice-commits] .: 3 commits - tools/inc tools/source

[Caolán McNamara]

 tools/inc/tools/string.hxx      |    6 ------
 tools/source/string/tstring.cxx |   40 ----------------------------------------
 2 files changed, 46 deletions(-)

New commits:
commit f7c37b11a00a7589a25ead2b70554236fb33e3cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 27 23:57:02 2011 +0100

    remove unused ByteString::CreateFromFloat

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 21efc6b..f57410b 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -205,7 +205,6 @@ public:
 
     static ByteString	CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
     static ByteString	CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
-    static ByteString	CreateFromFloat( float f );
     static const ByteString& EmptyString();
     sal_Int32			ToInt32() const;
     sal_Int64			ToInt64() const;
diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
index eaa37a7..3902ca8 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.cxx
@@ -115,16 +115,6 @@ ByteString ByteString::CreateFromInt64( sal_Int64 n, sal_Int16 nRadix )
 
 // -----------------------------------------------------------------------
 
-ByteString ByteString::CreateFromFloat( float f )
-{
-    sal_Char aBuf[RTL_STR_MAX_VALUEOFFLOAT];
-    BOOST_STATIC_ASSERT(RTL_STR_MAX_VALUEOFFLOAT <= STRING_MAXLEN);
-    return ByteString(
-        aBuf, static_cast< xub_StrLen >(rtl_str_valueOfFloat( aBuf, f )) );
-}
-
-// -----------------------------------------------------------------------
-
 namespace { struct Empty : public rtl::Static< const ByteString, Empty> {}; }
 const ByteString& ByteString::EmptyString()
 {
commit f170911a1cbfc0c3c81249b9585e831fa1b5fac9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 27 23:49:50 2011 +0100

    remove deprecated ByteString::CreateFromDouble
    
    use OString::valueOf(double) instead

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 2a330ab..21efc6b 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -206,7 +206,6 @@ public:
     static ByteString	CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
     static ByteString	CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
     static ByteString	CreateFromFloat( float f );
-    static ByteString	CreateFromDouble( double d );
     static const ByteString& EmptyString();
     sal_Int32			ToInt32() const;
     sal_Int64			ToInt64() const;
diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
index cff734f..eaa37a7 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.cxx
@@ -125,16 +125,6 @@ ByteString ByteString::CreateFromFloat( float f )
 
 // -----------------------------------------------------------------------
 
-ByteString ByteString::CreateFromDouble( double d )
-{
-    sal_Char aBuf[RTL_STR_MAX_VALUEOFDOUBLE];
-    BOOST_STATIC_ASSERT(RTL_STR_MAX_VALUEOFDOUBLE <= STRING_MAXLEN);
-    return ByteString(
-        aBuf, static_cast< xub_StrLen >(rtl_str_valueOfDouble( aBuf, d )) );
-}
-
-// -----------------------------------------------------------------------
-
 namespace { struct Empty : public rtl::Static< const ByteString, Empty> {}; }
 const ByteString& ByteString::EmptyString()
 {
commit bdbcbbf3b6b6109c06a71051ce43cfe4cd5ea169
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 27 23:14:00 2011 +0100

    remove insanely stubbed methods

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index a8702a7..2a330ab 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -154,8 +154,6 @@ class TOOLS_DLLPUBLIC ByteString
 {
     friend				class UniString;
 
-    TOOLS_DLLPRIVATE void InitStringRes( const UniString& rStr );
-
 private:
     ByteStringData* 	mpData;
 
@@ -212,8 +210,6 @@ public:
     static const ByteString& EmptyString();
     sal_Int32			ToInt32() const;
     sal_Int64			ToInt64() const;
-    float				ToFloat() const;
-    double				ToDouble() 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 bf224e1..cff734f 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.cxx
@@ -161,26 +161,6 @@ sal_Int64 ByteString::ToInt64() const
 
 // -----------------------------------------------------------------------
 
-float ByteString::ToFloat() const
-{
-    DBG_CHKTHIS( ByteString, DbgCheckByteString );
-
-    OSL_FAIL("ByteString::ToFloat unusable");
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-double ByteString::ToDouble() const
-{
-    DBG_CHKTHIS( ByteString, DbgCheckByteString );
-
-    OSL_FAIL("ByteString::ToDouble unusable");
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 sal_Bool ByteString::IsLowerAscii() const
 {
     DBG_CHKTHIS( ByteString, DbgCheckByteString );