From bee397a1e35fbc2717c56a8bd4a631ccfc185b6b Mon Sep 17 00:00:00 2001 From: Tushar Bende Date: Mon, 9 Dec 2013 19:13:36 +0530 Subject: [PATCH] fdo#68211: Fix for "General input/output error" while opening file Description: Docx containing floating table with formula was giving "General input/output error" while opening in LibreOffice. Reason being within xLoader->filter() it was calling EmbeddedObjectContainer::RemoveEmbeddedObject() with bClose value as sal_True(default value in function declaration) and hence it was removing embedded object from container and also it was closing it.Fix includes passing this bClose value as sal_false (which means remove object from container but don't close it.) verified code changes for various floating table docx and normal docx containing tables and formulas. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7009 Change-Id: I9c2d3f8c4099f9f753b2a1b027f9072cd4effeb5 --- .../data/floatingtbl_with_formula.docx | Bin 0 -> 17046 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 9 +++++++++ sw/source/core/ole/ndole.cxx | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx diff --git a/sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx b/sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx new file mode 100644 index 0000000000000000000000000000000000000000..ecabbd6b2a9f38ae5fff44bc13f0ea1c5d3febf9 GIT binary patch literal 17046 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 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7428200b14f7..aede32896156 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2136,6 +2136,15 @@ DECLARE_OOXMLEXPORT_TEST(testCrashWhileSave, "testCrashWhileSave.docx") CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle", "val").match("Normal")); } +DECLARE_OOXMLEXPORT_TEST(testFileOpenInputOutputError,"floatingtbl_with_formula.docx") +{ + // Docx containing Floating table with formula was giving "General input/output error" while opening in LibreOffice + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pStyle", "val", "Normal"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index e3793afb9845..64739126a110 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -715,10 +715,11 @@ SwOLEObj::~SwOLEObj() // successful closing of the object will automatically clear the reference then xOLERef.Lock(sal_False); - // Always remove object from conteiner it is connected to + // Always remove object from container it is connected to try { - pCnt->RemoveEmbeddedObject( aName ); + // remove object from container but don't close it + pCnt->RemoveEmbeddedObject( aName, sal_False); } catch ( uno::Exception& ) {