summaryrefslogtreecommitdiff
path: root/tools/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-07-04 09:23:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-07-05 21:39:45 +0100
commit5218c0d6a8171400bee0d972ff05757849df4d19 (patch)
treeb323cfd6b6a8e080ad77b1ee0aeb5b132db1147c /tools/inc
parent6747dd33754a15e7d9f5aae01bb8299b6a05e365 (diff)
UniString(const rtl::OString ...) no longer implemented
Change-Id: Ie4fc4ed1a54889c1745a0d71d02211d6868340fa
Diffstat (limited to 'tools/inc')
-rw-r--r--tools/inc/tools/string.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index c4a8c2aa3ac2..ed641d00d3e7 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -156,6 +156,12 @@ private:
//a rtl::OString
TOOLS_DLLPRIVATE UniString(const rtl::OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS);
+
+ //no longer implemented
+ TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr,
+ rtl_TextEncoding eTextEncoding,
+ sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
+
public:
UniString();
UniString( const ResId& rResId );
@@ -166,9 +172,6 @@ public:
UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
UniString( sal_Unicode c );
UniString(char c); // ...but allow "UniString('a')"
- UniString( const rtl::OString& rByteStr,
- rtl_TextEncoding eTextEncoding,
- sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
UniString( const sal_Char* pByteStr,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );