summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-07-12 18:02:23 -0400
committerLionel Elie Mamane <lionel@mamane.lu>2013-07-13 01:59:33 +0000
commitfa965d8b1743d786ea07d887f883ab9af9b6652e (patch)
tree0b632ffcb46edc849f9b70b0c1ffd7ef92dcccc8 /sc
parent5156749cde88c5274b36a22dab7b561d59b93cf1 (diff)
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/4876 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx5
1 files changed, 2 insertions, 3 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<beans::PropertyValue>& l
lDescriptor[nIndexOfFilterName].Value <<= OUString(pFilter->GetName());
}
- if ( pFilter )
- aTypeName = pFilter->GetTypeName();
- else
+ if (!pFilter)
aTypeName.Erase();
+
return aTypeName;
}