TagLogger: added mpRoot, output from mpRoot
This commit is contained in:
parent
168d34c5ff
commit
90f3be23cd
3 changed files with 7 additions and 5 deletions
|
@ -93,6 +93,7 @@ namespace writerfilter
|
|||
private:
|
||||
stack<XMLTag::Pointer_t> mTags;
|
||||
XMLTag::Pointer_t currentTag() const;
|
||||
XMLTag::Pointer_t mpRoot;
|
||||
|
||||
TagLogger();
|
||||
|
||||
|
|
|
@ -191,6 +191,7 @@ namespace writerfilter
|
|||
{
|
||||
XMLTag::Pointer_t pTag(new XMLTag("root"));
|
||||
mTags.push(pTag);
|
||||
mpRoot = pTag;
|
||||
}
|
||||
|
||||
void TagLogger::element(const string & name)
|
||||
|
@ -262,7 +263,7 @@ namespace writerfilter
|
|||
|
||||
ostream & TagLogger::output(ostream & o) const
|
||||
{
|
||||
return currentTag()->output(o);
|
||||
return mpRoot->output(o);
|
||||
}
|
||||
|
||||
void TagLogger::dump(const char * name)
|
||||
|
|
|
@ -108,7 +108,7 @@ OOXMLPREPROCESSXSL=..$/ooxml$/modelpreprocess.xsl
|
|||
OOXMLQNAMETOSTRXSL=..$/ooxml$/qnametostr.xsl
|
||||
OOXMLANALYZERXSL=..$/ooxml$/analyzer.xsl
|
||||
OOXMLRESOURCEIDSXSL=..$/ooxml$/resourceids.xsl
|
||||
OOXMLRESOURCESTOOLSXSL=..$/ooxml$/resourcestools.xsl
|
||||
OOXMLFACTORYTOOLSXSL=..$/ooxml$/factorytools.xsl
|
||||
DOCTOKMODEL=..$/doctok$/resources.xmi
|
||||
DOCTOKQNAMETOSTRXSL=..$/doctok$/qnametostr.xsl
|
||||
DOCTOKANALYZERXSL=..$/doctok$/analyzer.xsl
|
||||
|
@ -144,7 +144,7 @@ $(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED)
|
|||
$(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL)
|
||||
$(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
|
||||
|
||||
$(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLRESOURCESTOOLSXSL) $(DOCTOKRESOURCETOOLS)
|
||||
$(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLFACTORYTOOLSXSL) $(DOCTOKRESOURCETOOLS)
|
||||
$(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
|
||||
$(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL)
|
||||
$(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
|
||||
|
@ -168,10 +168,10 @@ $(OOXMLHXXOUTDIRCREATED):
|
|||
$(MKDIRHIER) $(OOXMLHXXOUTDIR)
|
||||
$(TOUCH) $@
|
||||
|
||||
$(MODELPROCESSED): $(OOXMLMODEL) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLPREPROCESSXSL)
|
||||
$(MODELPROCESSED): $(OOXMLMODEL) $(OOXMLFACTORYTOOLSXSL) $(OOXMLPREPROCESSXSL)
|
||||
$(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@
|
||||
|
||||
$(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
|
||||
$(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLFACTORYTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
|
||||
$(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
|
||||
|
||||
$(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
|
||||
|
|
Loading…
Reference in a new issue