diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-04-14 17:33:36 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-04-15 14:12:04 +0200 |
| commit | fd9f706f2e8b048a83ea002ecb5f525ca3e21f61 (patch) | |
| tree | 6f463c69f95c0f46302a2f1ce6882ddae75ff84e /sd | |
| parent | 66c9aec156d974b939b680dccbb27e18fb153a23 (diff) | |
Use cross-app filter directly
and bypass SfxFilterMatcher, which will likely not find it. We're
able to insert .odp file into Draw and .odg file into Impress
anyway
Change-Id: I02332f0ebd6856d088261ce014bd04f87acfbac6
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index c47c8ec3c5fe..ce6d3e755681 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -138,15 +138,6 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) if( pFilter ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); - // get cross filter - pFilter = SfxFilter::GetDefaultFilterFromFactory( aOtherCont ); - if( pFilter ) - { - pFilter = aMatch.GetFilter4Extension( pFilter->GetDefaultExtension() ); - if ( pFilter ) - xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); - } - // get template filter if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS ) pFilter = DrawDocShell::Factory().GetTemplateFilter(); @@ -155,6 +146,13 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) if( pFilter ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); + // get cross filter + pFilter = SfxFilter::GetDefaultFilterFromFactory( aOtherCont ); + if( pFilter ) + { + xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); + } + // get Powerpoint filter OUString aExt = ".ppt"; pFilter = aMatch.GetFilter4Extension( aExt ); |