summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-07-01 15:05:04 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-07-01 15:05:04 +0000
commitb56b09c08791181c5775fcfa18e0e4417f1d7633 (patch)
treee3a2f722fe05226c8058fd0e1f81594b51faf1a4 /xmloff
parent8fa8f4857d9e9ecc35cb264e58d6f1c26464c046 (diff)
INTEGRATION: CWS odfmetadata (1.10.48); FILE MERGED
2008/06/25 09:59:51 mst 1.10.48.2: RESYNC: (1.10-1.11); FILE MERGED 2008/06/19 17:06:57 mst 1.10.48.1: #i90620#: import xml:id in text elements - xmloff/source/text/XMLIndexTOCContext.cxx: + XMLIndexTOCContext::StartElement(): attribute xml:id - xmloff/source/text/XMLSectionImportContext{.hxx,.cxx}: + XMLSectionToken: new token: XML_TOK_SECTION_XMLID + XMLSectionImportContext::ProcessAttributes(): attribute xml:id - xmloff/source/text/XMLTextListBlockContext{.hxx,.cxx}: + XMLTextListBlockContext::XMLTextListBlockContext(): attribute xml:id - xmloff/source/text/XMLTextListItemContext.cxx: + XMLTextListItemContext::XMLTextListItemContext(): attribute xml:id - xmloff/source/text/XMLTextMarkImportContext{.hxx,.cxx}: + refactor methods to pass XmlId around + XMLTextMarkImportContext::FindName(): attribute xml:id - xmloff/source/text/txtparai{.hxx,.cxx}: + new class XMLMetaImportContext + XMLImpSpanContext_Impl::CreateChildContext(): handle TEXT_META and (provisionally) TEXT_META_FIELD + XMLParaContext::XMLParaContext(): attribute xml:id
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/XMLTextListItemContext.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index cffb597301ec..45b8b88d3248 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: XMLTextListItemContext.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -130,6 +130,12 @@ XMLTextListItemContext::XMLTextListItemContext(
}
}
// <--
+ else if ( (XML_NAMESPACE_XML == nPrefix) &&
+ IsXMLToken(aLocalName, XML_ID) )
+ {
+ (void) rValue;
+//FIXME: there is no UNO API for list items
+ }
}
DBG_ASSERT( !rTxtImport.GetListItem(),