CWS-TOOLING: integrate CWS odfmetadata2

2009-06-22 11:48:36 +0200 mst  r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst  r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst  r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst  r271957 : fix typos
2009-05-15 17:28:57 +0200 mst  r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst  r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst  r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst  r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst  r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst  r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst  r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst  r271444 : trivial
2009-04-22 13:30:37 +0200 mst  r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst  r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst  r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst  r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst  r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst  r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst  r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst  r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst  r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst  r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst  r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst  r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst  r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst  r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst  r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst  r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst  r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst  r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst  r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst  r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst  r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst  r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst  r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst  r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst  r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst  r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst  r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst  r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst  r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst  r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst  r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst  r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+  someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst  r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst  r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous  virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst  r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl:  attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext:  attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl:  attribute xml:id
+ SwXMLTableContext::SwXMLTableContext:  attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst  r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst  r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst  r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst  r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst  r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst  r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst  r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst  r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst  r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst  r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed

6 files changed, 480 insertions, 105 deletions

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 04201990b797..1091636c9d3f 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -308,39 +308,57 @@ Reference<XInterface> XMLTextMarkImportContext::CreateAndInsertMark(
     const OUString& i_rXmlId)
 {
     // create mark
-    Reference<XMultiServiceFactory> xFactory(rImport.GetModel(),UNO_QUERY);
-    if( xFactory.is() )
+    const Reference<XMultiServiceFactory> xFactory(rImport.GetModel(),
+        UNO_QUERY);
+    Reference<XInterface> xIfc;
+
+    if (xFactory.is())
     {
-        Reference<XInterface> xIfc = xFactory->createInstance(sServiceName);
+        xIfc = xFactory->createInstance(sServiceName);
 
-        // set name
-        Reference<XNamed> xNamed(xIfc, UNO_QUERY);
+        if (!xIfc.is())
+        {
+            OSL_ENSURE(false, "CreateAndInsertMark: cannot create service?");
+            return 0;
+        }
+
+        // set name (unless there is no name (text:meta))
+        const Reference<XNamed> xNamed(xIfc, UNO_QUERY);
         if (xNamed.is())
         {
             xNamed->setName(sMarkName);
+        }
+        else
+        {
+            if (sMarkName.getLength())
+            {
+                OSL_ENSURE(false, "name given, but XNamed not supported?");
+                return 0;
+            }
+        }
 
-            // xml:id for RDF metadata
-            rImport.SetXmlId(xIfc, i_rXmlId);
+        // xml:id for RDF metadata
+        rImport.SetXmlId(xIfc, i_rXmlId);
 
-            // cast to XTextContent and attach to document
-            Reference<XTextContent> xTextContent(xIfc, UNO_QUERY);
-            if (xTextContent.is())
+        // cast to XTextContent and attach to document
+        const Reference<XTextContent> xTextContent(xIfc, UNO_QUERY);
+        if (xTextContent.is())
+        {
+            try
             {
-                try
-                {
                 // if inserting marks, bAbsorb==sal_False will cause
                 // collapsing of the given XTextRange.
-                    rImport.GetTextImport()->GetText()->insertTextContent(rRange,
-                        xTextContent, sal_True);
-                }
-                catch (com::sun::star::lang::IllegalArgumentException e)
-                {
-                    // ignore
-                }
+                rImport.GetTextImport()->GetText()->insertTextContent(rRange,
+                    xTextContent, sal_True);
+            }
+            catch (com::sun::star::lang::IllegalArgumentException &)
+            {
+                OSL_ENSURE(false, "CreateAndInsertMark: cannot insert?");
+                return 0;
             }
         }
-        return xIfc;
-    } else return NULL;
+    }
+    return xIfc;
 }
 
 sal_Bool XMLTextMarkImportContext::FindName(
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index a77e49925554..873a4a42f02c 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -44,9 +44,6 @@
 #include <xmloff/xmlnume.hxx>
 #include "numehelp.hxx"
 
-#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX
-#include <xmloff/maptypes.hxx>
-#endif
 #include <xmloff/families.hxx>
 #include <xmloff/XMLEventExport.hxx>
 #include "XMLTextCharStyleNamesElementExport.hxx"
@@ -65,9 +62,7 @@
 #include <com/sun/star/text/XDependentTextField.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 
-#ifndef _COM_SUN_STAR_TEXT_SETVARIABLETYPE_HPP
 #include <com/sun/star/text/SetVariableType.hpp>
-#endif
 #include <com/sun/star/text/PlaceholderType.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
 #include <com/sun/star/text/ChapterFormat.hpp>
@@ -78,6 +73,7 @@
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/text/BibliographyDataType.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/rdf/XMetadatable.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
@@ -152,6 +148,7 @@ static sal_Char __READONLY_DATA FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography";
 static sal_Char __READONLY_DATA FIELD_SERVICE_SCRIPT[] = "Script";
 static sal_Char __READONLY_DATA FIELD_SERVICE_ANNOTATION[] = "Annotation";
 static sal_Char __READONLY_DATA FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters";
+static sal_Char __READONLY_DATA FIELD_SERVICE_META[] = "MetaField";
 static sal_Char __READONLY_DATA FIELD_SERVICE_MEASURE[] = "Measure";
 static sal_Char __READONLY_DATA FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula";
 static sal_Char __READONLY_DATA FIELD_SERVICE_DROP_DOWN[] = "DropDown";
@@ -219,6 +216,7 @@ SvXMLEnumStringMapEntry __READONLY_DATA aFieldServiceNameMapping[] =
     ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_ANNOTATION, FIELD_ID_ANNOTATION ),
 
     ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_COMBINED_CHARACTERS, FIELD_ID_COMBINED_CHARACTERS ),
+    ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_META, FIELD_ID_META ),
 
     // non-writer fields
     ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SHEET_NAME, FIELD_ID_SHEET_NAME ),
@@ -604,6 +602,7 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName(
         case FIELD_ID_TEMPLATE_NAME:
         case FIELD_ID_CHAPTER:
         case FIELD_ID_FILE_NAME:
+        case FIELD_ID_META:
         case FIELD_ID_SHEET_NAME:
         case FIELD_ID_MEASURE:
         case FIELD_ID_URL:
@@ -646,6 +645,9 @@ sal_Bool XMLTextFieldExport::IsStringField(
         return !bRet;
     }
 
+    case FIELD_ID_META://FIXME ?????? no idea...
+        return 0 > GetIntProperty(sPropertyNumberFormat, xPropSet);
+
     case FIELD_ID_DATABASE_DISPLAY:
         // TODO: depends on... ???
         // workaround #no-bug#: no data type
@@ -738,7 +740,7 @@ sal_Bool XMLTextFieldExport::IsStringField(
 /// export the styles needed by the given field. Called on first pass
 /// through document
 void XMLTextFieldExport::ExportFieldAutoStyle(
-    const Reference<XTextField> & rTextField)
+    const Reference<XTextField> & rTextField, sal_Bool bProgress )
 {
     // get property set
     Reference<XPropertySet> xPropSet(rTextField, UNO_QUERY);
@@ -831,6 +833,10 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
         }
         break;
 
+    case FIELD_ID_META:
+        // recurse into content (does not export element, so can be done first)
+        ExportMetaField(xPropSet, true, bProgress);
+        // fall-through: for the meta-field itself!
     case FIELD_ID_DOCINFO_PRINT_TIME:
     case FIELD_ID_DOCINFO_PRINT_DATE:
     case FIELD_ID_DOCINFO_CREATION_DATE:
@@ -948,7 +954,8 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
 }
 
 /// export the given field to XML. Called on second pass through document
-void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField )
+void XMLTextFieldExport::ExportField(
+    const Reference<XTextField> & rTextField, sal_Bool bProgress )
 {
     // get property set
     Reference<XPropertySet> xPropSet(rTextField, UNO_QUERY);
@@ -1026,7 +1033,8 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField )
                                   sal_False, sal_False);
 
         // finally, export the field itself
-        ExportFieldHelper( rTextField, xPropSet, xRangePropSet, nToken );
+        ExportFieldHelper( rTextField, xPropSet, xRangePropSet, nToken,
+            bProgress );
     }
 }
 
@@ -1035,7 +1043,8 @@ void XMLTextFieldExport::ExportFieldHelper(
     const Reference<XTextField> & rTextField,
     const Reference<XPropertySet> & rPropSet,
     const Reference<XPropertySet> &,
-    enum FieldIdEnum nToken)
+    enum FieldIdEnum nToken,
+    sal_Bool bProgress )
 {
     // get property set info (because some attributes are not support
     // in all implementations)
@@ -1738,11 +1747,17 @@ void XMLTextFieldExport::ExportFieldHelper(
     {
         // The style with the combined characters attribute has
         // already been handled in the ExportField method. So all that
-        // is left to do now is to exprot the characters.
+        // is left to do now is to export the characters.
         GetExport().Characters(sPresentation);
         break;
     }
 
+    case FIELD_ID_META:
+    {
+        ExportMetaField(rPropSet, false, bProgress);
+        break;
+    }
+
     case FIELD_ID_MEASURE:
     {
         ProcessString(XML_KIND, MapMeasureKind(GetInt16Property(sPropertyMeasureKind, rPropSet)));
@@ -2248,6 +2263,47 @@ void XMLTextFieldExport::ExportMacro(
     GetExport().Characters(rContent);
 }
 
+// FIXME: this is untested
+void XMLTextFieldExport::ExportMetaField(
+    const Reference<XPropertySet> & i_xMeta,
+    bool i_bAutoStyles, sal_Bool i_bProgress )
+{
+    bool doExport(!i_bAutoStyles); // do not export element if autostyles
+    // check version >= 1.2
+    switch (GetExport().getDefaultVersion()) {
+        case SvtSaveOptions::ODFVER_011: // fall thru
+        case SvtSaveOptions::ODFVER_010: doExport = false; break;
+        default: break;
+    }
+
+    const Reference < XEnumerationAccess > xEA( i_xMeta, UNO_QUERY_THROW );
+    const Reference < XEnumeration > xTextEnum( xEA->createEnumeration() );
+
+    if (doExport)
+    {
+        const Reference<rdf::XMetadatable> xMeta( i_xMeta, UNO_QUERY_THROW );
+
+        // style:data-style-name
+        ProcessValueAndType(sal_False,
+            GetIntProperty(sPropertyNumberFormat, i_xMeta),
+            sEmpty, sEmpty, 0.0, sal_False, sal_False, sal_True,
+            sal_False, sal_False /*, sal_False*/ );
+
+        // text:meta-field without xml:id is invalid
+        xMeta->ensureMetadataReference();
+
+        // xml:id for RDF metadata
+        GetExport().AddAttributeXmlId(xMeta);
+    }
+
+    SvXMLElementExport aElem( GetExport(), doExport,
+        XML_NAMESPACE_TEXT, XML_META_FIELD, sal_False, sal_False );
+
+    // recurse to export content
+    GetExport().GetTextParagraphExport()->
+        exportTextRangeEnumeration( xTextEnum, i_bAutoStyles, i_bProgress );
+}
+
 /// export all data-style related attributes
 void XMLTextFieldExport::ProcessValueAndType(
     sal_Bool bIsString,     /// do we process a string or a number?
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 04ac465daa3f..e47c3aae262b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -327,7 +327,11 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
 
 static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
 {
-    { XML_NAMESPACE_XML , XML_ID,           XML_TOK_TEXT_P_XMLID },
+    { XML_NAMESPACE_XML  , XML_ID,          XML_TOK_TEXT_P_XMLID },
+    { XML_NAMESPACE_XHTML, XML_ABOUT,       XML_TOK_TEXT_P_ABOUT },
+    { XML_NAMESPACE_XHTML, XML_PROPERTY,    XML_TOK_TEXT_P_PROPERTY },
+    { XML_NAMESPACE_XHTML, XML_CONTENT,     XML_TOK_TEXT_P_CONTENT },
+    { XML_NAMESPACE_XHTML, XML_DATATYPE,    XML_TOK_TEXT_P_DATATYPE },
     { XML_NAMESPACE_TEXT, XML_STYLE_NAME,   XML_TOK_TEXT_P_STYLE_NAME },
     { XML_NAMESPACE_TEXT, XML_COND_STYLE_NAME,
                                             XML_TOK_TEXT_P_COND_STYLE_NAME },
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 2617a8ff0089..25f4066be40c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -65,15 +65,11 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp>
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
@@ -111,28 +107,23 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "txtflde.hxx"
-#ifndef _XMLOFF_TXTPRMAP_HXX
 #include <xmloff/txtprmap.hxx>
-#endif
 #include "XMLImageMapExport.hxx"
 #include "XMLTextNumRuleInfo.hxx"
 #include "XMLTextListAutoStylePool.hxx"
-#ifndef _XMLOFF_TXTPARAE_HXX
 #include <xmloff/txtparae.hxx>
-#endif
 #include "XMLSectionExport.hxx"
 #include "XMLIndexMarkExport.hxx"
 #include <xmloff/XMLEventExport.hxx>
 #include "XMLRedlineExport.hxx"
-#ifndef _XMLOFF_MULTIPROPERTYSETHELPER_HXX
 #include "MultiPropertySetHelper.hxx"
-#endif
 #include <xmloff/formlayerexport.hxx>
 #include "XMLTextCharStyleNamesElementExport.hxx"
 
 // --> OD 2008-04-25 #refactorlists#
 #include <txtlists.hxx>
 // <--
+#include <com/sun/star/rdf/XMetadatable.hpp>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -1460,7 +1451,8 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
         {
             Any aAny = xTextFieldsEnum->nextElement();
             Reference< XTextField > xTextField = *(Reference<XTextField>*)aAny.getValue();
-            exportTextField( xTextField->getAnchor(), bAutoStyles );
+            exportTextField( xTextField->getAnchor(), bAutoStyles,
+                bIsProgress );
             try
             {
                 Reference < XPropertySet > xSet( xTextField, UNO_QUERY );
@@ -1905,6 +1897,7 @@ void XMLTextParagraphExport::exportParagraph(
         {
             // xml:id for RDF metadata
             GetExport().AddAttributeXmlId(rTextContent);
+            GetExport().AddAttributesRDFa(rTextContent);
 
             OUString sStyle;
             if( rPropSetHelper.hasProperty( PARA_STYLE_NAME ) )
@@ -2142,6 +2135,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
         sal_Bool bAutoStyles, sal_Bool bIsProgress,
         sal_Bool bPrvChrIsSpc )
 {
+    static OUString sMeta(RTL_CONSTASCII_USTRINGPARAM("Meta")); // FIXME
     sal_Bool bPrevCharIsSpace = bPrvChrIsSpc;
 
     while( rTextEnum->hasMoreElements() )
@@ -2162,7 +2156,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             }
             else if( sType.equals(sTextField))
             {
-                exportTextField( xTxtRange, bAutoStyles );
+                exportTextField( xTxtRange, bAutoStyles, bIsProgress );
                 bPrevCharIsSpace = sal_False;
             }
             else if( sType.equals( sFrame ) )
@@ -2217,6 +2211,10 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             {
                 exportRuby(xPropSet, bAutoStyles);
             }
+            else if (sType.equals(sMeta))
+            {
+                exportMeta(xPropSet, bAutoStyles, bIsProgress);
+            }
             else if (sType.equals(sTextFieldStart))
             {
                 Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
@@ -2286,7 +2284,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             Reference<XServiceInfo> xServiceInfo( xTxtRange, UNO_QUERY );
             if( xServiceInfo->supportsService( sTextFieldService ) )
             {
-                exportTextField( xTxtRange, bAutoStyles );
+                exportTextField( xTxtRange, bAutoStyles, bIsProgress );
                 bPrevCharIsSpace = sal_False;
             }
             else
@@ -2308,7 +2306,7 @@ void XMLTextParagraphExport::exportTable(
 
 void XMLTextParagraphExport::exportTextField(
         const Reference < XTextRange > & rTextRange,
-        sal_Bool bAutoStyles )
+        sal_Bool bAutoStyles, sal_Bool bIsProgress )
 {
     Reference < XPropertySet > xPropSet( rTextRange, UNO_QUERY );
     // non-Writer apps need not support Property TextField, so test first
@@ -2320,11 +2318,11 @@ void XMLTextParagraphExport::exportTextField(
         {
             if( bAutoStyles )
             {
-                pFieldExport->ExportFieldAutoStyle( xTxtFld );
+                pFieldExport->ExportFieldAutoStyle( xTxtFld, bIsProgress );
             }
             else
             {
-                pFieldExport->ExportField( xTxtFld );
+                pFieldExport->ExportField( xTxtFld, bIsProgress );
             }
         }
         else
@@ -3634,7 +3632,41 @@ void XMLTextParagraphExport::exportRuby(
     }
 }
 
+// FIXME: this is untested
+void XMLTextParagraphExport::exportMeta(
+    const Reference<XPropertySet> & i_xMeta,
+    sal_Bool i_bAutoStyles, sal_Bool i_isProgress)
+{
+    bool doExport(!i_bAutoStyles); // do not export element if autostyles
+    // check version >= 1.2
+    switch (GetExport().getDefaultVersion()) {
+        case SvtSaveOptions::ODFVER_011: // fall thru
+        case SvtSaveOptions::ODFVER_010: doExport = false; break;
+        default: break;
+    }
 
+    const Reference < XEnumerationAccess > xEA( i_xMeta, UNO_QUERY_THROW );
+    const Reference < XEnumeration > xTextEnum( xEA->createEnumeration() );
+
+    if (doExport)
+    {
+        const Reference<rdf::XMetadatable> xMeta( i_xMeta, UNO_QUERY_THROW );
+        const Reference<XTextContent> xTextContent( i_xMeta, UNO_QUERY_THROW );
+
+        // text:meta with neither xml:id nor RDFa is invalid
+        xMeta->ensureMetadataReference();
+
+        // xml:id and RDFa for RDF metadata
+        GetExport().AddAttributeXmlId(xMeta);
+        GetExport().AddAttributesRDFa(xTextContent);
+    }
+
+    SvXMLElementExport aElem( GetExport(), doExport,
+        XML_NAMESPACE_TEXT, XML_META, sal_False, sal_False );
+
+    // recurse to export content
+    exportTextRangeEnumeration( xTextEnum, i_bAutoStyles, i_isProgress );
+}
 
 
 void XMLTextParagraphExport::PreventExportOfControlsInMuteSections(
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 31d2891f9f79..6fb213f43642 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -671,34 +671,33 @@ SvXMLImportContext *XMLImpRubyContext_Impl::CreateChildContext(
 
 // ---------------------------------------------------------------------
 
-/** text:meta and text:meta-field
-//FIXME neither finished nor tested
+/** for text:meta and text:meta-field
+//FIXME not tested
  */
-class XMLMetaImportContext : public SvXMLImportContext
+class XMLMetaImportContextBase : public SvXMLImportContext
 {
-    XMLHints_Impl&    mrHints;
-//    XMLStyleHint_Impl    *pHint;
+    XMLHints_Impl&    m_rHints;
 
-    sal_Bool& mrIgnoreLeadingSpace;
+    sal_Bool& m_rIgnoreLeadingSpace;
 
     /// start position
-    Reference<XTextRange> mxStart;
+    Reference<XTextRange> m_xStart;
 
-    OUString mXmlId;
+protected:
+    OUString m_XmlId;
 
 public:
     TYPEINFO();
 
-    XMLMetaImportContext(
+    XMLMetaImportContextBase(
         SvXMLImport& i_rImport,
         sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         const Reference< xml::sax::XAttributeList > & i_xAttrList,
-//        enum XMLTextPElemTokens nTok,
         XMLHints_Impl& i_rHints,
         sal_Bool & i_rIgnoreLeadingSpace );
 
-    virtual ~XMLMetaImportContext();
+    virtual ~XMLMetaImportContextBase();
 
     virtual void EndElement();
 
@@ -707,25 +706,30 @@ public:
             const Reference< xml::sax::XAttributeList > & i_xAttrList );
 
     virtual void Characters( const OUString& i_rChars );
+
+    virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
+        OUString const & i_rLocalName, OUString const & i_rValue);
+
+    virtual void InsertMeta(const Reference<XTextRange> & i_xInsertionRange)
+        = 0;
 };
 
-TYPEINIT1( XMLMetaImportContext , SvXMLImportContext );
+TYPEINIT1( XMLMetaImportContextBase, SvXMLImportContext );
 
-XMLMetaImportContext::XMLMetaImportContext(
+XMLMetaImportContextBase::XMLMetaImportContextBase(
         SvXMLImport& i_rImport,
         sal_uInt16 i_nPrefix,
         const OUString& i_rLocalName,
         const Reference< xml::sax::XAttributeList > & i_xAttrList,
         XMLHints_Impl& i_rHints,
         sal_Bool & i_rIgnoreLeadingSpace )
-    :   SvXMLImportContext( i_rImport, i_nPrefix, i_rLocalName ),
-        mrHints( i_rHints ),
-        mrIgnoreLeadingSpace( i_rIgnoreLeadingSpace ),
-        mxStart()
+    : SvXMLImportContext( i_rImport, i_nPrefix, i_rLocalName )
+    , m_rHints( i_rHints )
+    , m_rIgnoreLeadingSpace( i_rIgnoreLeadingSpace )
+    , m_xStart()
 {
-//FIXME: RDFa (text:meta)
     const sal_Int16 nAttrCount(i_xAttrList.is() ? i_xAttrList->getLength() : 0);
-    for( sal_Int16 i=0; i < nAttrCount; i++ )
+    for ( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rAttrName( i_xAttrList->getNameByIndex( i ) );
         const OUString& rValue( i_xAttrList->getValueByIndex( i ) );
@@ -734,49 +738,61 @@ XMLMetaImportContext::XMLMetaImportContext(
         sal_uInt16 nPrefix =
             GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
                                                             &sLocalName );
-// FIXME: only meta-field
-        if( XML_NAMESPACE_TEXT == nPrefix &&
-            IsXMLToken( sLocalName, XML_DATA_STYLE_NAME ) )
-        {
-//            pHint->SetStyleName( rValue );
-            break;
-        }
-        else if ( (XML_NAMESPACE_XML == nPrefix) &&
-             IsXMLToken(sLocalName, XML_ID)   )
-        {
-            mXmlId = rValue;
-        }
+        ProcessAttribute(nPrefix, sLocalName, rValue);
     }
-    //FIXME meta-field xml:id mandatory
-    mxStart = GetImport().GetTextImport()->GetCursorAsRange()->getStart();
+    m_xStart = GetImport().GetTextImport()->GetCursorAsRange()->getStart();
 }
 
-XMLMetaImportContext::~XMLMetaImportContext()
+XMLMetaImportContextBase::~XMLMetaImportContextBase()
 {
 }
 
-void XMLMetaImportContext::EndElement()
+void XMLMetaImportContextBase::EndElement()
 {
-    OSL_ENSURE(mxStart.is(), "no mxStart?");
+    OSL_ENSURE(m_xStart.is(), "no mxStart?");
+    if (!m_xStart.is()) return;
 
-    Reference<XTextRange> xEndRange(
+    const Reference<XTextRange> xEndRange(
         GetImport().GetTextImport()->GetCursorAsRange()->getStart() );
 
     // create range for insertion
-    Reference<XTextCursor> xInsertionCursor(
+    const Reference<XTextCursor> xInsertionCursor(
         GetImport().GetTextImport()->GetText()->createTextCursorByRange(
             xEndRange) );
-    xInsertionCursor->gotoRange(mxStart, sal_True);
+    xInsertionCursor->gotoRange(m_xStart, sal_True);
 
-    Reference<XTextRange> xInsertionRange(xInsertionCursor, UNO_QUERY);
+    const Reference<XTextRange> xInsertionRange(xInsertionCursor, UNO_QUERY);
 
-    OUString sName;
+    InsertMeta(xInsertionRange);
 //FIXME
-    // insert bookmark
-//    XMLTextMarkImportContext::CreateAndInsertMark
+#if 0
+    Reference<XMultiServiceFactory> xFactory(rImport.GetModel(), UNO_QUERY);
+    if ( xFactory.is() )
+    {
+        Reference<XInterface> xIfc = xFactory->createInstance(sServiceName);
+
+        // xml:id for RDF metadata
+        rImport.SetXmlId(xIfc, i_rXmlId);
+
+        // cast to XTextContent and attach to document
+        Reference<XTextContent> xTextContent(xIfc, UNO_QUERY);
+        if (xTextContent.is())
+        {
+            try
+            {
+                rImport.GetTextImport()->GetText()->insertTextContent(
+                    xInsertionRange, xTextContent, sal_True);
+            }
+            catch (com::sun::star::lang::IllegalArgumentException &)
+            {
+                OSL_ENSURE(false, "XMLMetaImportContext::EndElement: iae");
+            }
+        }
+    }
+#endif
 }
 
-SvXMLImportContext * XMLMetaImportContext::CreateChildContext(
+SvXMLImportContext * XMLMetaImportContextBase::CreateChildContext(
             sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
             const Reference< xml::sax::XAttributeList > & i_xAttrList )
 {
@@ -785,15 +801,236 @@ SvXMLImportContext * XMLMetaImportContext::CreateChildContext(
     sal_uInt16 nToken = rTokenMap.Get( i_nPrefix, i_rLocalName );
 
     return XMLImpSpanContext_Impl::CreateChildContext( GetImport(), i_nPrefix,
-        i_rLocalName, i_xAttrList, nToken, mrHints, mrIgnoreLeadingSpace );
+        i_rLocalName, i_xAttrList, nToken, m_rHints, m_rIgnoreLeadingSpace );
 }
 
-void XMLMetaImportContext::Characters( const OUString& i_rChars )
+void XMLMetaImportContextBase::Characters( const OUString& i_rChars )
 {
-    //FIXME do we need to call ConvertStarFonts?
-    GetImport().GetTextImport()->InsertString( i_rChars, mrIgnoreLeadingSpace );
+    GetImport().GetTextImport()->InsertString(i_rChars, m_rIgnoreLeadingSpace);
 }
 
+void XMLMetaImportContextBase::ProcessAttribute(sal_uInt16 const i_nPrefix,
+    OUString const & i_rLocalName, OUString const & i_rValue)
+{
+    if ( (XML_NAMESPACE_XML == i_nPrefix) &&
+         IsXMLToken(i_rLocalName, XML_ID)   )
+    {
+        m_XmlId = i_rValue;
+    }
+}
+
+
+// ---------------------------------------------------------------------
+
+/** text:meta
+//FIXME not tested
+ */
+class XMLMetaImportContext : public XMLMetaImportContextBase
+{
+    // RDFa
+    bool m_bHaveAbout;
+    ::rtl::OUString m_sAbout;
+    ::rtl::OUString m_sProperty;
+    ::rtl::OUString m_sContent;
+    ::rtl::OUString m_sDatatype;
+
+public:
+    TYPEINFO();
+
+    XMLMetaImportContext(
+        SvXMLImport& i_rImport,
+        sal_uInt16 i_nPrefix,
+        const OUString& i_rLocalName,
+        const Reference< xml::sax::XAttributeList > & i_xAttrList,
+        XMLHints_Impl& i_rHints,
+        sal_Bool & i_rIgnoreLeadingSpace );
+
+    virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
+        OUString const & i_rLocalName, OUString const & i_rValue);
+
+    virtual void InsertMeta(const Reference<XTextRange> & i_xInsertionRange);
+};
+
+TYPEINIT1( XMLMetaImportContext, XMLMetaImportContextBase );
+
+XMLMetaImportContext::XMLMetaImportContext(
+        SvXMLImport& i_rImport,
+        sal_uInt16 i_nPrefix,
+        const OUString& i_rLocalName,
+        const Reference< xml::sax::XAttributeList > & i_xAttrList,
+        XMLHints_Impl& i_rHints,
+        sal_Bool & i_rIgnoreLeadingSpace )
+    : XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
+            i_xAttrList, i_rHints, i_rIgnoreLeadingSpace )
+    , m_bHaveAbout(false)
+{
+}
+
+void XMLMetaImportContext::ProcessAttribute(sal_uInt16 const i_nPrefix,
+    OUString const & i_rLocalName, OUString const & i_rValue)
+{
+    if ( XML_NAMESPACE_XHTML == i_nPrefix )
+    {
+        // RDFa
+        if ( IsXMLToken( i_rLocalName, XML_ABOUT) )
+        {
+            m_sAbout = i_rValue;
+            m_bHaveAbout = true;
+        }
+        else if ( IsXMLToken( i_rLocalName, XML_PROPERTY) )
+        {
+            m_sProperty = i_rValue;
+        }
+        else if ( IsXMLToken( i_rLocalName, XML_CONTENT) )
+        {
+            m_sContent = i_rValue;
+        }
+        else if ( IsXMLToken( i_rLocalName, XML_DATATYPE) )
+        {
+            m_sDatatype = i_rValue;
+        }
+    }
+    else
+    {
+        XMLMetaImportContextBase::ProcessAttribute(
+            i_nPrefix, i_rLocalName, i_rValue);
+    }
+}
+
+void XMLMetaImportContext::InsertMeta(
+    const Reference<XTextRange> & i_xInsertionRange)
+{
+    OSL_ENSURE(!m_bHaveAbout == !m_sProperty.getLength(),
+        "XMLMetaImportContext::InsertMeta: invalid RDFa?");
+    if (m_XmlId.getLength() || (m_bHaveAbout && m_sProperty.getLength()))
+    {
+        // insert mark
+        const uno::Reference<rdf::XMetadatable> xMeta(
+            XMLTextMarkImportContext::CreateAndInsertMark(
+                GetImport(),
+                OUString::createFromAscii(
+                    "com.sun.star.text.InContentMetadata"),
+                OUString(),
+                i_xInsertionRange, m_XmlId),
+            uno::UNO_QUERY);
+        OSL_ENSURE(xMeta.is(), "cannot insert Meta?");
+
+        if (xMeta.is() && m_bHaveAbout)
+        {
+            GetImport().AddRDFa(xMeta,
+                m_sAbout, m_sProperty, m_sContent, m_sDatatype);
+        }
+    }
+    else
+    {
+        OSL_TRACE("invalid <text:meta>: no xml:id, no valid RDFa");
+    }
+}
+
+// ---------------------------------------------------------------------
+
+/** text:meta-field
+//FIXME not tested
+ */
+class XMLMetaFieldImportContext : public XMLMetaImportContextBase
+{
+    OUString m_DataStyleName;
+
+public:
+    TYPEINFO();
+
+    XMLMetaFieldImportContext(
+        SvXMLImport& i_rImport,
+        sal_uInt16 i_nPrefix,
+        const OUString& i_rLocalName,
+        const Reference< xml::sax::XAttributeList > & i_xAttrList,
+        XMLHints_Impl& i_rHints,
+        sal_Bool & i_rIgnoreLeadingSpace );
+
+    virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
+        OUString const & i_rLocalName, OUString const & i_rValue);
+
+    virtual void InsertMeta(const Reference<XTextRange> & i_xInsertionRange);
+};
+
+TYPEINIT1( XMLMetaFieldImportContext, XMLMetaImportContextBase );
+
+XMLMetaFieldImportContext::XMLMetaFieldImportContext(
+        SvXMLImport& i_rImport,
+        sal_uInt16 i_nPrefix,
+        const OUString& i_rLocalName,
+        const Reference< xml::sax::XAttributeList > & i_xAttrList,
+        XMLHints_Impl& i_rHints,
+        sal_Bool & i_rIgnoreLeadingSpace )
+    : XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
+            i_xAttrList, i_rHints, i_rIgnoreLeadingSpace )
+{
+}
+
+void XMLMetaFieldImportContext::ProcessAttribute(sal_uInt16 const i_nPrefix,
+    OUString const & i_rLocalName, OUString const & i_rValue)
+{
+    if( XML_NAMESPACE_STYLE == i_nPrefix &&
+        IsXMLToken( i_rLocalName, XML_DATA_STYLE_NAME ) )
+    {
+        m_DataStyleName = i_rValue;
+    }
+    else
+    {
+        XMLMetaImportContextBase::ProcessAttribute(
+            i_nPrefix, i_rLocalName, i_rValue);
+    }
+}
+
+void XMLMetaFieldImportContext::InsertMeta(
+    const Reference<XTextRange> & i_xInsertionRange)
+{
+    if (m_XmlId.getLength()) // valid?
+    {
+        // insert mark
+        const Reference<XPropertySet> xPropertySet(
+            XMLTextMarkImportContext::CreateAndInsertMark(
+                GetImport(),
+                OUString::createFromAscii(
+                    "com.sun.star.text.textfield.MetadataField"),
+                OUString(),
+                i_xInsertionRange, m_XmlId),
+            UNO_QUERY);
+        OSL_ENSURE(xPropertySet.is(), "cannot insert MetaField?");
+        if (!xPropertySet.is()) return;
+
+        if (m_DataStyleName.getLength())
+        {
+            sal_Bool isDefaultLanguage(sal_True);
+
+            const sal_Int32 nKey( GetImport().GetTextImport()->GetDataStyleKey(
+                                   m_DataStyleName, & isDefaultLanguage) );
+
+            if (-1 != nKey)
+            {
+                static ::rtl::OUString sPropertyIsFixedLanguage(
+                    ::rtl::OUString::createFromAscii("IsFixedLanguage") );
+                Any any;
+                any <<= nKey;
+                xPropertySet->setPropertyValue(
+                    OUString::createFromAscii("NumberFormat"), any);
+                if ( xPropertySet->getPropertySetInfo()->
+                        hasPropertyByName( sPropertyIsFixedLanguage ) )
+                {
+                    any <<= static_cast<bool>(!isDefaultLanguage);
+                    xPropertySet->setPropertyValue( sPropertyIsFixedLanguage,
+                        any );
+                }
+            }
+        }
+    }
+    else
+    {
+        OSL_TRACE("invalid <text:meta-field>: no xml:id");
+    }
+}
+
+
 // ---------------------------------------------------------------------
 
 
@@ -1574,13 +1811,17 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
             sal_False);
         break;
 
-    case XML_TOK_TEXT_META:
-    case XML_TOK_TEXT_META_FIELD:
 // FIXME: should test before enabling...
 #if 0
+    case XML_TOK_TEXT_META:
         pContext = new XMLMetaImportContext(rImport, nPrefix, rLocalName,
             xAttrList, rHints, rIgnoreLeadingSpace );
         break;
+
+    case XML_TOK_TEXT_META_FIELD:
+        pContext = new XMLMetaFieldImportContext(rImport, nPrefix, rLocalName,
+            xAttrList, rHints, rIgnoreLeadingSpace );
+        break;
 #endif
 
     default:
@@ -1657,6 +1898,7 @@ XMLParaContext::XMLParaContext(
         sal_Bool bHead ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
+    m_bHaveAbout(false),
     nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ),
     pHints( 0 ),
     // --> OD 2007-07-25 #i73509#
@@ -1686,9 +1928,21 @@ XMLParaContext::XMLParaContext(
                                                             &aLocalName );
         switch( rTokenMap.Get( nPrefix, aLocalName ) )
         {
-//FIXME: RDFa
         case XML_TOK_TEXT_P_XMLID:
-            sXmlId = rValue;
+            m_sXmlId = rValue;
+            break;
+        case XML_TOK_TEXT_P_ABOUT:
+            m_sAbout = rValue;
+            m_bHaveAbout = true;
+            break;
+        case XML_TOK_TEXT_P_PROPERTY:
+            m_sProperty = rValue;
+            break;
+        case XML_TOK_TEXT_P_CONTENT:
+            m_sContent = rValue;
+            break;
+        case XML_TOK_TEXT_P_DATATYPE:
+            m_sDatatype = rValue;
             break;
         case XML_TOK_TEXT_P_STYLE_NAME:
             sStyleName = rValue;
@@ -1785,7 +2039,8 @@ XMLParaContext::~XMLParaContext()
     xAttrCursor->gotoRange( xEnd, sal_True );
 
     // xml:id for RDF metadata
-    if (sXmlId.getLength() > 0) {
+    if (m_sXmlId.getLength() || m_bHaveAbout || m_sProperty.getLength())
+    {
         try {
             const uno::Reference<container::XEnumerationAccess> xEA
                 (xAttrCursor, uno::UNO_QUERY_THROW);
@@ -1795,12 +2050,17 @@ XMLParaContext::~XMLParaContext()
             if (xEnum->hasMoreElements()) {
                 uno::Reference<rdf::XMetadatable> xMeta;
                 xEnum->nextElement() >>= xMeta;
-//FIXME not yet
-//                OSL_ENSURE(xMeta.is(), "xml:id: not XMetadatable");
-                GetImport().SetXmlId(xMeta, sXmlId);
+                OSL_ENSURE(xMeta.is(), "xml:id: not XMetadatable");
+                GetImport().SetXmlId(xMeta, m_sXmlId);
+                if (m_bHaveAbout)
+                {
+                    GetImport().AddRDFa(xMeta,
+                        m_sAbout, m_sProperty, m_sContent, m_sDatatype);
+                }
                 OSL_ENSURE(!xEnum->hasMoreElements(), "xml:id: > 1 paragraph?");
             }
         } catch (uno::Exception &) {
+            OSL_TRACE("XMLParaContext::~XMLParaContext: exception");
         }
     }
 
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 781055d2f297..6eaeeee1ee46 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -50,7 +50,12 @@ class XMLParaContext : public SvXMLImportContext
         ::com::sun::star::text::XTextRange > xStart;    // xub_StrLen nStart;
     ::rtl::OUString             sStyleName;
     ::rtl::OUString             sId;
-    ::rtl::OUString             sXmlId;
+    ::rtl::OUString             m_sXmlId;
+    ::rtl::OUString             m_sAbout;
+    ::rtl::OUString             m_sProperty;
+    ::rtl::OUString             m_sContent;
+    ::rtl::OUString             m_sDatatype;
+    bool                        m_bHaveAbout;
     sal_Int8                nOutlineLevel;
     XMLHints_Impl           *pHints;
     // --> OD 2007-07-25 #i73509#