Kaydet (Commit) d1fc3fce authored tarafından Kohei Yoshida's avatar Kohei Yoshida

fdo#64448: Don't get type name from incorrect filter.

This causes wrong format type to get "detected" when testing for a
completely different file format type.

Change-Id: I230759e2be432beeae2db24c12369ccb4585f334
üst 82f742f6
...@@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l ...@@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName()); lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName());
} }
if ( pFilter ) if (!pFilter)
aTypeName = pFilter->GetTypeName();
else
aTypeName.Erase(); aTypeName.Erase();
return aTypeName; return aTypeName;
} }
......
...@@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes ...@@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle; lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle;
} }
if ( pFilter ) if (!pFilter)
aTypeName = pFilter->GetTypeName();
else
aTypeName = OUString(); aTypeName = OUString();
return aTypeName; return aTypeName;
......
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