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

fdo#76016 Changed oox/CustomTarget_generated.mk

Browse Source 
oox/source/export/presetShapeDefinitions.xml had
multiple entries for "upDownArrow" instead of an entry
for "upArrow".
Whereas drawingml/customshapes/presetShapeDefinitions.xml
has correct entries.

Changed CustomTarget_generated.mk to use
drawingml/customshapes/presetShapeDefinitions.xml instead of
oox/source/export/presetShapeDefinitions.xml. Also deleted the latter
to avoid duplication.

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/8540

Change-Id: Ic46496af7fb79edf0780b04731a882d914e89a24
This commit is contained in:
Vinaya Mandke
2014-03-11 19:51:58 +05:30
committed by Miklos Vajna
parent 57f7841fca
commit cdceca118b
4 changed files with 11 additions and 19933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/CustomTarget_generated.mk
View File

@@ -16,7 +16,7 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
$(oox_MISC)/vmlexport-shape-types.cxx : \ $(oox_MISC)/vmlexport-shape-types.cxx : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \ $(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \ $(SRCDIR)/oox/source/drawingml/customshapes/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@) mkdir -p $(dir $@)

19932
oox/source/export/presetShapeDefinitions.xml
View File

File diff suppressed because it is too large Load Diff

BIN
sw/qa/extras/ooxmlexport/data/fdo76016.docx Normal file
View File

Binary file not shown.

10
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
View File

@@ -2781,6 +2781,16 @@ DECLARE_OOXMLEXPORT_TEST(testCitation,"FDO74775.docx")
CPPUNIT_ASSERT(contents.match(" CITATION [Kra06]")); CPPUNIT_ASSERT(contents.match(" CITATION [Kra06]"));
} }
DECLARE_OOXMLEXPORT_TEST(testFdo76016, "fdo76016.docx")
{
// check XML
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
assertXPath(pXmlDoc, "//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[1]", "name", "adj1");
assertXPath(pXmlDoc, "//a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd[2]", "name", "adj2");
}
#endif #endif
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();