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

[Caolán McNamara]

 sd/source/filter/ppt/pptin.cxx |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit b4c637f74b1881aa2fb210d7480a6a35794593c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 27 16:00:50 2017 +0000

    undo "ofz#3577 force refresh"
    
    oss-fuzz shows no reduction of timeouts. Seeing as this
    is the root of importing ole docproperties none of the lines
    from SfxOleStringHelper:: up can be in any timeouts, so the
    original stacktrace isn't in any way helpful and it must
    be the generic ReadUInt16 downwards part of the stack.
    
    In other words the timeout bugs in oss-fuzz are useless if they
    aren't reproducible
    
    This reverts commit ecc3b1fcaddd4066d90161faf4a3f532b445c85a.
    
    Change-Id: I3fb8d2ded8502278098bd223898e3e90f6e4a378
    Reviewed-on: https://gerrit.libreoffice.org/45352
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4215cd7b60a8..6d1af99445f7 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1401,18 +1401,13 @@ bool ImplSdPPTImport::Import()
 
     xStbMgr.reset();
 
-    //ofz#3577 as an experiment disable this during fuzzing until Nov 27 2017
-    //and then reenable
-    if (!utl::ConfigManager::IsFuzzing())
-    {
-        // read DocumentProperties
-        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
-            mpDoc->GetObjectShell()->GetModel(), uno::UNO_QUERY_THROW);
-        uno::Reference<document::XDocumentProperties> xDocProps
-            = xDPS->getDocumentProperties();
-        sfx2::LoadOlePropertySet(xDocProps, &mrStorage);
-        xDocProps->setTemplateName(OUString());
-    }
+    // read DocumentProperties
+    uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
+        mpDoc->GetObjectShell()->GetModel(), uno::UNO_QUERY_THROW);
+    uno::Reference<document::XDocumentProperties> xDocProps
+        = xDPS->getDocumentProperties();
+    sfx2::LoadOlePropertySet(xDocProps, &mrStorage);
+    xDocProps->setTemplateName(OUString());
 
     pSdrModel->setLock(false);
     pSdrModel->EnableUndo(bSavedUndoEnabled);