summaryrefslogtreecommitdiff
path: root/tools/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-20 11:37:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-20 12:57:34 +0000
commit55a40209072bac2526e74d5be7dd7be5ccd2c175 (patch)
tree3dd0257a893fcd6ff16ab164608b952f65041a94 /tools/inc
parenta92129ec175a1362e61a474cf64992f283db74b4 (diff)
remove ToDouble/ToFloat
Diffstat (limited to 'tools/inc')
-rw-r--r--tools/inc/tools/config.hxx2
-rw-r--r--tools/inc/tools/inetmime.hxx8
-rw-r--r--tools/inc/tools/rc.hxx2
-rw-r--r--tools/inc/tools/string.hxx2
4 files changed, 6 insertions, 8 deletions
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index 478f7653291e..59b813a83344 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -69,7 +69,7 @@ public:
sal_Bool HasGroup(const rtl::OString& rGroup) const;
rtl::OString ReadKey(const rtl::OString& rKey) const;
- UniString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
+ rtl::OUString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
rtl::OString ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const;
void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
void DeleteKey(const rtl::OString& rKey);
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 6259c20a887e..4c66c4dd068f 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -514,7 +514,7 @@ public:
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const UniString & rBody,
+ const rtl::OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace = true);
@@ -523,7 +523,7 @@ public:
rtl_TextEncoding eEncoding,
sal_uInt32 & rCharacter);
- static UniString decodeHeaderFieldBody(HeaderFieldType eType,
+ static rtl::OUString decodeHeaderFieldBody(HeaderFieldType eType,
const rtl::OString& rBody);
// #i70651#: Prevent warnings on Mac OS X.
@@ -1237,7 +1237,7 @@ struct INetContentTypeParameter
within Unicode's Private Use Area (effectively adding 0xF800 to the
character's numeric value).
*/
- const UniString m_sValue;
+ const rtl::OUString m_sValue;
/** This is true if the value is successfuly converted to Unicode, and
false if the value is a special mixture of ISO-LATIN-1 characters and
@@ -1247,7 +1247,7 @@ struct INetContentTypeParameter
INetContentTypeParameter(const rtl::OString& rTheAttribute,
const rtl::OString& rTheCharset, const rtl::OString& rTheLanguage,
- const UniString & rTheValue, bool bTheConverted)
+ const rtl::OUString& rTheValue, bool bTheConverted)
: m_sAttribute(rTheAttribute)
, m_sCharset(rTheCharset)
, m_sLanguage(rTheLanguage)
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 1bca5f99d35b..0ee95dbef5ef 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -82,7 +82,7 @@ class TOOLS_DLLPUBLIC Resource
sal_Int16 ReadShortRes()
{ return m_pResMgr->ReadShort(); }
// read a string from resource data and increment pointer
- UniString ReadStringRes()
+ rtl::OUString ReadStringRes()
{ return m_pResMgr->ReadString(); }
// read a byte string from resource data and increment pointer
rtl::OString ReadByteStringRes()
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index d4ba851c9dac..2d1e6a964954 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -183,8 +183,6 @@ public:
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
- float ToFloat() const;
- double ToDouble() const;
UniString& Assign( const UniString& rStr );
UniString& Assign( const rtl::OUString& rStr );