[Libreoffice-commits] core.git: sc/source sd/source

[Kohei Yoshida]

 sc/source/ui/unoobj/scdetect.cxx |    5 ++---
 sd/source/ui/unoidl/sddetect.cxx |    4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d1fc3fce16172d7d619b6826de44528030ab36f8
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Jul 12 18:02:23 2013 -0400

    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

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index c843159..d99cb03 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 ac1f7d9..db4d732 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;