Kaydet (Commit) 6eeee04b authored tarafından Stephan Bergmann's avatar Stephan Bergmann

WildCard::ImpMatch should return bool

Change-Id: Ib851cbe072bca0d594440cc28164e112d0fe37cb
üst fd30e4a1
...@@ -29,7 +29,7 @@ private: ...@@ -29,7 +29,7 @@ private:
OString aWildString; OString aWildString;
char cSepSymbol; char cSepSymbol;
sal_uInt16 ImpMatch( const char *pWild, const char *pStr ) const; bool ImpMatch( const char *pWild, const char *pStr ) const;
public: public:
WildCard() WildCard()
......
...@@ -20,14 +20,12 @@ ...@@ -20,14 +20,12 @@
#include <tools/wldcrd.hxx> #include <tools/wldcrd.hxx>
/** Tests, whether a wildcard in pWild will match for pStr. /** Tests, whether a wildcard in pWild will match for pStr.
*
* If they match, return 1, otherwise 0.
* *
* '*' in pWild means n chars for n > 0. * '*' in pWild means n chars for n > 0.
* '?' in pWild mean match exactly one character. * '?' in pWild mean match exactly one character.
* *
*/ */
sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const bool WildCard::ImpMatch( const char *pWild, const char *pStr ) const
{ {
int pos=0; int pos=0;
int flag=0; int flag=0;
...@@ -38,7 +36,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const ...@@ -38,7 +36,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const
{ {
case '?': case '?':
if ( *pStr == '\0' ) if ( *pStr == '\0' )
return 0; return false;
break; break;
default: default:
...@@ -46,7 +44,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const ...@@ -46,7 +44,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const
pWild++; pWild++;
if ( *pWild != *pStr ) if ( *pWild != *pStr )
if ( !pos ) if ( !pos )
return 0; return false;
else else
pWild += pos; pWild += pos;
else else
...@@ -56,7 +54,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const ...@@ -56,7 +54,7 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const char *pStr ) const
while ( *pWild == '*' ) while ( *pWild == '*' )
pWild++; pWild++;
if ( *pWild == '\0' ) if ( *pWild == '\0' )
return 1; return true;
flag = 1; flag = 1;
pos = 0; pos = 0;
if ( *pStr == '\0' ) if ( *pStr == '\0' )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment