diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 15:05:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 15:05:48 +0000 |
| commit | e76b7fdcbddca7977b8720b6e6fcc96ffc797a7b (patch) | |
| tree | 4321c6a3fe657384e83d1d42a4c6d2eb71ab91ab /xmloff | |
| parent | b56b09c08791181c5775fcfa18e0e4417f1d7633 (diff) | |
INTEGRATION: CWS odfmetadata (1.6.50); FILE MERGED
2008/06/19 17:06:57 mst 1.6.50.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/XMLTextMarkImportContext.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index 429681e35aeb..23e05ac3a20a 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLTextMarkImportContext.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -84,13 +84,15 @@ public: const ::rtl::OUString& sServiceName, const ::rtl::OUString& sMarkName, const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & rRange); + ::com::sun::star::text::XTextRange> & rRange, + const ::rtl::OUString& i_rXmlId = ::rtl::OUString()); static sal_Bool FindName( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList, - ::rtl::OUString& sName); + ::rtl::OUString& sName, + ::rtl::OUString& o_rXmlId); }; #endif |