diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-01-28 18:13:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-01-28 18:13:00 +0000 |
| commit | 01abb48b899694a9924fc2b9b68b778d77bb3caa (patch) | |
| tree | 8b2e197de8ca0cb5e6baeba98cd0dacabc5f578c | |
| parent | 75433deae237e70c370a6f8d99d09f66ae19aad8 (diff) | |
INTEGRATION: CWS filtercfg (1.11.6); FILE MERGED
2003/11/21 06:14:05 as 1.11.6.2: #112488#
2003/10/08 09:58:44 mba 1.11.6.1: #112488#: searching for filtername must be done without flags
| -rw-r--r-- | sfx2/source/doc/docfilt.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index a093451aa77b..aff64fd490e8 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfilt.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2003-09-19 08:00:09 $ + * last change: $Author: kz $ $Date: 2004-01-28 19:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -317,7 +317,7 @@ const SfxFilter* SfxFilter::GetDefaultFilterFromFactory( const String& rFact ) const SfxFilter* SfxFilter::GetFilterByName( const String& rName ) { SfxFilterMatcher aMatch; - return aMatch.GetFilter4FilterName( rName ); + return aMatch.GetFilter4FilterName( rName, 0, 0 ); } String SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) @@ -349,9 +349,12 @@ String SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) else { sal_Int32 nClipId = ((SotStorage&)rStg).GetFormat(); - const SfxFilter* pFilter = SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( nClipId ); if ( nClipId ) - return pFilter->GetTypeName(); + { + const SfxFilter* pFilter = SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( nClipId ); + if ( pFilter ) + return pFilter->GetTypeName(); + } } return pType ? String::CreateFromAscii(pType) : String(); |