diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-28 21:27:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 09:56:07 +0100 |
| commit | 11de7bc8c8091a434b046cb8377b5d9d06ca97a5 (patch) | |
| tree | eca8801eb186340413c24cb1024787e33a319d14 /sfx2 | |
| parent | 3be40d96b7a14fb515f9f1b477cabcf96e6d469c (diff) | |
deconfuse this api somewhat
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/docfilt.cxx | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3ab7ea6ca7b3..0b500f10e6bc 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -833,9 +833,13 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf IMPL_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String*, pString ) { const SfxFilter* pFilter = pThis->GetFilter4Extension( *pString, SFX_FILTER_IMPORT ); - if( pFilter && !pFilter->GetWildcard().Matches( String() ) && - pFilter->GetWildcard() != DEFINE_CONST_UNICODE("*.*") && pFilter->GetWildcard() != '*' ) + if (pFilter && !pFilter->GetWildcard().Matches( String() ) && + !pFilter->GetWildcard().Matches(DEFINE_CONST_UNICODE("*.*")) && + !pFilter->GetWildcard().Matches('*') + ) + { return sal_True; + } return sal_False; } diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index b8a8274740c6..68a79030bcfe 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -99,7 +99,7 @@ SfxFilter::SfxFilter( const String &rName, aShort += ';'; aShort += aLong; } - aWildCard = aShort; + aWildCard.setGlob(aShort); nVersion = SOFFICE_FILEFORMAT_50; aUIName = aFilterName; |