diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-12 18:02:23 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-12 19:30:20 -0400 |
commit | d1fc3fce16172d7d619b6826de44528030ab36f8 (patch) | |
tree | 9110cd1475497622ca625562be0791232a5ad924 | |
parent | fdo#66811: vcl: fix broken OUString with length STRING_LEN (diff) | |
download | core-d1fc3fce16172d7d619b6826de44528030ab36f8.tar.gz core-d1fc3fce16172d7d619b6826de44528030ab36f8.zip |
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
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index c84315985cb8..d99cb030ab03 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName()); } - if ( pFilter ) - aTypeName = pFilter->GetTypeName(); - else + if (!pFilter) aTypeName.Erase(); + return aTypeName; } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index ac1f7d9c17d2..db4d7324334c 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle; } - if ( pFilter ) - aTypeName = pFilter->GetTypeName(); - else + if (!pFilter) aTypeName = OUString(); return aTypeName; |