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

[Caolán McNamara]

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

New commits:
commit ecc3b1fcaddd4066d90161faf4a3f532b445c85a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 11 21:15:43 2017 +0000

    ofz#3577 force refresh
    
    looks to me that once the bt was found with a given test document that
    even if the document is fixed all similar bts are considered duplicates
    and other bugs that can end up here aren't disambiguated. Later bugs
    reports have "groups" where they are disambiguated so lets "fix" this
    in the fuzzer and when fixed reenable and see if a new test case is
    filed and/or if groups appear
    
    Change-Id: Ic680607a654eea6b3874db626c1742734245bd6b
    Reviewed-on: https://gerrit.libreoffice.org/44645
    Tested-by: Jenkins <ci at libreoffice.org>
    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 537ec33b0469..3614a9668408 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1401,13 +1401,18 @@ bool ImplSdPPTImport::Import()
 
     xStbMgr.reset();
 
-    // 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());
+    //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());
+    }
 
     pSdrModel->setLock(false);
     pSdrModel->EnableUndo(bSavedUndoEnabled);