diff options
| author | David Tardon <dtardon@redhat.com> | 2014-08-03 09:51:49 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-03 09:54:48 +0200 |
| commit | 6528607d34c9a2098ff5eec051fc9299ec37dfd7 (patch) | |
| tree | 0d45cfbd7a9a3f233060d8f2f76553c8b36a54ed /writerfilter/CustomTarget_source.mk | |
| parent | 8cc566a536eb027bf5818c08526ce51632c63003 (diff) | |
Revert "writerfilter: Kill ListValueMap(s) & their construction."
Apparently there can be much more than "just a few values" in some cases
(186 in OOXMLFactory_dml_shapeGeometry::getListValue) and MSVC compiler
cannot handle if statement that deeply nested.
This reverts commit 7aa7047eb48e81bc0b32448ff0487c993fe9a4db.
Change-Id: I2b4d166e73ce1e616fea81fcfcfc9915c5784d30
Diffstat (limited to 'writerfilter/CustomTarget_source.mk')
| -rw-r--r-- | writerfilter/CustomTarget_source.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 10d74a7bef1d..6ff9c09c8bc6 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -68,6 +68,7 @@ writerfilter_GEN_ooxml_NamespaceIds_hxx=$(writerfilter_WORK)/ooxml/OOXMLnamespac writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/ooxml/token.xml +writerfilter_SRC_ooxml_FactoryValues_py=$(writerfilter_SRC)/ooxml/factory_values.py writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py writerfilter_SRC_ooxml_GperfFastTokenHandler_py=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.py writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml @@ -83,6 +84,10 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.py $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@ +$(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryValues_py) $(writerfilter_GEN_ooxml_Model_processed) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) + $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_FactoryValues_py) $(writerfilter_GEN_ooxml_Model_processed)) > $@ + $(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml) | $(writerfilter_WORK)/ooxml/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml)) > $@ |