[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source

[Michael Stahl]

 sd/source/ui/unoidl/sddetect.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 3bb16f0eeb7fc8fe0331e0aa11f65e2114928d09
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 10 16:45:27 2014 +0100

    fdo#73363: sd: fix mis-detection of Visio files as PPT
    
    SdFilterDetect::detect() erroneously detects all binary MSO files, and
    because the Visio types would be checked after PPT, Visio is pre-empted.
    
    Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee
    (cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3)
    Reviewed-on: https://gerrit.libreoffice.org/7977
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9e98a7b..66fab30 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -371,6 +371,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
                                 else
                                     pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
                             }
+                            else
+                            {
+                                pFilter = 0;
+                            }
                         }
                         else
                         {
@@ -423,6 +427,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
                     }
                 }
             }
+            else
+            {
+                pFilter = 0;
+            }
         }
     }