strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

odfmetadata4: #i109599#,#i109600#: set xml:id _after_ inserting section/index.

Browse source
This commit is contained in:
Michael Stahl 2010-03-16 11:28:36 +01:00
parent b164e350de
commit 9fb421ee4d
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xmloff/source/text/XMLIndexTOCContext.cxx
View file

@ -201,10 +201,6 @@ void XMLIndexTOCContext::StartElement(
OUString::createFromAscii(aIndexServiceMap[eIndexType])); OUString::createFromAscii(aIndexServiceMap[eIndexType]));
if( xIfc.is() ) if( xIfc.is() )
{ {
// xml:id for RDF metadata
GetImport().SetXmlId(xIfc, sXmlId);
// get Property set // get Property set
Reference<XPropertySet> xPropSet(xIfc, UNO_QUERY); Reference<XPropertySet> xPropSet(xIfc, UNO_QUERY);
xTOCPropertySet = xPropSet; xTOCPropertySet = xPropSet;
@ -246,6 +242,9 @@ void XMLIndexTOCContext::StartElement(
return; return;
} }
// xml:id for RDF metadata
GetImport().SetXmlId(xIfc, sXmlId);
// b) insert marker and move cursor // b) insert marker and move cursor
rImport->InsertString(sMarker); rImport->InsertString(sMarker);
rImport->GetCursor()->goLeft(2, sal_False); rImport->GetCursor()->goLeft(2, sal_False);

6
xmloff/source/text/XMLSectionImportContext.cxx
View file

@ -161,9 +161,6 @@ void XMLSectionImportContext::StartElement(
// save PropertySet (for CreateChildContext) // save PropertySet (for CreateChildContext)
xSectionPropertySet = xPropSet; xSectionPropertySet = xPropSet;
// xml:id for RDF metadata
GetImport().SetXmlId(xIfc, sXmlId);
// name // name
Reference<XNamed> xNamed(xPropSet, UNO_QUERY); Reference<XNamed> xNamed(xPropSet, UNO_QUERY);
xNamed->setName(sName); xNamed->setName(sName);
@ -253,6 +250,9 @@ void XMLSectionImportContext::StartElement(
// finally, check for redlines that should start at // finally, check for redlines that should start at
// the section start node // the section start node
rHelper->RedlineAdjustStartNodeCursor(sal_True); // start ??? rHelper->RedlineAdjustStartNodeCursor(sal_True); // start ???
// xml:id for RDF metadata
GetImport().SetXmlId(xIfc, sXmlId);
} }
} }
} }