diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:21:33 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 08:21:33 +0000 |
| commit | de4370433bf7ba84e9cabb196a218dda4b624763 (patch) | |
| tree | c256570d2f516dcb1944aa85ab38d6ccdd3bce38 | |
| parent | b8bcfeaac04c635074e72684465206e0d8f87308 (diff) | |
INTEGRATION: CWS xmlsec13 (1.2.12); FILE MERGED
2005/10/31 13:46:20 jl 1.2.12.2: RESYNC: (1.2-1.3); FILE MERGED
2005/08/17 11:37:12 mt 1.2.12.1: small bug fix...
| -rw-r--r-- | xmlsecurity/tools/demo/util2.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx index 20bbcafaab8f..3ee08f4cdd42 100644 --- a/xmlsecurity/tools/demo/util2.cxx +++ b/xmlsecurity/tools/demo/util2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: util2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 17:39:15 $ + * last change: $Author: rt $ $Date: 2005-11-11 09:21:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,6 @@ * ************************************************************************/ -//CP : added by CP #include <rtl/locale.h> #include <osl/nlsupport.h> @@ -41,9 +40,7 @@ #include <osl/process.h> #endif -//CP : end - -#include "util.hxx" +#include <util.hxx> #include <stdio.h> @@ -400,15 +397,11 @@ void QueryPrintSignatureDetails( const SignatureInformations& SignatureInformati fprintf( stdout, "\nDisplay details (y/n) [y]?" ); fflush(stdin); fscanf( stdin, "%c", &cShowDetails); - if ( cShowDetails != 'y' ) + if ( cShowDetails == 'y' ) { - - // By CP , for correct encoding - sal_uInt16 encoding ; rtl_Locale *pLocale = NULL ; osl_getProcessLocale( &pLocale ) ; - encoding = osl_getTextEncodingFromLocale( pLocale ) ; - // CP end + sal_uInt16 encoding = osl_getTextEncodingFromLocale( pLocale ) ; fprintf( stdout, "------------- Signature details START -------------\n" ); fprintf( stdout, "%s", |