diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 11:41:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 14:26:33 +0100 |
| commit | 6e03e292e5e887053dfd7746d6f9df12abc0bab7 (patch) | |
| tree | 346488139e14effc46c2e0751991e84fd3867211 /include | |
| parent | 42def53fb1fee0b4e57279d11c05e54601aeed1b (diff) | |
Related: fdo#38838 remove a pile of ctors
Change-Id: I5d19eadc3dc24b0aeeb61c677f440eef83af78c2
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/string.hxx | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 6904e0ef5680..95602203531f 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -99,44 +99,13 @@ private: UniString& Assign( const OUString& rStr ); UniString& Append( const UniString& rStr ); - - UniString( const int* pDummy ); // not implemented: to prevent UniString( NULL ) - UniString(int); // not implemented; to detect misuses of - // UniString(sal_Unicode) - void operator =(int); // not implemented; to detect misuses - // of operator =(sal_Unicode) - void Append(int); // not implemented; to detect misuses of - // Append(sal_Unicode) - - //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM - TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 ); - - //detect and reject wrong way to attempt to create a UniString from a substring of - //a OString - TOOLS_DLLPRIVATE UniString(const OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen, - sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS); - - //no longer implemented - TOOLS_DLLPRIVATE UniString( const OString& rByteStr, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); - TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr ); - TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen ); - TOOLS_DLLPRIVATE UniString( sal_Unicode c ); public: UniString(); UniString( const ResId& rResId ); UniString( const UniString& rStr ); UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen ); UniString( const OUString& rStr ); - UniString(char c); // ...but allow "UniString('a')" - UniString( const sal_Char* pByteStr, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); - UniString( const sal_Char* pByteStr, xub_StrLen nLen, - rtl_TextEncoding eTextEncoding, - sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS ); - ~UniString(); + ~UniString(); operator OUString () const { |