From e7a43ee7c00b2e244ceb6218b8d342f7656736a9 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 12 Jul 2013 18:02:23 -0400 Subject: 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 Reviewed-on: https://gerrit.libreoffice.org/4877 Reviewed-by: Lionel Elie Mamane Tested-by: Lionel Elie Mamane Reviewed-by: Petr Mladek Tested-by: Petr Mladek Reviewed-by: David Tardon --- sc/source/ui/unoobj/scdetect.cxx | 5 ++--- 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 6d8a7dc7ad22..fd81a8c0030e 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& 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 b5980938681f..9e98a7b2e3e6 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; -- cgit v1.2.3