diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 00:36:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 09:56:08 +0100 |
| commit | 3829892dbc5475a49250729541be369ea9532d28 (patch) | |
| tree | 9a57bc4865772c6613db2c71c6fde609d8563e09 /svl | |
| parent | de82a40f84c69081a517617989c344ec9597cb45 (diff) | |
merge together 5 or ascii isalpha/isalnum/isdigit implementations
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/passwordcontainer/passwordcontainer.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 86c72fb3619b..b7aa067aeb0b 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -32,7 +32,8 @@ #include "passwordcontainer.hxx" #include <unotools/pathoptions.hxx> -#include "cppuhelper/factory.hxx" +#include <cppuhelper/factory.hxx> +#include <comphelper/string.hxx> #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/task/MasterPasswordRequest.hpp> @@ -42,10 +43,6 @@ #include <rtl/digest.h> #include <rtl/byteseq.hxx> -#ifndef _TOOLS_INETSTRM_HXX -// @@@ #include <inetstrm.hxx> -#endif - using namespace std; using namespace osl; using namespace utl; @@ -73,9 +70,7 @@ static ::rtl::OUString createIndex( vector< ::rtl::OUString > lines ) while( *pLine ) { - if( ( *pLine >= 'A' && *pLine <= 'Z' ) - || ( *pLine >= 'a' && *pLine <= 'z' ) - || ( *pLine >= '0' && *pLine <= '9' ) ) + if (comphelper::string::isalnumAscii(*pLine)) { aResult += ::rtl::OString::valueOf( *pLine ); } |