[Libreoffice-commits] .: 2 commits - svtools/source

[Caolán McNamara]

 svtools/source/misc/transfer.cxx  |    3 +--
 svtools/source/svrtf/svparser.cxx |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 20edd9cfbd865a087f8735a647b9cf3c2fbd22b5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 10 14:13:03 2011 +0100

    revert lunatic commit, restore paste

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 3625f9a..cbb5eed 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2242,7 +2242,6 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
     if( pWindow )
         xClipboard = pWindow->GetClipboard();
 
-#if 0
     if( xClipboard.is() )
     {
         try
@@ -2260,7 +2259,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
         {
         }
     }
-#endif
+
     return aRet;
 }
 
commit f3374fbb08de91b38597414110f3587c1a332b15
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 10 12:53:10 2011 +0100

    convert this debugging thing over too

diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 11ecfe2..9cb6ba8 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -416,8 +416,7 @@ sal_Unicode SvParser::GetNextChar()
 
 #ifdef DBG_UTIL
     if( pImplData->aOut.IsOpen() )
-        pImplData->aOut << ByteString::ConvertFromUnicode( c,
-                                                RTL_TEXTENCODING_MS_1251 );
+        pImplData->aOut << rtl::OUStringToOString(rtl::OUString(c), RTL_TEXTENCODING_MS_1251).getStr();
 #endif
 
     if( c == '\n' )