mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DOCX strict import: fix pictures as well

Browse Source 
Change-Id: I29f12eb1e5bfc39dc7d76efcff50dced061f7969
This commit is contained in:
Miklos Vajna
2014-03-07 17:58:59 +01:00
parent f118539fd1
commit aaef39de32
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlimport/data/strict.docx
View File

Binary file not shown.

3
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -1917,6 +1917,9 @@ DECLARE_OOXMLIMPORT_TEST(testStrict, "strict.docx")
// Header in the document caused a crash on import. // Header in the document caused a crash on import.
uno::Reference<text::XText> xHeaderText(xPageStyle->getPropertyValue("HeaderText"), uno::UNO_QUERY); uno::Reference<text::XText> xHeaderText(xPageStyle->getPropertyValue("HeaderText"), uno::UNO_QUERY);
getParagraphOfText(1, xHeaderText, "This is a header."); getParagraphOfText(1, xHeaderText, "This is a header.");
// Picture was missing, this resulted in a lang::IndexOutOfBoundsException.
getShape(1);
} }
#endif #endif

2
writerfilter/source/ooxml/model.xml
View File

@@ -23,10 +23,12 @@
<namespace-alias name="urn:schemas-microsoft-com:office:office" alias="office" id="vmlOffice"/> <namespace-alias name="urn:schemas-microsoft-com:office:office" alias="office" id="vmlOffice"/>
<namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" alias="theme" id="officeRelTheme"/> <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" alias="theme" id="officeRelTheme"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" alias="wordprocessingDrawing" id="dmlWordDr"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" alias="wordprocessingDrawing" id="dmlWordDr"/>
<namespace-alias name="http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing" alias="wordprocessingDrawing" id="dmlWordDr"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="drawingml" id="dml"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="drawingml" id="dml"/>
<namespace-alias name="http://purl.oclc.org/ooxml/drawingml/main" alias="drawingml" id="dml"/> <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/main" alias="drawingml" id="dml"/>
<namespace-alias name="urn:schemas-microsoft-com:vml" alias="vml" id="vml"/> <namespace-alias name="urn:schemas-microsoft-com:vml" alias="vml" id="vml"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="picture" id="dmlPicture"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="picture" id="dmlPicture"/>
<namespace-alias name="http://purl.oclc.org/ooxml/drawingml/picture" alias="picture" id="dmlPicture"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="diagram" id="dmlDiagram"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="diagram" id="dmlDiagram"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="lockedCanvas" id="dmlLockedCanvas"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="lockedCanvas" id="dmlLockedCanvas"/>
<namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps" id="wps"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps" id="wps"/>