Kaydet (Commit) 15adecb1 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Fridrich Štrba

fdo#78742: SfxFilterMatcher: respect requested document service if set

sfx2::DocumentInserter::CreateMediumList() creates a SfxFilterMatcher
that should match Writer filters only, but actually Calc filters may be
returned; check that the document service matches.

(regression from 3da8f368)

Change-Id: I6208d38c1110355105aa5d1ffa1b57142193a4d7
üst d2e1aa48
...@@ -497,7 +497,9 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c ...@@ -497,7 +497,9 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
// Type detection returned a suitable filter for this. Use it. // Type detection returned a suitable filter for this. Use it.
pFilter = SfxFilter::GetFilterByName(aFilterName); pFilter = SfxFilter::GetFilterByName(aFilterName);
if (!pFilter) // fdo#78742 respect requested document service if set
if (!pFilter || (!m_rImpl.aName.isEmpty()
&& m_rImpl.aName != pFilter->GetServiceName()))
{ {
// detect filter by given type // detect filter by given type
// In case of this matcher is bound to a particular document type: // In case of this matcher is bound to a particular document type:
......
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