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

[Caolán McNamara]

 tools/inc/tools/string.hxx     |    6 +++---
 tools/source/string/strcvt.cxx |   13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit f356303302630f1d1d4a99189fc0c26f7f338911
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 14 13:39:14 2011 +0000

    strip ByteClass down some more

diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 527062d..8f3be40 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -163,6 +163,9 @@ private:
                         ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
                                     rtl_TextEncoding eTextEncoding,
                                     sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit
+                        ByteString( const UniString& rUniStr,
+                                    rtl_TextEncoding eTextEncoding,
+                                    sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit
     void                Assign(int); // not implemented; to detect misuses of
                                      // Assign(sal_Char)
     void                operator =(int); // not implemented; to detect misuses
@@ -179,9 +182,6 @@ public:
                         ByteString( const rtl::OString& rStr );
                         ByteString( const sal_Char* pCharStr );
                         ByteString( const sal_Char* pCharStr, xub_StrLen nLen );
-                        ByteString( const UniString& rUniStr,
-                                    rtl_TextEncoding eTextEncoding,
-                                    sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
                         ~ByteString();
 
     operator rtl::OString () const
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 75f1934..0f4a145 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -29,19 +29,6 @@
 
 // =======================================================================
 
-ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
-    DBG_CTOR( ByteString, DbgCheckByteString );
-    DBG_CHKOBJ( &rUniStr, UniString, DbgCheckUniString );
-
-    mpData = NULL;
-    rtl_uString2String( (rtl_String **)(&mpData),
-                        rUniStr.mpData->maStr, rUniStr.mpData->mnLen,
-                        eTextEncoding, nCvtFlags );
-}
-
-// =======================================================================
-
 ByteString::ByteString( const rtl::OString& rStr )
     : mpData(NULL)
 {