Kaydet (Commit) fd9f706f authored tarafından Katarina Behrens's avatar Katarina Behrens

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
üst 66c9aec1
......@@ -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 );
......
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