summaryrefslogtreecommitdiff
path: root/offapi/com/sun/star/rdf
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-07-02 09:05:03 +0000
committerRelease Engineers <releng@openoffice.org>2009-07-02 09:05:03 +0000
commitfc8b377b1654dbf2389634afb32b75d6d3644326 (patch)
treeea56a7c969a7d0d8881c3bc80be109b29f86e0d2 /offapi/com/sun/star/rdf
parenta05c8855241435145f1564ced1b17369d7c9c210 (diff)
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
Diffstat (limited to 'offapi/com/sun/star/rdf')
-rw-r--r--offapi/com/sun/star/rdf/BlankNode.idl2
-rw-r--r--offapi/com/sun/star/rdf/FileFormat.idl8
-rw-r--r--offapi/com/sun/star/rdf/Statement.idl4
-rw-r--r--offapi/com/sun/star/rdf/URI.idl7
-rw-r--r--offapi/com/sun/star/rdf/URIs.idl277
-rw-r--r--offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl249
-rw-r--r--offapi/com/sun/star/rdf/XDocumentRepository.idl69
-rw-r--r--offapi/com/sun/star/rdf/XMetadatable.idl50
-rw-r--r--offapi/com/sun/star/rdf/XNamedGraph.idl14
-rw-r--r--offapi/com/sun/star/rdf/XQuerySelectResult.idl2
-rw-r--r--offapi/com/sun/star/rdf/XRepository.idl16
11 files changed, 413 insertions, 285 deletions
diff --git a/offapi/com/sun/star/rdf/BlankNode.idl b/offapi/com/sun/star/rdf/BlankNode.idl
index f0534d68c441..e0ad2bb94a4e 100644
--- a/offapi/com/sun/star/rdf/BlankNode.idl
+++ b/offapi/com/sun/star/rdf/BlankNode.idl
@@ -62,7 +62,7 @@ service BlankNode : XBlankNode
another node that already exists in some repository.
That may or may not be what you want.
If you want to create a new blank node that is guaranteed to be unique,
- use <method>XRepository::createBlankNode</method> instead.
+ use <member>XRepository::createBlankNode</member> instead.
<p>
@param NodeID
diff --git a/offapi/com/sun/star/rdf/FileFormat.idl b/offapi/com/sun/star/rdf/FileFormat.idl
index f22ad9265039..d83b4bc66363 100644
--- a/offapi/com/sun/star/rdf/FileFormat.idl
+++ b/offapi/com/sun/star/rdf/FileFormat.idl
@@ -41,13 +41,13 @@ module com { module sun { module star { module rdf {
<p>
These constants are mainly for use with
- <method>XRepository::importGraph</method>
- and <method>XRepository::exportGraph</method>.
+ <member>XRepository::importGraph</member>
+ and <member>XRepository::exportGraph</member>.
</p>
<p>
- Note that these are integers because UNO IDL does not permit string
- constants.
+ Note that these are integers because UNO IDL does not permit
+ <atom>string</atom> constants.
</p>
@since OOo 3.0
diff --git a/offapi/com/sun/star/rdf/Statement.idl b/offapi/com/sun/star/rdf/Statement.idl
index 9d8692154755..18bb46bfb70e 100644
--- a/offapi/com/sun/star/rdf/Statement.idl
+++ b/offapi/com/sun/star/rdf/Statement.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module rdf {
//=============================================================================
/** represents a RDF statement, or triple.
- @since OOo 3.0
+ @since OOo 3.2
@see XRepository
*/
@@ -52,7 +52,7 @@ struct Statement
/// the subject of the RDF statement.
XResource Subject;
/// the predicate of the RDF statement.
- XResource Predicate;
+ XURI Predicate;
/// the object of the RDF statement.
XNode Object;
/// the named graph that contains this statement, or <NULL/>.
diff --git a/offapi/com/sun/star/rdf/URI.idl b/offapi/com/sun/star/rdf/URI.idl
index 2ccb100cac4f..8a4888c4efb7 100644
--- a/offapi/com/sun/star/rdf/URI.idl
+++ b/offapi/com/sun/star/rdf/URI.idl
@@ -58,7 +58,7 @@ service URI : XURI
/** creates an URI RDF node.
@param Value
- the URI, represented as string.
+ the URI, represented as <atom>string</atom>.
@throws com::sun::star::lang::IllegalArgumentException
if the argument does not represent a valid URI
@@ -70,10 +70,11 @@ service URI : XURI
/** creates an URI RDF node from namespace prefix and local name.
@param Namespace
- the namespace prefix of the URI, represented as string.
+ the namespace prefix of the URI, represented as
+ <atom>string</atom>.
@param LocalName
- the local name of the URI, represented as string.
+ the local name of the URI, represented as <atom>string</atom>.
@throws com::sun::star::lang::IllegalArgumentException
if the arguments do not represent a valid URI
diff --git a/offapi/com/sun/star/rdf/URIs.idl b/offapi/com/sun/star/rdf/URIs.idl
index 23a3ef3f7f62..19a49b4919a6 100644
--- a/offapi/com/sun/star/rdf/URIs.idl
+++ b/offapi/com/sun/star/rdf/URIs.idl
@@ -41,23 +41,103 @@ module com { module sun { module star { module rdf {
/** Constants to specify some well-known URIs.
<p>
- These constants are mainly for use with
- <method>URI::createKnown</method>.
+ These constants are for use with <member>URI::createKnown</member>.
</p>
- @since OOo 3.0
+ @since OOo 3.2
@see URI::createKnown
*/
constants URIs
{
-// /// http://www.w3.org/2001/XMLSchema#NCName
-//FIXME: XMLSchema-datatypes is preferred to XMLSchema in this context???
-
/// http://www.w3.org/2001/XMLSchema-datatypes#NCName
- const short XSD_NCNAME = 1;
+ const short XSD_NCNAME = 1;
/// http://www.w3.org/2001/XMLSchema-datatypes#string
- const short XSD_STRING = 2;
+ const short XSD_STRING = 2;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#normalizedString
+ const short XSD_NORMALIZEDSTRING = 3;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#boolean
+ const short XSD_BOOLEAN = 4;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#decimal
+ const short XSD_DECIMAL = 5;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#float
+ const short XSD_FLOAT = 6;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#double
+ const short XSD_DOUBLE = 7;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#integer
+ const short XSD_INTEGER = 8;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#nonNegativeInteger
+ const short XSD_NONNEGATIVEINTEGER = 9;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#positiveInteger
+ const short XSD_POSITIVEINTEGER = 10;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#nonPositiveInteger
+ const short XSD_NONPOSITIVEINTEGER = 11;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#negativeInteger
+ const short XSD_NEGATIVEINTEGER = 12;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#long
+ const short XSD_LONG = 13;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#int
+ const short XSD_INT = 14;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#short
+ const short XSD_SHORT = 15;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#byte
+ const short XSD_BYTE = 16;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#unsignedLong
+ const short XSD_UNSIGNEDLONG = 17;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#unsignedInt
+ const short XSD_UNSIGNEDINT = 18;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#unsignedShort
+ const short XSD_UNSIGNEDSHORT = 19;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#unsignedByte
+ const short XSD_UNSIGNEDBYTE = 20;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#hexBinary
+ const short XSD_HEXBINARY = 21;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#base64Binary
+ const short XSD_BASE64BINARY = 22;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#dateTime
+ const short XSD_DATETIME = 23;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#time
+ const short XSD_TIME = 24;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#date
+ const short XSD_DATE = 25;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#gYearMonth
+ const short XSD_GYEARMONTH = 26;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#gYear
+ const short XSD_GYEAR = 27;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#gMonthDay
+ const short XSD_GMONTHDAY = 28;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#gDay
+ const short XSD_GDAY = 29;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#gMonth
+ const short XSD_GMONTH = 30;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#anyURI
+ const short XSD_ANYURI = 31;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#token
+ const short XSD_TOKEN = 32;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#language
+ const short XSD_LANGUAGE = 33;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#NMTOKEN
+ const short XSD_NMTOKEN = 34;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#Name
+ const short XSD_NAME = 35;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#duration
+ const short XSD_DURATION = 36;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#QName
+ const short XSD_QNAME = 37;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#NOTATION
+ const short XSD_NOTATION = 38;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#NMTOKENS
+ const short XSD_NMTOKENS = 39;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#ID
+ const short XSD_ID = 40;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#IDREF
+ const short XSD_IDREF = 41;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#IDREFS
+ const short XSD_IDREFS = 42;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#ENTITY
+ const short XSD_ENTITY = 43;
+ /// http://www.w3.org/2001/XMLSchema-datatypes#ENTITIES
+ const short XSD_ENTITIES = 44;
/// http://www.w3.org/1999/02/22-rdf-syntax-ns#type
const short RDF_TYPE = 1000;
@@ -71,56 +151,179 @@ constants URIs
const short RDF_PROPERTY = 1004;
/// http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement
const short RDF_STATEMENT = 1005;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#value
+ const short RDF_VALUE = 1006;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#first
+ const short RDF_FIRST = 1007;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#rest
+ const short RDF_REST = 1008;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#nil
+ const short RDF_NIL = 1009;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral
+ const short RDF_XMLLITERAL = 1010;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt
+ const short RDF_ALT = 1011;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
+ const short RDF_BAG = 1012;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#List
+ const short RDF_LIST = 1013;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq
+ const short RDF_SEQ = 1014;
+ /// http://www.w3.org/1999/02/22-rdf-syntax-ns#_1
+ const short RDF_1 = 1015;
+ /* hmm... that's a lot of potential constants:
+ _n where n is a decimal integer greater than zero with no leading zeros.
+ */
/// http://www.w3.org/2000/01/rdf-schema#comment
- const short RDFS_COMMENT = 1100;
+ const short RDFS_COMMENT = 1100;
/// http://www.w3.org/2000/01/rdf-schema#label
- const short RDFS_LABEL = 1101;
+ const short RDFS_LABEL = 1101;
/// http://www.w3.org/2000/01/rdf-schema#domain
- const short RDFS_DOMAIN = 1102;
+ const short RDFS_DOMAIN = 1102;
/// http://www.w3.org/2000/01/rdf-schema#range
- const short RDFS_RANGE = 1103;
+ const short RDFS_RANGE = 1103;
/// http://www.w3.org/2000/01/rdf-schema#subClassOf
- const short RDFS_SUBCLASSOF = 1104;
+ const short RDFS_SUBCLASSOF = 1104;
/// http://www.w3.org/2000/01/rdf-schema#Literal
- const short RDFS_LITERAL = 1105;
+ const short RDFS_LITERAL = 1105;
+ /// http://www.w3.org/2000/01/rdf-schema#member
+ const short RDFS_MEMBER = 1106;
+ /// http://www.w3.org/2000/01/rdf-schema#subPropertyOf
+ const short RDFS_SUBPROPERTYOF = 1107;
+ /// http://www.w3.org/2000/01/rdf-schema#isDefinedBy
+ const short RDFS_ISDEFINEDBY = 1108;
+ /// http://www.w3.org/2000/01/rdf-schema#seeAlso
+ const short RDFS_SEEALSO = 1109;
+ /// http://www.w3.org/2000/01/rdf-schema#Resource
+ const short RDFS_RESOURCE = 1110;
+ /// http://www.w3.org/2000/01/rdf-schema#Class
+ const short RDFS_CLASS = 1111;
+ /// http://www.w3.org/2000/01/rdf-schema#Datatype
+ const short RDFS_DATATYPE = 1112;
+ /// http://www.w3.org/2000/01/rdf-schema#Container
+ const short RDFS_CONTAINER = 1113;
+ /// http://www.w3.org/2000/01/rdf-schema#ContainerMembershipProperty
+ const short RDFS_CONTAINERMEMBERSHIPPROPERTY = 1114;
/// http://www.w3.org/2002/07/owl#Class
- const short OWL_CLASS = 1200;
+ const short OWL_CLASS = 1200;
/// http://www.w3.org/2002/07/owl#ObjectProperty
- const short OWL_OBJECTPROPERTY = 1201;
+ const short OWL_OBJECTPROPERTY = 1201;
/// http://www.w3.org/2002/07/owl#DatatypeProperty
- const short OWL_DATATYPEPROPERTY = 1202;
+ const short OWL_DATATYPEPROPERTY = 1202;
/// http://www.w3.org/2002/07/owl#FunctionalProperty
- const short OWL_FUNCTIONALPROPERTY = 1203;
+ const short OWL_FUNCTIONALPROPERTY = 1203;
+ /// http://www.w3.org/2002/07/owl#Thing
+ const short OWL_THING = 1204;
+ /// http://www.w3.org/2002/07/owl#Nothing
+ const short OWL_NOTHING = 1205;
+ /// http://www.w3.org/2002/07/owl#Individual
+ const short OWL_INDIVIDUAL = 1206;
+ /// http://www.w3.org/2002/07/owl#equivalentClass
+ const short OWL_EQUIVALENTCLASS = 1207;
+ /// http://www.w3.org/2002/07/owl#equivalentProperty
+ const short OWL_EQUIVALENTPROPERTY = 1208;
+ /// http://www.w3.org/2002/07/owl#sameAs
+ const short OWL_SAMEAS = 1209;
+ /// http://www.w3.org/2002/07/owl#differentFrom
+ const short OWL_DIFFERENTFROM = 1210;
+ /// http://www.w3.org/2002/07/owl#AllDifferent
+ const short OWL_ALLDIFFERENT = 1211;
+ /// http://www.w3.org/2002/07/owl#distinctMembers
+ const short OWL_DISTINCTMEMBERS = 1212;
+ /// http://www.w3.org/2002/07/owl#inverseOf
+ const short OWL_INVERSEOF = 1213;
+ /// http://www.w3.org/2002/07/owl#TransitiveProperty
+ const short OWL_TRANSITIVEPROPERTY = 1214;
+ /// http://www.w3.org/2002/07/owl#SymmetricProperty
+ const short OWL_SYMMETRICPROPERTY = 1215;
+ /// http://www.w3.org/2002/07/owl#InverseFunctionalProperty
+ const short OWL_INVERSEFUNCTIONALPROPERTY = 1216;
+ /// http://www.w3.org/2002/07/owl#Restriction
+ const short OWL_RESTRICTION = 1217;
+ /// http://www.w3.org/2002/07/owl#onProperty
+ const short OWL_ONPROPERTY = 1218;
+ /// http://www.w3.org/2002/07/owl#allValuesFrom
+ const short OWL_ALLVALUESFROM = 1219;
+ /// http://www.w3.org/2002/07/owl#someValuesFrom
+ const short OWL_SOMEVALUESFROM = 1220;
+ /// http://www.w3.org/2002/07/owl#minCardinality
+ const short OWL_MINCARDINALITY = 1221;
+ /// http://www.w3.org/2002/07/owl#maxCardinality
+ const short OWL_MAXCARDINALITY = 1222;
+ /// http://www.w3.org/2002/07/owl#cardinality
+ const short OWL_CARDINALITY = 1223;
+ /// http://www.w3.org/2002/07/owl#Ontology
+ const short OWL_ONTOLOGY = 1224;
+ /// http://www.w3.org/2002/07/owl#imports
+ const short OWL_IMPORTS = 1225;
+ /// http://www.w3.org/2002/07/owl#versionInfo
+ const short OWL_VERSIONINFO = 1226;
+ /// http://www.w3.org/2002/07/owl#priorVersion
+ const short OWL_PRIORVERSION = 1227;
+ /// http://www.w3.org/2002/07/owl#backwardCompatibleWith
+ const short OWL_BACKWARDCOMPATIBLEWITH = 1228;
+ /// http://www.w3.org/2002/07/owl#incompatibleWith
+ const short OWL_INCOMPATIBLEWITH = 1229;
+ /// http://www.w3.org/2002/07/owl#DeprecatedClass
+ const short OWL_DEPRECATEDCLASS = 1230;
+ /// http://www.w3.org/2002/07/owl#DeprecatedProperty
+ const short OWL_DEPRECATEDPROPERTY = 1231;
+ /// http://www.w3.org/2002/07/owl#AnnotationProperty
+ const short OWL_ANNOTATIONPROPERTY = 1232;
+ /// http://www.w3.org/2002/07/owl#OntologyProperty
+ const short OWL_ONTOLOGYPROPERTY = 1233;
+ /// http://www.w3.org/2002/07/owl#oneOf
+ const short OWL_ONEOF = 1234;
+ /// http://www.w3.org/2002/07/owl#dataRange
+ const short OWL_DATARANGE = 1235;
+ /// http://www.w3.org/2002/07/owl#disjointWith
+ const short OWL_DISJOINTWITH = 1236;
+ /// http://www.w3.org/2002/07/owl#unionOf
+ const short OWL_UNIONOF = 1237;
+ /// http://www.w3.org/2002/07/owl#complementOf
+ const short OWL_COMPLEMENTOF = 1238;
+ /// http://www.w3.org/2002/07/owl#intersectionOf
+ const short OWL_INTERSECTIONOF = 1239;
+ /// http://www.w3.org/2002/07/owl#hasValue
+ const short OWL_HASVALUE = 1240;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#hasPart
- const short PKG_HASPART = 2000;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#idref
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#hasPart
+ const short PKG_HASPART = 2000;
+/* REMOVED
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#idref
const short PKG_IDREF = 2001;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#path
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#path
const short PKG_PATH = 2002;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#mimeType
- const short PKG_MIMETYPE = 2003;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#Package
- const short PKG_PACKAGE = 2004;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#Element
- const short PKG_ELEMENT = 2005;
- /// http://docs.oasis-open.org/opendocument/meta/package/common#File
- const short PKG_FILE = 2006;
-
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#prefix
+*/
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#mimeType
+ const short PKG_MIMETYPE = 2003;
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#Package
+ const short PKG_PACKAGE = 2004;
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#Element
+ const short PKG_ELEMENT = 2005;
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#File
+ const short PKG_FILE = 2006;
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#MetadataFile
+ const short PKG_METADATAFILE = 2007;
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/pkg#Document
+ const short PKG_DOCUMENT = 2008;
+
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#prefix
const short ODF_PREFIX = 2100;
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#suffix
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#suffix
const short ODF_SUFFIX = 2101;
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#Element
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#Element
const short ODF_ELEMENT = 2102;
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#ContentFile
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#ContentFile
const short ODF_CONTENTFILE = 2103;
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#StylesFile
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#StylesFile
const short ODF_STYLESFILE = 2104;
- /// http://docs.oasis-open.org/opendocument/meta/package/odf#MetadataFile
+/* REMOVED
+ /// http://docs.oasis-open.org/ns/office/1.2/meta/odf#MetadataFile
const short ODF_METADATAFILE = 2105;
+*/
/// urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field
// const short TEXT_META_FIELD = 3000;
diff --git a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
index 6eda7bf0da0e..9c82d75546a3 100644
--- a/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
+++ b/offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl
@@ -55,6 +55,10 @@
#include <com/sun/star/io/IOException.idl>
#endif
+#ifndef __com_sun_star_io_XInputStream_idl__
+#include <com/sun/star/io/XInputStream.idl>
+#endif
+
#ifndef __com_sun_star_datatransfer_UnsupportedFlavorException_idl__
#include <com/sun/star/datatransfer/UnsupportedFlavorException.idl>
#endif
@@ -63,8 +67,8 @@
#include <com/sun/star/embed/XStorage.idl>
#endif
-#ifndef __com_sun_star_io_XInputStream_idl__
-#include <com/sun/star/io/XInputStream.idl>
+#ifndef __com_sun_star_task_XInteractionHandler_idl__
+#include <com/sun/star/task/XInteractionHandler.idl>
#endif
#ifndef __com_sun_star_rdf_FileFormat_idl__
@@ -100,20 +104,15 @@ module com { module sun { module star { module rdf {
the content and the RDF metadata of an ODF document.
The main idea is to make querying and manipulating the
data in the metadata manifest easier.
- Among other things, the metadata manifest contains a mapping between ODF
- elements (in the "content.xml" and "styles.xml" streams) and URIs.
- Such a mapping works by associating the XML ID of the ODF element with
- the URI by an RDF statement of the form:
- <code>URI pkg:idref XmlId.</code>
</p>
<p>
- Note that this interface inherits from <type>XResource</type>: the
- UUID of the package is the string value of the RDF node.
- This is so that you can easily make RDF statements about the package.
+ Note that this interface inherits from <type>XURI</type>: the
+ base URI of the document is the string value of the RDF node.
+ This is so that you can easily make RDF statements about the document.
</p>
- @since OOo 3.0
+ @since OOo 3.2
@see XDocumentRepository
*/
@@ -123,33 +122,22 @@ interface XDocumentMetadataAccess
interface XRepositorySupplier;
//-------------------------------------------------------------------------
- /** get the UUID for the ODF package.
+ /** get the unique ODF element with the given metadata reference.
- @returns
- a universally unique ID that identifies this ODF package
- */
- string getPackageUUID();
-
- //-------------------------------------------------------------------------
- /** get the unique ODF element with the given XML ID.
-
- @param XmlId
- an XML ID, comprising the stream name and the "xml:id" attribute.
- For example: "content.xml#foo-element-1"
+ @param MetadataReference
+ a metadata reference, comprising the stream name and the XML ID
+ For example: Pair("content.xml", "foo-element-1")
@returns
- the ODF element with the given XML ID if it exists, else <NULL/>
+ the ODF element with the given metadata references if it exists,
+ else <NULL/>
*/
- XMetadatable getElementByXmlId([in] string XmlId);
+ XMetadatable getElementByMetadataReference(
+ [in] com::sun::star::beans::StringPair MetadataReference);
//-------------------------------------------------------------------------
/** get the ODF element that corresponds to an URI.
- <p>
- Convenience method that uses the mapping established in the
- "manifest.rdf" to locate the ODF element corresponding to an URI.
- </p>
-
@param URI
an URI that may identify an ODF element
@@ -163,94 +151,6 @@ interface XDocumentMetadataAccess
raises( com::sun::star::lang::IllegalArgumentException );
//-------------------------------------------------------------------------
- /** find the URI that is associated with an ODF element in the manifest.
-
- @param Element
- the ODF element for which the URI should be returned
-
- @returns
- the URI associated with the element, or <NULL/>
-
- @throws com::sun::star::lang::IllegalArgumentException
- if the given Element is <NULL/>
- */
- XURI getURIForElement([in] XMetadatable Element)
- raises( com::sun::star::lang::IllegalArgumentException );
-
- //-------------------------------------------------------------------------
- /** create an URI for an ODF element.
-
- <p>
- Convenience method that generates an URI for the given ODF element,
- and inserts a mapping between the URI and the XML ID of the ODF element
- into the manifest.
- If the element does not have a XML ID yet, a new XML ID will be
- generated.
- If an URI for the element already exists, it will be returned.
- </p>
-
- @param Element
- the ODF element for which an URI should be created.
-
- @returns
- the URI associated with the element
-
- @throws com::sun::star::lang::IllegalArgumentException
- if the given Element is <NULL/>
- */
- XURI getOrCreateURIForElement([in] XMetadatable Element)
- raises( com::sun::star::lang::IllegalArgumentException );
-
- //-------------------------------------------------------------------------
- /** establish mapping between an ODF Element and an URI in the manifest.
-
- <p>
- This method Convenience method that generates an URI for the given
- ODF element, and inserts a mapping between the URI and the XML ID
- of the ODF element into the manifest.
- If the element does not have a XML ID yet, a new XML ID will be
- generated.
- If there already exists an URI for the element, the mapping will not
- be changed, and an
- <type scope="com::sun::star::container">ElementExistException</type>
- will be thrown.
- </p>
-
- <p>
- Note that the mapping maintained by this method is a one-to-one
- mapping, even though the specification technically permits
- mapping an XML ID to multiple URIs.
- </p>
-
- @param Element
- the ODF element with which an URI should be associated
-
- @param URI
- the URI which should be associated with the Element
-
- @throws com::sun::star::lang::IllegalArgumentException
- if any argument is <NULL/>
-
- @throws com::sun::star::container::ElementExistException
- if either the URI or the XML ID of the Element is already mapped
- */
- void createMappingForElement([in] XMetadatable Element, [in] XURI URI)
- raises( com::sun::star::lang::IllegalArgumentException,
- com::sun::star::container::ElementExistException );
-
- //-------------------------------------------------------------------------
- /** removes mapping for an ODF element from the manifest.
-
- @param Element
- the ODF element for which the mapping should be removed
-
- @throws com::sun::star::lang::IllegalArgumentException
- if the given Element is <NULL/>
- */
- void removeMappingForElement([in] XMetadatable Element)
- raises( com::sun::star::lang::IllegalArgumentException );
-
- //-------------------------------------------------------------------------
/** get the names of all metadata files with a given type.
@param Type
@@ -272,8 +172,8 @@ interface XDocumentMetadataAccess
<p>
This convenience method does the following:
<ul>
- <li>create a new graph with the given GraphName in the repository</li>
- <li>insert the required statements declaring the new graph to be a
+ <li>create a new graph with the given name in the repository</li>
+ <li>insert statements declaring the new graph to be a
metadata file into the manifest graph</li>
<li>insert statements declaring <code>rdf:type</code> properties
for the new graph into the manifest graph</li>
@@ -281,24 +181,23 @@ interface XDocumentMetadataAccess
</p>
@param FileName
- the name of the stream in the ODF package where the graph will
+ the name of the stream in the ODF storage where the graph will
be stored
- @param GraphName
- the name of the graph that is to be created
-
@param Types
a list of types that will be inserted as <code>rdf:type</code>
properties for the graph
+ @returns
+ the name of the new graph
+
@throws com::sun::star::lang::IllegalArgumentException
- if the given GraphName is <NULL/>, or the FileName is invalid
+ if the FileName is invalid
@throws com::sun::star::container::ElementExistException
- if a graph with the given GraphName, or a stream with the given
- FileName, already exists
+ if a stream with the given FileName already exists
*/
- void addMetadataFile([in] string FileName, [in] XURI GraphName,
+ XURI addMetadataFile([in] string FileName,
[in] sequence<XURI> Types )
raises( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException );
@@ -309,19 +208,18 @@ interface XDocumentMetadataAccess
<p>
This convenience method does the following:
- <li>import the given file into a graph with the given GraphName
+ <li>import the given file into a graph with the given name
in the repository</li>
- <li>insert the required statements declaring the new graph to be a
+ <li>insert statements declaring the new graph to be a
metadata file into the manifest graph</li>
+ <li>insert statements declaring <code>rdf:type</code> properties
+ for the new graph into the manifest graph</li>
</p>
@param FileName
- the name of the stream in the ODF package where the graph will
+ the name of the stream in the ODF storage where the graph will
be stored
- @param GraphName
- the name of the graph that is to be created
-
@param BaseURI
a base URI to resolve relative URI references
@@ -329,8 +227,11 @@ interface XDocumentMetadataAccess
a list of types that will be inserted as <code>rdf:type</code>
properties for the graph
+ @returns
+ the name of the new graph
+
@throws com::sun::star::lang::IllegalArgumentException
- if the given stream or the GraphName is <NULL/>,
+ if the given stream is <NULL/>,
or BaseURI is <NULL/> and the format requires use of a base URI,
or the FileName is invalid
@@ -338,8 +239,7 @@ interface XDocumentMetadataAccess
if the format requested is unknown or not supported
@throws com::sun::star::container::ElementExistException
- if a graph with the given GraphName, or a stream with the given
- FileName, already exists
+ if a stream with the given FileName already exists
@throws ParseException
if the input does not conform to the specified file format.
@@ -349,9 +249,9 @@ interface XDocumentMetadataAccess
@see FileFormat
*/
- void importMetadataFile( [in] /*FileFormat*/ short Format,
+ XURI importMetadataFile( [in] /*FileFormat*/ short Format,
[in] com::sun::star::io::XInputStream InStream,
- [in] string FileName, [in] XURI GraphName, [in] XURI BaseURI,
+ [in] string FileName, [in] XURI BaseURI,
[in] sequence<XURI> Types )
raises( com::sun::star::lang::IllegalArgumentException,
com::sun::star::datatransfer::UnsupportedFlavorException,
@@ -398,7 +298,7 @@ interface XDocumentMetadataAccess
</p>
@param FileName
- the name of the stream in the ODF package
+ the name of the stream in the ODF storage
@throws com::sun::star::lang::IllegalArgumentException
if the FileName is invalid
@@ -415,12 +315,11 @@ interface XDocumentMetadataAccess
<p>
This convenience method removes the statements declaring a
- content or styles file from the manifest graph, as well as
- all mappings that refer to the file.
+ content or styles file from the manifest graph.
</p>
@param FileName
- the name of the stream in the ODF package
+ the name of the stream in the ODF storage
@throws com::sun::star::lang::IllegalArgumentException
if the FileName is invalid
@@ -447,22 +346,35 @@ interface XDocumentMetadataAccess
In this case, the document metadata will be default initialized.
</p>
+ <p>
+ If an InteractionHandler argument is given, it will be used for
+ error reporting. Otherwise, errors will be reported as exceptions.
+ </p>
+
@param Storage
- a storage, representing e.g. an ODF package file
+ a storage, representing e.g. an ODF package file, or sub-document
@param BaseURI
a base URI to resolve relative URI references
+ <p>N.B.: when loading from an ODF package, the base URI is not the
+ URI of the package, but the URI of the directory in the package
+ that contains the metadata.rdf</p>
+
+ @param InteractionHandler
+ an InteractionHandler, used for error reporting
@throws com::sun::star::lang::IllegalArgumentException
if any argument is <NULL/>
+
+ @throws com::sun::star::lang::WrappedTargetException
+ if an error occurs while loading and no InteractionHandler given
*/
-//FIXME: how to do error handling??? this thing must be able to report any number of errors in any number of streams... XInteractionHandler???
void loadMetadataFromStorage(
[in] com::sun::star::embed::XStorage Storage,
- [in] XURI BaseURI)
- raises( com::sun::star::lang::IllegalArgumentException );
-// com::sun::star::io::IOException,
-// com::sun::star::);
+ [in] XURI BaseURI,
+ [in] com::sun::star::task::XInteractionHandler InteractionHandler )
+ raises( com::sun::star::lang::IllegalArgumentException,
+ com::sun::star::lang::WrappedTargetException );
//-------------------------------------------------------------------------
/** store document metadata to a storage.
@@ -474,28 +386,29 @@ interface XDocumentMetadataAccess
<p>
Note that to be stored correctly, a named graph must have a complete
- entry in the manifest graph, with a <code>pkg:path</code> property
- that denotes a legal stream name.
+ entry in the manifest graph.
</p>
@param Storage
- a storage, representing e.g. an ODF package file
+ a storage, representing e.g. an ODF package file, or sub-document
@throws com::sun::star::lang::IllegalArgumentException
- if any argument is <NULL/>
+ if Storage argument is <NULL/>
+
+ @throws com::sun::star::lang::WrappedTargetException
+ if an error occurs while loading
*/
-//FIXME error handling
void storeMetadataToStorage(
- [in] com::sun::star::embed::XStorage Storage)
- raises( com::sun::star::lang::IllegalArgumentException );
-// com::sun::star::io::IOException,
-// com::sun::star:: );
+ [in] com::sun::star::embed::XStorage Storage )
+ raises( com::sun::star::lang::IllegalArgumentException,
+ com::sun::star::lang::WrappedTargetException );
-//FIXME error handling for these?
-//Note: any errors when accessing individual streams in the medium (including the manifest) will not be reported to the caller unless an XInteractionHandler is supplied.
//-------------------------------------------------------------------------
/** loads document metadata from a medium.
+ <p>If the Medium contains an InteractionHandler, it will be used for
+ error reporting.</p>
+
@param Medium
the <type>com::sun::star::document::MediaDescriptor</type>
representing the source
@@ -504,18 +417,14 @@ interface XDocumentMetadataAccess
if the argument does not contain a URL or Stream property
@throws com::sun::star::lang::WrappedTargetException
- if thrown when trying to access the medium
-
- @throws com::sun::star::io::IOException
- if thrown when trying to access the medium
+ if an error occurs while loading
@see com::sun::star::document::MediaDescriptor
*/
void loadMetadataFromMedium(
[in] sequence < com::sun::star::beans::PropertyValue > Medium )
raises( com::sun::star::lang::IllegalArgumentException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::io::IOException );
+ com::sun::star::lang::WrappedTargetException );
//-------------------------------------------------------------------------
/** stores document metadata to a medium.
@@ -528,18 +437,14 @@ interface XDocumentMetadataAccess
if the argument does not contain a URL or Stream property
@throws com::sun::star::lang::WrappedTargetException
- if thrown when trying to access the medium
-
- @throws com::sun::star::io::IOException
- if thrown when trying to access the medium
+ if an error occurs while storing
@see com::sun::star::document::MediaDescriptor
*/
void storeMetadataToMedium(
[in] sequence < com::sun::star::beans::PropertyValue > Medium )
raises( com::sun::star::lang::IllegalArgumentException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::io::IOException );
+ com::sun::star::lang::WrappedTargetException );
};
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index bd7f6d2259b6..d9131291d81a 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -31,10 +31,6 @@
#ifndef __com_sun_star_rdf_XDocumentRepository_idl__
#define __com_sun_star_rdf_XDocumentRepository_idl__
-#ifndef __com_sun_star_text_XTextRange_idl__
-#include <com/sun/star/text/XTextRange.idl>
-#endif
-
#ifndef __com_sun_star_rdf_XMetadatable_idl__
#include <com/sun/star/rdf/XMetadatable.idl>
#endif
@@ -58,7 +54,7 @@ module com { module sun { module star { module rdf {
which is stored as RDFa.
</p>
- @since OOo 3.0
+ @since OOo 3.2
@see XRepositorySupplier
@see XDocumentMetadataAccess
@@ -73,22 +69,30 @@ interface XDocumentRepository : XRepository
<p>
This method will do the following steps:
<ol>
- <li>Remove all RDFa statements that involve the Object parameter from
- the repository</li>
+ <li>Remove all previously set RDFa statements for the Object parameter
+ from the repository</li>
<li>If the RDFaContent parameter is the empty <atom>string</atom>,
+ for every Predicate in the given list of Predicates,
add the following RDF statement to an unspecified named graph:
<ul>
- <li><code>Subject Predicate XLiteral(Object->getText())</code></li>
+ <li><code>Subject Predicate
+ XLiteral(Object->getText()^^RDFaDatatype)</code></li>
</ul>
</li>
<li>If the RDFaContent parameter is not the empty <atom>string</atom>,
- add the following RDF statements to an unspecified named graph:
+ for every Predicate in the given list of Predicates,
+ add the following RDF statement to an unspecified named graph:
<ul>
<li>
<code>Subject Predicate XLiteral(RDFaContent^^RDFaDatatype)</code>
</li>
+ </ul>
+ Further, add the following RDF statement to the same unspecified
+ named graph:
+ <ul>
<li>
- <code>Subject rdfs:label XLiteral(Object->getText())</code></li>
+ <code>Subject rdfs:label XLiteral(Object->getText())</code>
+ </li>
</ul>
</li>
</ol>
@@ -97,22 +101,22 @@ interface XDocumentRepository : XRepository
<p>
RDFa statements are handled specially because they are not logically
part of any named graph in the repository.
- Also, they have rather unusual semantics.
- Also, just using <method>XNamedGraph::addStatement</method>
- for this would be ambiguous:
- if the object is a XMetadatable, do we insert the object itself (URI)
- or its literal content (RDFa)?
+ Also, they have rather unusual semantics;
+ just using <member>XNamedGraph::addStatement</member> would be
+ ambiguous:
+ if the object is a <type>XMetadatable</type>, do we insert
+ the object itself (URI) or its literal content (RDFa)?
</p>
-//FIXME: updates???
@param Subject
- the subject of the RDF triple.
+ the subject of the RDF triple(s).
- @param Predicate
- the predicate of the RDF triple.
+ @param Predicates
+ the predicates of the RDF triple(s).
@param Object
- the object of the RDF triple is the text content of this parameter.
+ the object of the RDF triple(s) is the text content of this
+ parameter.
@param RDFaContent
the <code>rdfa:content</code> attribute (may be the empty
@@ -122,16 +126,16 @@ interface XDocumentRepository : XRepository
the <code>rdfa:datatype</code> attribute (may be <NULL/>)
@throws com::sun::star::lang::IllegalArgumentException
- if any parameter is <NULL/>,
+ if any parameter is <NULL/>, Predicates is empty,
or Object is of a type that can not have RDFa metadata attached.
@throws RepositoryException
if an error occurs when accessing the repository.
*/
void setStatementRDFa(
- [in] XURI Subject,
- [in] XURI Predicate,
- [in] com::sun::star::text::XTextRange Object,
+ [in] XResource Subject,
+ [in] sequence<XURI> Predicates,
+ [in] XMetadatable Object,
[in] string RDFaContent,
[in] XURI RDFaDatatype)
raises( com::sun::star::lang::IllegalArgumentException,
@@ -146,7 +150,7 @@ interface XDocumentRepository : XRepository
part of any graph.
</p>
- @param Object
+ @param Element
the element whose RDFa statement(s) should be removed
@throws com::sun::star::lang::IllegalArgumentException
@@ -156,7 +160,7 @@ interface XDocumentRepository : XRepository
@throws RepositoryException
if an error occurs when accessing the repository.
*/
- void removeStatementRDFa([in] com::sun::star::text::XTextRange Object)
+ void removeStatementRDFa([in] XMetadatable Element)
raises( com::sun::star::lang::IllegalArgumentException,
RepositoryException );
@@ -170,13 +174,14 @@ interface XDocumentRepository : XRepository
<ul>
<li>if the element has no RDFa meta-data attributes:
the empty sequence.</li>
- <li>if the element has RDFa meta-data attributes,
+ <li>if the element has RDFa meta-data attributes:
and no <code>rdfa:content</code> attached:
- a sequence with a single element: the RDFa-statement</li>
+ a sequence with the RDFa-statements corresponding to the
+ attributes</li>
<li>if the element has RDFa meta-data attributes,
and also <code>rdfa:content</code> attached:
- a sequence with 2 elements: first the RDFa-statement,
- then the RDFa-labels-statement</li>
+ a sequence with the RDFa-statements corresponding to the
+ attributes, including the RDFa-labels-statement</li>
</ul>
@throws com::sun::star::lang::IllegalArgumentException
@@ -198,7 +203,7 @@ interface XDocumentRepository : XRepository
<p>
This method exists because RDFa statements are not part of any named
graph, and thus they cannot be enumerated with
- <method>XNamedGraph::getStatements</method>.
+ <member>XNamedGraph::getStatements</member>.
</p>
<p>
@@ -230,7 +235,7 @@ interface XDocumentRepository : XRepository
*/
com::sun::star::container::XEnumeration/*<Statement>*/ getStatementsRDFa(
[in] XResource Subject,
- [in] XResource Predicate,
+ [in] XURI Predicate,
[in] XNode Object)
raises( RepositoryException );
diff --git a/offapi/com/sun/star/rdf/XMetadatable.idl b/offapi/com/sun/star/rdf/XMetadatable.idl
index 9c702cfc4db7..19b25f8b58a0 100644
--- a/offapi/com/sun/star/rdf/XMetadatable.idl
+++ b/offapi/com/sun/star/rdf/XMetadatable.idl
@@ -35,8 +35,12 @@
#include <com/sun/star/lang/IllegalArgumentException.idl>
#endif
-#ifndef __com_sun_star_rdf_XResource_idl__
-#include <com/sun/star/rdf/XResource.idl>
+#ifndef __com_sun_star_beans_StringPair_idl__
+#include <com/sun/star/beans/StringPair.idl>
+#endif
+
+#ifndef __com_sun_star_rdf_XURI_idl__
+#include <com/sun/star/rdf/XURI.idl>
#endif
@@ -50,42 +54,52 @@ module com { module sun { module star { module rdf {
<p>
To make using ODF elements as part of RDF statements more convenient,
- this interface inherits from XRDFResource.
+ this interface inherits from <type>XURI</type>.
+ The URI is constructed by concatenating the URI of the document, the
+ stream name, a fragment separator, and the XML ID.
+ </p>
+
+ <p>
+ Note that using the <type>XURI</type> interface on an instance of
+ <type>XMetadatable</type> may have the side effect of creating a metadata
+ reference for the instance.
</p>
- @since OOo 3.0
+ @since OOo 3.2
- @see XRDFRepository
+ @see XRepository
+ @see XDocumentMetadataAccess
*/
-interface XMetadatable : XResource
+interface XMetadatable : XURI
{
//-------------------------------------------------------------------------
- /** an XML ID, comprising the stream name and the xml:id attribute.
+ /** a metadata reference, comprising the stream name and the XML ID.
<p>
- Note that this ID must be unique for the ODF document.
- This implies that the xml:id part must be unique for every stream.
- The ID may be omitted, in which case the value is the empty string.
- For Example: "content.xml#foo-element-1"
+ Note that this metadata reference must be unique for the ODF document.
+ This implies that the XML ID part must be unique for every stream.
+ A pair of two empty strings signifies "no metadata reference".
+ For example: Pair("content.xml", "foo-element-1")
</p>
@throws com::sun::star::lang::IllegalArgumentException
- if the given XmlId is invalid, or not unique
+ if the given metadata reference is invalid, or not unique
*/
- [attribute] string XmlId {
+ [attribute] com::sun::star::beans::StringPair MetadataReference {
set raises ( com::sun::star::lang::IllegalArgumentException );
};
//-------------------------------------------------------------------------
- /** creates an XML ID for this object, if necessary.
+ /** creates a metadata reference for this object, if necessary.
<p>
- If this object already has an XML ID, do nothing;
- otherwise, create a fresh, unique XML ID and assign it to the
- XmlId attribute.
+ If this object already has a metadata reference, do nothing;
+ otherwise, create metadata reference with a fresh, unique XML ID
+ and assign it to the MetadataReference attribute.
</p>
*/
- void ensureXmlId();
+ void ensureMetadataReference();
+
};
//=============================================================================
diff --git a/offapi/com/sun/star/rdf/XNamedGraph.idl b/offapi/com/sun/star/rdf/XNamedGraph.idl
index be7b67448e9f..33c09cdfceee 100644
--- a/offapi/com/sun/star/rdf/XNamedGraph.idl
+++ b/offapi/com/sun/star/rdf/XNamedGraph.idl
@@ -67,13 +67,13 @@ module com { module sun { module star { module rdf {
<p>
Note that instances may be destroyed via
- <method>XRepository::destroyGraph</method>.
- If a graph is destroyed, subsequent calls to <method>addStatement</method>,
- <method>removeStatement</method> will fail with an
+ <member>XRepository::destroyGraph</member>.
+ If a graph is destroyed, subsequent calls to <member>addStatement</member>,
+ <member>removeStatements</member> will fail with an
<type scope="com::sun::star::container">NoSuchElementException</type>.
</p>
- @since OOo 3.0
+ @since OOo 3.2
@see XRepository
*/
@@ -134,7 +134,7 @@ interface XNamedGraph : XURI
if an error occurs when accessing the repository.
*/
void addStatement([in] XResource Subject,
- [in] XResource Predicate,
+ [in] XURI Predicate,
[in] XNode Object)
raises( com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::NoSuchElementException,
@@ -172,7 +172,7 @@ interface XNamedGraph : XURI
if an error occurs when accessing the repository.
*/
void removeStatements([in] XResource Subject,
- [in] XResource Predicate,
+ [in] XURI Predicate,
[in] XNode Object)
raises( com::sun::star::container::NoSuchElementException,
RepositoryException );
@@ -217,7 +217,7 @@ interface XNamedGraph : XURI
*/
com::sun::star::container::XEnumeration/*<Statement>*/ getStatements(
[in] XResource Subject,
- [in] XResource Predicate,
+ [in] XURI Predicate,
[in] XNode Object)
raises( com::sun::star::container::NoSuchElementException,
RepositoryException );
diff --git a/offapi/com/sun/star/rdf/XQuerySelectResult.idl b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
index 9148b6b0db85..1d9641edf37d 100644
--- a/offapi/com/sun/star/rdf/XQuerySelectResult.idl
+++ b/offapi/com/sun/star/rdf/XQuerySelectResult.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module rdf {
each being a list of bindings for the above variables</li>
</ol>
Note that each query result retrieved via
- <method scope="com::sun::star::container">XEnumeration::nextElement</method>
+ <member scope="com::sun::star::container">XEnumeration::nextElement</member>
has the type <type dim="[]">XNode</type>,
the length of the sequence being the same as the number of query variables.
</p>
diff --git a/offapi/com/sun/star/rdf/XRepository.idl b/offapi/com/sun/star/rdf/XRepository.idl
index 3c75b50b206f..6f6e12a2ea5b 100644
--- a/offapi/com/sun/star/rdf/XRepository.idl
+++ b/offapi/com/sun/star/rdf/XRepository.idl
@@ -126,7 +126,7 @@ module com { module sun { module star { module rdf {
</p>
- @since OOo 3.0
+ @since OOo 3.2
@see XRepositorySupplier
@see XDocumentRepository
@@ -369,7 +369,7 @@ interface XRepository
*/
com::sun::star::container::XEnumeration/*<Statement>*/ getStatements(
[in] XResource Subject,
- [in] XResource Predicate,
+ [in] XURI Predicate,
[in] XNode Object)
raises( RepositoryException );
@@ -385,7 +385,7 @@ interface XRepository
</p>
@param Query
- the SPARQL query string
+ the SPARQL query <atom>string</atom>
@returns
an enumeration, containing
@@ -396,7 +396,7 @@ interface XRepository
</ol>
@throws QueryException
- if the query string is malformed, or evaluation fails
+ if the query is malformed, or evaluation fails
@throws RepositoryException
if an error occurs when accessing the repository.
@@ -416,14 +416,14 @@ interface XRepository
</p>
@param Query
- the SPARQL query string
+ the SPARQL query <atom>string</atom>
@returns
an iterator over the query result graph, represented as an
enumeration of <type>Statement</type>
@throws QueryException
- if the query string is malformed, or evaluation fails
+ if the query is malformed, or evaluation fails
@throws RepositoryException
if an error occurs when accessing the repository.
@@ -444,13 +444,13 @@ interface XRepository
</p>
@param Query
- the SPARQL query string
+ the SPARQL query <atom>string</atom>
@returns
the boolean query result
@throws QueryException
- if the query string is malformed, or evaluation fails
+ if the query is malformed, or evaluation fails
@throws RepositoryException
if an error occurs when accessing the repository.
generated by cgit (git 2.34.1) at 2024-07-11 17:11:40 +0000