diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-01-28 13:19:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-01-28 13:19:54 +0000 |
| commit | f272a2ddd4111dff9d6cedcfa48590ec852c4b9e (patch) | |
| tree | 570f07ece0e2e6060d48c3d8cff856ae942da111 /framework/inc/dispatch/interceptionhelper.hxx | |
| parent | 35c05aeea3c83d0e142401fdcbc4b82148387dec (diff) | |
INTEGRATION: CWS filtercfg (1.2.42); FILE MERGED
2003/09/08 08:11:00 as 1.2.42.1: #102620# replace some internal classes with external helper
Diffstat (limited to 'framework/inc/dispatch/interceptionhelper.hxx')
| -rw-r--r-- | framework/inc/dispatch/interceptionhelper.hxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 74ac12716cb0..c4b1cb5d24af 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: interceptionhelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2003-04-04 17:12:43 $ + * last change: $Author: kz $ $Date: 2004-01-28 14:19:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,10 +74,6 @@ #include <threadhelp/threadhelpbase.hxx> #endif -#ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_ -#include <classes/wildcard.hxx> -#endif - #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #include <macros/xinterface.hxx> #endif @@ -130,6 +126,10 @@ // other includes //_________________________________________________________________________________________________________________ +#ifndef _WLDCRD_HXX +#include <tools/wldcrd.hxx> +#endif + #ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> #endif @@ -240,9 +240,11 @@ class InterceptionHelper : public css::frame::XDispatchProvider { sal_Int32 c = pIt->lURLPattern.getLength(); const ::rtl::OUString* pPattern = pIt->lURLPattern.getConstArray(); + for (sal_Int32 i=0; i<c; ++i) { - if (Wildcard::match(sURL, pPattern[i])) + WildCard aPattern(pPattern[i]); + if (aPattern.Matches(sURL)) return pIt; } } |