[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - 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 e7a43ee7c00b2e244ceb6218b8d342f7656736a9
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
    Reviewed-on: https://gerrit.libreoffice.org/4877
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 6d8a7dc..fd81a8c 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 b598093..9e98a7b 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;