diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-03-11 19:51:58 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-15 11:00:44 +0100 |
| commit | cdceca118b65f69d8c16bf3f8465f940aed73c10 (patch) | |
| tree | f2fe3a3861ffb56c6348b20e8b7c49f16b1d308f /oox/CustomTarget_generated.mk | |
| parent | 57f7841fca0b10e24a02fe624c3be18f62106121 (diff) | |
fdo#76016 Changed oox/CustomTarget_generated.mk
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
Diffstat (limited to 'oox/CustomTarget_generated.mk')
| -rw-r--r-- | oox/CustomTarget_generated.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index 14789d63b53d..d5c058d554ef 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -16,7 +16,7 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token $(oox_MISC)/vmlexport-shape-types.cxx : \ $(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 $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1) mkdir -p $(dir $@) |