From 3ef341bd5688bc7b27909ba52a224b60f23e137d Mon Sep 17 00:00:00 2001 From: hb Date: Fri, 25 Sep 2009 17:16:05 +0200 Subject: added values for factory style generation of code --- writerfilter/source/ooxml/factory_values.xsl | 79 ++++++++++++++++++++++++ writerfilter/source/ooxml/factoryimpl_ns.xsl | 3 +- writerfilter/source/ooxml/factoryimpl_values.xsl | 75 ++++++++++++++++++++++ writerfilter/source/ooxml/makefile.mk | 18 +++++- 4 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 writerfilter/source/ooxml/factory_values.xsl create mode 100644 writerfilter/source/ooxml/factoryimpl_values.xsl diff --git a/writerfilter/source/ooxml/factory_values.xsl b/writerfilter/source/ooxml/factory_values.xsl new file mode 100644 index 000000000000..a95be77fa522 --- /dev/null +++ b/writerfilter/source/ooxml/factory_values.xsl @@ -0,0 +1,79 @@ + + + + + + + + + +#ifndef INCLUDED_FACTORY_VALUES +#include <rtl/ustring.hxx> + + + +#endif // INCLUDED_FACTORY_VALUES + + diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index 53634cef9012..163e58815841 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -71,8 +71,9 @@ #include "doctok/sprmids.hxx" +#include "doctok/resourceids.hxx" #include "ooxml/resourceids.hxx" -#include "OOXMLfastresources.hxx" +#include "OOXMLFactory_values.hxx" #include "OOXMLFactory_ .hxx" diff --git a/writerfilter/source/ooxml/factoryimpl_values.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl new file mode 100644 index 000000000000..ef976809a6b8 --- /dev/null +++ b/writerfilter/source/ooxml/factoryimpl_values.xsl @@ -0,0 +1,75 @@ + + + + + + + + + +#include "OOXMLFactory_values.hxx" + + + diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk index 5913b3365663..3a4763d8aec4 100644 --- a/writerfilter/source/ooxml/makefile.mk +++ b/writerfilter/source/ooxml/makefile.mk @@ -74,7 +74,7 @@ NAMESPACES= \ SLOFASTNAMESPACES= \ $(SLO)$/OOXMLfastresources_{$(NAMESPACES)}.obj - + SLOFACTORIESNAMESPACES= \ $(SLO)$/OOXMLFactory_{$(NAMESPACES)}.obj @@ -86,6 +86,7 @@ SLOFILES= \ $(SLO)$/OOXMLBinaryObjectReference.obj\ $(SLO)$/OOXMLfastresources.obj \ $(SLO)$/OOXMLvalues.obj \ + $(SLO)$/OOXMLFactory_values.obj \ $(SLO)$/OOXMLPropertySetImpl.obj \ $(SLO)$/OOXMLParserState.obj \ $(SLO)$/Handler.obj \ @@ -95,7 +96,6 @@ SLOFILES= \ $(SLO)$/OOXMLFastContextHandler.obj \ $(SLO)$/OOXMLFastTokenHandler.obj - SHL1TARGET=$(TARGET) .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" @@ -155,6 +155,8 @@ OOXMLFASTRESOURCESIMPLXSL=fastresourcesimpl.xsl OOXMLNAMESPACEIDSXSL=namespaceids.xsl OOXMLVALUESXSL=values.xsl OOXMLVALUESIMPLXSL=valuesimpl.xsl +OOXMLFACTORYVALUESXSL=factory_values.xsl +OOXMLFACTORYVALUESIMPLXSL=factoryimpl_values.xsl OOXMLRESOURCEIDSXSL=resourceids.xsl OOXMLGPERFFASTTOKENXSL=gperffasttokenhandler.xsl @@ -171,6 +173,8 @@ OOXMLNAMESPACEIDSHXX=$(OOXMLHXXOUTDIR)$/OOXMLnamespaceids.hxx OOXMLFASTRESOURCESCXX=$(OOXMLCXXOUTDIR)$/OOXMLfastresources.cxx OOXMLVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLvalues.hxx OOXMLVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLvalues.cxx +OOXMLFACTORYVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.hxx +OOXMLFACTORYVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.cxx GPERFFASTTOKENHXX=$(OOXMLHXXOUTDIR)$/gperffasttoken.hxx MODELPROCESSED=$(MISC)$/model_preprocessed.xml @@ -180,6 +184,7 @@ OOXMLGENHEADERS= \ $(OOXMLFASTRESOURCESHXX) \ $(OOXMLFASTTOKENSHXX) \ $(OOXMLVALUESHXX) \ + $(OOXMLFACTORYVALUESHXX) \ $(OOXMLFASTRESOURCEHXXS) \ $(GPERFFASTTOKENHXX) \ $(OOXMLRESOURCEIDSHXX) \ @@ -192,6 +197,7 @@ GENERATEDFILES= \ $(OOXMLFACTORYCXXS) \ $(OOXMLFASTRESOURCECXXS) \ $(OOXMLVALUESCXX) \ + $(OOXMLFACTORYVALUESCXX) \ $(TOKENXMLTMP) \ $(TOKENXML) @@ -257,6 +263,12 @@ $(OOXMLVALUESCXX): $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) \ $(OOXMLFASTRESOURCESHXX) $(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@ +$(OOXMLFACTORYVALUESHXX): $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED) + $(XSLTPROC) $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED) > $@ + +$(OOXMLFACTORYVALUESCXX): $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED) + $(XSLTPROC) $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED) > $@ + $(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \ $(MODELPROCESSED) $(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@ @@ -280,6 +292,8 @@ $(SLO)/OOXMLfastresources.obj: $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS) $(SLO)/OOXMLvalues.obj: $(OOXMLVALUESCXX) $(OOXMLVALUESHXX) +$(SLO)/OOXMLFactory_values.obj: $(OOXMLFACTORYVALUESCXX) $(OOXMLFACTORYVALUESHXX) + $(SLO)$/OOXMLFactory_generated.obj: $(OOXMLFACTORYGENERATEDCXX) $(OOXMLGENHEADERS) $(SLOFASTNAMESPACES): OOXMLFastHelper.hxx -- cgit