diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:07:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:07:54 +0000 |
| commit | 7975754e1e228e544ead32dfe4cebbda46f013ec (patch) | |
| tree | 5ac7a42acf4a7d8b00ad59ef8c2d04f38f773d8a /unotools/source | |
| parent | 59efdab38242b908cfbf26cec564e95eda5bb3f5 (diff) | |
INTEGRATION: CWS warnings01 (1.13.16); FILE MERGED
2006/05/23 18:05:47 sb 1.13.16.3: RESYNC: (1.13-1.14); FILE MERGED
2005/12/21 11:41:11 fs 1.13.16.2: #i55991# warning-free code
2005/10/21 09:48:59 dbo 1.13.16.1: #i53898# warning free code
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/i18n/transliterationwrapper.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 462480f93524..f9d71435cc21 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: transliterationwrapper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2006-04-07 16:30:34 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:07:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,9 +51,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif -#pragma hdrstop - - #define TRANSLIT_LIBRARYNAME "i18n" #define TRANSLIT_SERVICENAME "com.sun.star.i18n.Transliteration" @@ -209,6 +206,8 @@ void TransliterationWrapper::loadModuleImpl() const ByteString aMsg( "loadModuleImpl: Exception caught\n" ); aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 ); DBG_ERRORFILE( aMsg.GetBuffer() ); +#else + (void)e; #endif } @@ -234,6 +233,8 @@ void TransliterationWrapper::loadModuleByImplName( ByteString aMsg( "loadModuleByImplName: Exception caught\n" ); aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 ); DBG_ERRORFILE( aMsg.GetBuffer() ); +#else + (void)e; #endif } @@ -258,6 +259,8 @@ sal_Bool TransliterationWrapper::equals( ByteString aMsg( "equals: Exception caught\n" ); aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 ); DBG_ERRORFILE( aMsg.GetBuffer() ); +#else + (void)e; #endif } return sal_False; @@ -281,6 +284,8 @@ sal_Int32 TransliterationWrapper::compareSubstring( ByteString aMsg( "compareSubstring: Exception caught\n" ); aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 ); DBG_ERRORFILE( aMsg.GetBuffer() ); +#else + (void)e; #endif } return 0; @@ -302,6 +307,8 @@ sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const Stri ByteString aMsg( "compareString: Exception caught\n" ); aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 ); DBG_ERRORFILE( aMsg.GetBuffer() ); +#else + (void)e; #endif } return 0; @@ -323,7 +330,7 @@ sal_Bool TransliterationWrapper::isEqual( const String& rStr1, const String& rSt sal_Bool TransliterationWrapper::isMatch( const String& rStr1, const String& rStr2 ) const { sal_Int32 nMatch1, nMatch2; - sal_Bool bMatch = equals( + equals( rStr1, 0, rStr1.Len(), nMatch1, rStr2, 0, rStr2.Len(), nMatch2 ); return (nMatch1 <= nMatch2) && (nMatch1 == rStr1.Len()); |