From aaef39de32442203d631a65aecf23eeb27dfbb12 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 7 Mar 2014 17:58:59 +0100 Subject: [PATCH] DOCX strict import: fix pictures as well Change-Id: I29f12eb1e5bfc39dc7d76efcff50dced061f7969 --- sw/qa/extras/ooxmlimport/data/strict.docx | Bin 13345 -> 14570 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 3 +++ writerfilter/source/ooxml/model.xml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/sw/qa/extras/ooxmlimport/data/strict.docx b/sw/qa/extras/ooxmlimport/data/strict.docx index 57d671f72bbecef1344f1795e8bb8173f2ac5c9e..b48b70855b47cbfa0a085610eda36a530c5f9d3e 100644 GIT binary patch delta 4666 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 oh?4s63*3CX{VkoGy xHeaderText(xPageStyle->getPropertyValue("HeaderText"), uno::UNO_QUERY); getParagraphOfText(1, xHeaderText, "This is a header."); + + // Picture was missing, this resulted in a lang::IndexOutOfBoundsException. + getShape(1); } #endif diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index c31bbef1ac9e..2933d548673f 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -23,10 +23,12 @@ + +