From 5a1123ac07d76492191be3f1a204d86cc49e3c69 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Aug 2011 00:36:57 +0100 Subject: reduce API bReplace is always true --- tools/inc/tools/string.hxx | 3 +-- tools/source/string/strcvt.cxx | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 9fc46bb97a52..fc7c755dec72 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -256,8 +256,7 @@ public: rtl_TextEncoding eTarget, sal_Bool bReplace = sal_True ); static sal_Char Convert( sal_Char c, rtl_TextEncoding eSource, - rtl_TextEncoding eTarget, - sal_Bool bReplace = sal_True ); + rtl_TextEncoding eTarget ); static sal_Char ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, sal_Bool bReplace = sal_True ); diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index 71aef08f4711..b64b51451a44 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -387,8 +387,7 @@ ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTar // ======================================================================= char ByteString::Convert( char c, - rtl_TextEncoding eSource, rtl_TextEncoding eTarget, - sal_Bool bReplace ) + rtl_TextEncoding eSource, rtl_TextEncoding eTarget ) { // TextEncoding Dontknow kann nicht konvertiert werden if ( (eSource == RTL_TEXTENCODING_DONTKNOW) || (eTarget == RTL_TEXTENCODING_DONTKNOW) ) @@ -409,7 +408,7 @@ char ByteString::Convert( char c, (eSource != RTL_TEXTENCODING_UTF8) ) return '\0'; - sal_uChar* pConvertTab = ImplGet1ByteConvertTab( eSource, eTarget, bReplace ); + sal_uChar* pConvertTab = ImplGet1ByteConvertTab( eSource, eTarget, true ); if ( pConvertTab ) return (char)pConvertTab[(sal_uChar)c]; else -- cgit