4afc9f7fa4
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
845 lines
32 KiB
Java
845 lines
32 KiB
Java
/*************************************************************************
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* $RCSfile: RDFRepositoryTest.java,v $
|
|
*
|
|
* $Revision: 1.2 $
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
************************************************************************/
|
|
|
|
package complex.unoxml;
|
|
|
|
import complexlib.ComplexTestCase;
|
|
import helper.StreamSimulator;
|
|
|
|
import com.sun.star.uno.UnoRuntime;
|
|
import com.sun.star.uno.XComponentContext;
|
|
import com.sun.star.uno.Any;
|
|
import com.sun.star.lang.XMultiServiceFactory;
|
|
import com.sun.star.lang.XInitialization;
|
|
import com.sun.star.lang.XEventListener;
|
|
import com.sun.star.lang.XServiceInfo;
|
|
import com.sun.star.lang.IllegalArgumentException;
|
|
import com.sun.star.lang.WrappedTargetException;
|
|
import com.sun.star.lang.WrappedTargetRuntimeException;
|
|
import com.sun.star.beans.XPropertySet;
|
|
import com.sun.star.beans.PropertyValue;
|
|
import com.sun.star.beans.StringPair;
|
|
import com.sun.star.container.XEnumeration;
|
|
import com.sun.star.container.ElementExistException;
|
|
import com.sun.star.container.NoSuchElementException;
|
|
import com.sun.star.io.XInputStream;
|
|
import com.sun.star.io.XOutputStream;
|
|
import com.sun.star.text.XTextRange;
|
|
import com.sun.star.text.XText;
|
|
import com.sun.star.rdf.*;
|
|
|
|
/**
|
|
* Test case for service com.sun.star.rdf.Repository
|
|
* Currently, this service is implemented in
|
|
* unoxml/source/rdf/librdf_repository.cxx
|
|
*
|
|
* @author mst
|
|
*/
|
|
public class RDFRepositoryTest extends ComplexTestCase
|
|
{
|
|
XComponentContext xContext;
|
|
String tempDir;
|
|
|
|
XDocumentRepository xRep;
|
|
XURI foo;
|
|
XURI bar;
|
|
XURI baz;
|
|
XURI uint;
|
|
XURI rdfslabel;
|
|
XURI manifest;
|
|
XURI uuid;
|
|
XURI base;
|
|
XBlankNode blank;
|
|
XLiteral lit;
|
|
XLiteral litlang;
|
|
XLiteral littype;
|
|
String rdfs = "http://www.w3.org/2000/01/rdf-schema#";
|
|
|
|
public String[] getTestMethodNames ()
|
|
{
|
|
return new String[] { "check", "checkSPARQL", "checkRDFa" };
|
|
}
|
|
|
|
public void before()
|
|
{
|
|
try {
|
|
XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF();
|
|
assure("could not create MultiServiceFactory.", xMSF != null);
|
|
XPropertySet xPropertySet = (XPropertySet)
|
|
UnoRuntime.queryInterface(XPropertySet.class, xMSF);
|
|
Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext");
|
|
xContext = (XComponentContext)
|
|
UnoRuntime.queryInterface(XComponentContext.class, defaultCtx);
|
|
assure("could not get component context.", xContext != null);
|
|
|
|
tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF);
|
|
log.println("tempdir: " + tempDir);
|
|
|
|
foo = URI.create(xContext, "uri:foo");
|
|
assure("foo", null != foo);
|
|
bar = URI.create(xContext, "uri:bar");
|
|
assure("bar", null != bar);
|
|
baz = URI.create(xContext, "uri:baz");
|
|
assure("baz", null != baz);
|
|
uint = URI.create(xContext, "uri:int");
|
|
assure("uint", null != uint);
|
|
blank = BlankNode.create(xContext, "_:uno");
|
|
assure("blank", null != blank);
|
|
lit = Literal.create(xContext, "i am the literal");
|
|
assure("lit", null != lit);
|
|
litlang = Literal.createWithLanguage(xContext,
|
|
"i am the literal", "en");
|
|
assure("litlang", null != litlang);
|
|
littype = Literal.createWithType(xContext, "42", uint);
|
|
assure("littype", null != littype);
|
|
|
|
rdfslabel = URI.create(xContext, rdfs + "label");
|
|
assure("rdfslabel", null != rdfslabel);
|
|
manifest = URI.create(xContext, "manifest:manifest"); //FIXME
|
|
assure("manifest", null != manifest);
|
|
uuid = URI.create(xContext,
|
|
"urn:uuid:224ab023-77b8-4396-a75a-8cecd85b81e3");
|
|
assure("uuid", null != uuid);
|
|
base = URI.create(xContext, "base-uri:"); //FIXME
|
|
assure("base", null != base);
|
|
} catch (Exception e) {
|
|
report(e);
|
|
}
|
|
}
|
|
|
|
public void after()
|
|
{
|
|
xRep = null;
|
|
}
|
|
|
|
public void check()
|
|
{
|
|
try {
|
|
|
|
log.println("Creating service Repository...");
|
|
|
|
//FIXME: ?
|
|
// xRep = Repository.create(xContext);
|
|
xRep = (XDocumentRepository) UnoRuntime.queryInterface(
|
|
XDocumentRepository.class, Repository.create(xContext));
|
|
assure("null", null != xRep);
|
|
|
|
log.println("...done");
|
|
|
|
log.println("Checking that new repository is really empty...");
|
|
assure("empty: graphs", 0 == xRep.getGraphNames().length);
|
|
|
|
XEnumeration stmts;
|
|
stmts = xRep.getStatements(null, null, null);
|
|
assure("empty: stmts", !stmts.hasMoreElements());
|
|
|
|
log.println("...done");
|
|
|
|
log.println("Checking graph creation...");
|
|
|
|
XNamedGraph xFooGraph = xRep.createGraph(foo);
|
|
assure("foo graph", null != xFooGraph);
|
|
|
|
try {
|
|
xRep.createGraph(foo);
|
|
assure("creating duplicate graph was allowed", false);
|
|
} catch (ElementExistException e) {
|
|
// ignore
|
|
}
|
|
|
|
try {
|
|
xRep.createGraph(null);
|
|
assure("invalid graph name was allowed", false);
|
|
} catch (IllegalArgumentException e) {
|
|
// ignore
|
|
}
|
|
|
|
XURI[] names = xRep.getGraphNames();
|
|
assure("no foo graph in getGraphNames",
|
|
1 == names.length && eq(names[0], foo));
|
|
assure("no foo graph", null != xRep.getGraph(foo));
|
|
|
|
stmts = xFooGraph.getStatements(null, null, null);
|
|
assure("stmts in foo graph", !stmts.hasMoreElements());
|
|
|
|
XOutputStream xFooOut =
|
|
new StreamSimulator(tempDir + "empty.rdf", false, param);
|
|
xRep.exportGraph(FileFormat.RDF_XML, xFooOut, foo, base);
|
|
xFooOut.closeOutput();
|
|
|
|
XInputStream xFooIn =
|
|
new StreamSimulator(tempDir + "empty.rdf", true, param);
|
|
xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base);
|
|
assure("no bar graph", null != xRep.getGraph(bar));
|
|
|
|
log.println("...done");
|
|
|
|
log.println("Checking graph manipulation...");
|
|
|
|
XEnumeration xFooEnum;
|
|
|
|
Statement xFoo_FooBarBaz = new Statement(foo, bar, baz, foo);
|
|
xFooGraph.addStatement(foo, bar, baz);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,baz)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz }));
|
|
|
|
Statement xFoo_FooBarBlank = new Statement(foo, bar, blank, foo);
|
|
xFooGraph.addStatement(foo, bar, blank);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,blank)",
|
|
eq(xFooEnum,
|
|
new Statement[] { xFoo_FooBarBaz, xFoo_FooBarBlank }));
|
|
xFooEnum = xRep.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,blank) (global)",
|
|
eq(xFooEnum,
|
|
new Statement[] { xFoo_FooBarBaz, xFoo_FooBarBlank }));
|
|
|
|
Statement xFoo_BazBarLit = new Statement(baz, bar, lit, foo);
|
|
xFooGraph.addStatement(baz, bar, lit);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(baz,bar,lit)",
|
|
eq(xFooEnum, new Statement[] {
|
|
xFoo_FooBarBaz, xFoo_FooBarBlank, xFoo_BazBarLit }));
|
|
xFooEnum = xFooGraph.getStatements(baz, bar, null);
|
|
assure("addStatement(baz,bar,lit) (baz,bar)",
|
|
eq(xFooEnum, new Statement[] { xFoo_BazBarLit }));
|
|
|
|
Statement xFoo_BazBarLitlang =
|
|
new Statement(baz, bar, litlang, foo);
|
|
xFooGraph.addStatement(baz, bar, litlang);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(baz,bar,litlang)",
|
|
eq(xFooEnum, new Statement[] {
|
|
xFoo_FooBarBaz, xFoo_FooBarBlank, xFoo_BazBarLit,
|
|
xFoo_BazBarLitlang }));
|
|
xFooEnum = xFooGraph.getStatements(null, null, baz);
|
|
assure("addStatement(baz,bar,litlang) (baz)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz }));
|
|
|
|
Statement xFoo_BazBarLittype =
|
|
new Statement(baz, bar, littype, foo);
|
|
xFooGraph.addStatement(baz, bar, littype);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(baz,bar,littype)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz, xFoo_FooBarBlank,
|
|
xFoo_BazBarLit, xFoo_BazBarLitlang, xFoo_BazBarLittype }));
|
|
|
|
xFooGraph.removeStatements(baz, bar, litlang);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("removeStatement(baz,bar,litlang)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz, xFoo_FooBarBlank,
|
|
xFoo_BazBarLit, xFoo_BazBarLittype }));
|
|
|
|
xFooGraph.removeStatements(foo, bar, null);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("removeStatement(foo,bar,null)",
|
|
eq(xFooEnum, new Statement[] {
|
|
xFoo_BazBarLit, xFoo_BazBarLittype }));
|
|
|
|
xFooGraph.addStatement(foo, bar, baz);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,baz) (re-add)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz,
|
|
xFoo_BazBarLit, xFoo_BazBarLittype }));
|
|
|
|
xFooGraph.addStatement(foo, bar, baz);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,baz) (duplicate)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz,
|
|
xFoo_BazBarLit, xFoo_BazBarLittype }));
|
|
|
|
xFooGraph.addStatement(xFooGraph, bar, baz);
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("addStatement(foo,bar,baz) (triplicate, as graph)",
|
|
eq(xFooEnum, new Statement[] { xFoo_FooBarBaz,
|
|
xFoo_BazBarLit, xFoo_BazBarLittype }));
|
|
|
|
log.println("...done");
|
|
|
|
log.println("Checking graph import/export...");
|
|
|
|
xFooOut = new StreamSimulator(tempDir + "foo.rdf", false, param);
|
|
xRep.exportGraph(FileFormat.RDF_XML, xFooOut, foo, base);
|
|
xFooOut.closeOutput();
|
|
|
|
xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param);
|
|
try {
|
|
xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base);
|
|
assure("importing existing graph did not fail", false);
|
|
} catch (ElementExistException e) {
|
|
// ignore
|
|
}
|
|
|
|
xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param);
|
|
xRep.importGraph(FileFormat.RDF_XML, xFooIn, baz, base);
|
|
XNamedGraph xBazGraph = xRep.getGraph(baz);
|
|
assure("no baz graph", null != xBazGraph);
|
|
|
|
Statement xBaz_FooBarBaz = new Statement(foo, bar, baz, baz);
|
|
Statement xBaz_BazBarLit = new Statement(baz, bar, lit, baz);
|
|
Statement xBaz_BazBarLittype =
|
|
new Statement(baz, bar, littype, baz);
|
|
XEnumeration xBazEnum = xBazGraph.getStatements(null, null, null);
|
|
assure("importing exported graph",
|
|
eq(xBazEnum, new Statement[] {
|
|
xBaz_FooBarBaz, xBaz_BazBarLit, xBaz_BazBarLittype }));
|
|
|
|
log.println("...done");
|
|
|
|
log.println("Checking graph deletion...");
|
|
|
|
xFooGraph.clear();
|
|
xFooEnum = xFooGraph.getStatements(null, null, null);
|
|
assure("clear", eq(xFooEnum, new Statement[] { }));
|
|
|
|
xRep.destroyGraph(baz);
|
|
assure("baz graph zombie", null == xRep.getGraph(baz));
|
|
|
|
try {
|
|
xBazGraph.clear();
|
|
assure("deleted graph not invalid (clear)", false);
|
|
} catch (NoSuchElementException e) {
|
|
// ignore
|
|
}
|
|
|
|
try {
|
|
xBazGraph.addStatement(foo, foo, foo);
|
|
assure("deleted graph not invalid (add)", false);
|
|
} catch (NoSuchElementException e) {
|
|
// ignore
|
|
}
|
|
|
|
try {
|
|
xBazGraph.removeStatements(null, null, null);
|
|
assure("deleted graph not invalid (remove)", false);
|
|
} catch (NoSuchElementException e) {
|
|
// ignore
|
|
}
|
|
|
|
try {
|
|
xBazGraph.getStatements(null, null, null);
|
|
assure("deleted graph not invalid (get)", false);
|
|
} catch (NoSuchElementException e) {
|
|
// ignore
|
|
}
|
|
|
|
log.println("...done");
|
|
|
|
} catch (Exception e) {
|
|
report(e);
|
|
}
|
|
}
|
|
|
|
public void checkSPARQL()
|
|
{
|
|
try {
|
|
|
|
log.println("Checking SPARQL queries...");
|
|
|
|
XInputStream xIn = new StreamSimulator(
|
|
util.utils.getFullTestDocName("example.rdf"), true, param);
|
|
xRep.importGraph(FileFormat.RDF_XML, xIn, manifest, base);
|
|
|
|
String query;
|
|
query = "SELECT ?p WHERE { ?p rdf:type pkg:Package . }";
|
|
XQuerySelectResult result = xRep.querySelect(mkNss() + query);
|
|
assure("query: package-id\n" + query,
|
|
eq(result, new String[] { "p" },
|
|
new XNode[][] { { uuid } }));
|
|
|
|
query = "SELECT ?part ?path FROM <" + manifest +
|
|
"> WHERE { ?pkg rdf:type pkg:Package . ?pkg pkg:hasPart ?part ."
|
|
+ " ?part pkg:path ?path . ?part rdf:type odf:ContentFile. }";
|
|
result = xRep.querySelect(mkNss() + query);
|
|
assure("query: contentfile",
|
|
eq(result, new String[] { "part", "path" },
|
|
new XNode[][] { { BlankNode.create(xContext, "whatever"),
|
|
Literal.create(xContext, "content.xml") } }));
|
|
|
|
query = "SELECT ?pkg ?path FROM <" + toS(manifest) + "> WHERE { "
|
|
+ "?pkg rdf:type pkg:Package . ?pkg pkg:hasPart ?part . "
|
|
+ "?part pkg:path ?path . ?part rdf:type odf:ContentFile. }";
|
|
result = xRep.querySelect(mkNss() + query);
|
|
assure("query: contentfile\n" + query,
|
|
eq(result, new String[] { "pkg", "path" },
|
|
new XNode[][] { { uuid ,
|
|
Literal.create(xContext, "content.xml") } }));
|
|
|
|
query = "SELECT ?part ?path FROM <" + toS(manifest) + "> WHERE { "
|
|
+ "?pkg rdf:type pkg:Package . ?pkg pkg:hasPart ?part . "
|
|
+ "?part pkg:path ?path . ?part rdf:type odf:StylesFile. }";
|
|
result = xRep.querySelect(mkNss() + query);
|
|
assure("query: stylesfile\n" + query,
|
|
eq(result, new String[] { "part", "path" },
|
|
new XNode[][] { }));
|
|
|
|
query = "SELECT ?part ?path FROM <" + toS(manifest) + "> WHERE { "
|
|
+ "?pkg rdf:type pkg:Package . ?pkg pkg:hasPart ?part . "
|
|
+ "?part pkg:path ?path . ?part rdf:type odf:MetadataFile. }";
|
|
result = xRep.querySelect(mkNss() + query);
|
|
assure("query: metadatafile\n" + query,
|
|
eq(result, new String[] { "part", "path" },
|
|
new XNode[][] { {
|
|
URI.create(xContext, "http://hospital-employee/doctor"),
|
|
Literal.create(xContext,
|
|
"meta/hospital/doctor.rdf") } }));
|
|
|
|
//FIXME redland BUG
|
|
String uri = "uri:example-element-2";
|
|
query = "SELECT ?path ?idref FROM <" + toS(manifest) + "> WHERE { "
|
|
// + "<" + toS(uuid) + "> rdf:type pkg:Package ; "
|
|
// + " pkg:hasPart ?part . "
|
|
+ "<" + toS(uuid) + "> pkg:hasPart ?part . "
|
|
+ "?part pkg:path ?path ; "
|
|
+ " rdf:type ?type ; "
|
|
+ " pkg:hasPart <" + uri + "> . "
|
|
// + "<" + uri + "> rdf:type odf:Element ; "
|
|
+ "<" + uri + "> "
|
|
+ " pkg:idref ?idref . "
|
|
+ " FILTER (?type = odf:ContentFile || ?type = odf:StylesFile)"
|
|
+ " }";
|
|
//log.println(query);
|
|
result = xRep.querySelect(mkNss() + query);
|
|
assure("query: example-element-2\n" + query,
|
|
eq(result, new String[] { "path", "idref" },
|
|
new XNode[][] { {
|
|
Literal.create(xContext, "content.xml"),
|
|
Literal.create(xContext, "ID_B") } }));
|
|
|
|
// CONSTRUCT result triples have no graph!
|
|
Statement x_PkgFooLit = new Statement(uuid, foo, lit, null);
|
|
query = "CONSTRUCT { ?pkg <" + toS(foo) + "> \"" +
|
|
lit.getStringValue() + "\" } FROM <" + toS(manifest) +
|
|
"> WHERE { ?pkg rdf:type pkg:Package . } ";
|
|
XEnumeration xResultEnum = xRep.queryConstruct(mkNss() + query);
|
|
assure("query: construct\n" + query,
|
|
eq(xResultEnum, new Statement[] { x_PkgFooLit }));
|
|
|
|
query = "ASK { ?pkg rdf:type pkg:Package . }";
|
|
boolean bResult = xRep.queryAsk(mkNss() + query);
|
|
assure("query: ask\n" + query, bResult);
|
|
|
|
log.println("...done");
|
|
|
|
} catch (Exception e) {
|
|
report(e);
|
|
}
|
|
}
|
|
|
|
public void checkRDFa()
|
|
{
|
|
try {
|
|
log.println("Checking RDFa gunk...");
|
|
|
|
String content = "behold, for i am the content.";
|
|
XTextRange xTR = new TestRange(content);
|
|
XMetadatable xM = (XMetadatable) xTR;
|
|
|
|
Statement[] result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: not empty (initial)",
|
|
0 == result.length);
|
|
|
|
try {
|
|
xRep.setStatementRDFa(foo, new XURI[] {}, xM, "", null);
|
|
assure("RDFa: set: no predicate", false);
|
|
} catch (IllegalArgumentException e) {
|
|
// ignore
|
|
}
|
|
|
|
try {
|
|
xRep.setStatementRDFa(foo, new XURI[] {bar}, null, "", null);
|
|
assure("RDFa: set: null", false);
|
|
} catch (IllegalArgumentException e) {
|
|
// ignore
|
|
}
|
|
|
|
XLiteral trlit = Literal.create(xContext, content);
|
|
Statement x_FooBarTRLit = new Statement(foo, bar, trlit, null);
|
|
xRep.setStatementRDFa(foo, new XURI[] { bar }, xM, "", null);
|
|
|
|
result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: without content",
|
|
1 == result.length && eq((Statement)result[0], x_FooBarTRLit));
|
|
|
|
//FIXME: do this?
|
|
xTR.setString(lit.getStringValue());
|
|
/*
|
|
Statement xFooBarLit = new Statement(foo, bar, lit, null);
|
|
result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: change",
|
|
eq((Statement)result.First, xFooBarLit) && null == result.Second);
|
|
*/
|
|
|
|
Statement x_FooBarLittype = new Statement(foo, bar, littype, null);
|
|
Statement x_FooLabelLit = new Statement(foo, rdfslabel, lit, null);
|
|
xRep.setStatementRDFa(foo, new XURI[] { bar }, xM, "42", uint);
|
|
|
|
result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: with content",
|
|
2 == result.length && eq((Statement)result[0], x_FooLabelLit)
|
|
&& eq((Statement)result[1], x_FooBarLittype));
|
|
|
|
//FIXME: do this?
|
|
xTR.setString(content);
|
|
/*
|
|
Statement xFooLabelTRLit = new Statement(foo, rdfslabel, trlit, null);
|
|
result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: change (label)",
|
|
eq((Statement)result.First, xFooBarLittype) &&
|
|
eq((Statement)result.Second, xFooLabelTRLit));
|
|
*/
|
|
|
|
xRep.removeStatementRDFa((XMetadatable)xTR);
|
|
|
|
result = xRep.getStatementRDFa((XMetadatable)xTR);
|
|
assure("RDFa: get: not empty (removed)",
|
|
0 == result.length);
|
|
|
|
xRep.setStatementRDFa(foo, new XURI[] { foo, bar, baz }, xM,
|
|
"", null);
|
|
|
|
Statement x_FooFooTRLit = new Statement(foo, foo, trlit, null);
|
|
Statement x_FooBazTRLit = new Statement(foo, baz, trlit, null);
|
|
result = xRep.getStatementRDFa((XMetadatable) xTR);
|
|
assure("RDFa: get: without content (multiple predicates, reinsert)",
|
|
eq(result, new Statement[] {
|
|
x_FooFooTRLit, x_FooBarTRLit, x_FooBazTRLit }));
|
|
|
|
xRep.removeStatementRDFa((XMetadatable)xTR);
|
|
|
|
result = xRep.getStatementRDFa((XMetadatable) xTR);
|
|
assure("RDFa: get: not empty (re-removed)",
|
|
0 == result.length);
|
|
|
|
log.println("...done");
|
|
|
|
} catch (Exception e) {
|
|
report(e);
|
|
}
|
|
}
|
|
|
|
// utilities -------------------------------------------------------------
|
|
|
|
public void report2(Exception e)
|
|
{
|
|
if (e instanceof WrappedTargetException)
|
|
{
|
|
log.println("Cause:");
|
|
Exception cause = (Exception)
|
|
(((WrappedTargetException)e).TargetException);
|
|
log.println(cause.toString());
|
|
report2(cause);
|
|
} else if (e instanceof WrappedTargetRuntimeException) {
|
|
log.println("Cause:");
|
|
Exception cause = (Exception)
|
|
(((WrappedTargetRuntimeException)e).TargetException);
|
|
log.println(cause.toString());
|
|
report2(cause);
|
|
}
|
|
}
|
|
|
|
public void report(Exception e) {
|
|
log.println("Exception occurred:");
|
|
e.printStackTrace((java.io.PrintWriter) log);
|
|
report2(e);
|
|
failed();
|
|
}
|
|
|
|
public static String toS(XNode n) {
|
|
if (null == n) return "< null >";
|
|
return n.getStringValue();
|
|
}
|
|
|
|
static boolean isBlank(XNode i_node)
|
|
{
|
|
XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface(
|
|
XBlankNode.class, i_node);
|
|
return blank != null;
|
|
}
|
|
|
|
/*
|
|
static class Statement implements XStatement
|
|
{
|
|
XResource m_Subject;
|
|
XResource m_Predicate;
|
|
XNode m_Object;
|
|
XURI m_Graph;
|
|
|
|
Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object,
|
|
XURI i_Graph)
|
|
{
|
|
m_Subject = i_Subject;
|
|
m_Predicate = i_Predicate;
|
|
m_Object = i_Object;
|
|
m_Graph = i_Graph;
|
|
}
|
|
|
|
public XResource getSubject() { return m_Subject; }
|
|
public XResource getPredicate() { return m_Predicate; }
|
|
public XNode getObject() { return m_Object; }
|
|
public XURI getGraph() { return m_Graph; }
|
|
}
|
|
*/
|
|
|
|
static Statement[] toSeq(XEnumeration i_Enum) throws Exception
|
|
{
|
|
java.util.Collection c = new java.util.Vector();
|
|
while (i_Enum.hasMoreElements()) {
|
|
Statement s = (Statement) i_Enum.nextElement();
|
|
//log.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
|
|
c.add(s);
|
|
}
|
|
// return (Statement[]) c.toArray();
|
|
// java sucks
|
|
Object[] arr = c.toArray();
|
|
Statement[] ret = new Statement[arr.length];
|
|
for (int i = 0; i < arr.length; ++i) {
|
|
ret[i] = (Statement) arr[i];
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception
|
|
{
|
|
java.util.Collection c = new java.util.Vector();
|
|
while (i_Enum.hasMoreElements()) {
|
|
XNode[] s = (XNode[]) i_Enum.nextElement();
|
|
c.add(s);
|
|
}
|
|
// return (XNode[][]) c.toArray();
|
|
Object[] arr = c.toArray();
|
|
XNode[][] ret = new XNode[arr.length][];
|
|
for (int i = 0; i < arr.length; ++i) {
|
|
ret[i] = (XNode[]) arr[i];
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static class BindingComp implements java.util.Comparator
|
|
{
|
|
public int compare(Object i_Left, Object i_Right)
|
|
{
|
|
XNode[] left = (XNode[]) i_Left;
|
|
XNode[] right = (XNode[]) i_Right;
|
|
if (left.length != right.length) throw new RuntimeException();
|
|
for (int i = 0; i < left.length; ++i) {
|
|
int eq = (left[i].getStringValue().compareTo(
|
|
right[i].getStringValue()));
|
|
if (eq != 0) return eq;
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
static class StmtComp implements java.util.Comparator
|
|
{
|
|
public int compare(Object i_Left, Object i_Right)
|
|
{
|
|
int eq;
|
|
Statement left = (Statement) i_Left;
|
|
Statement right = (Statement) i_Right;
|
|
if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq;
|
|
if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq;
|
|
if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq;
|
|
if ((eq = cmp(left.Object, right.Object )) != 0) return eq;
|
|
return 0;
|
|
}
|
|
|
|
public int cmp(XNode i_Left, XNode i_Right)
|
|
{
|
|
if (isBlank(i_Left)) {
|
|
return isBlank(i_Right) ? 0 : 1;
|
|
} else {
|
|
if (isBlank(i_Right)) {
|
|
return -1;
|
|
} else {
|
|
return toS(i_Left).compareTo(toS(i_Right));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static boolean eq(Statement i_Left, Statement i_Right)
|
|
{
|
|
XURI lG = i_Left.Graph;
|
|
XURI rG = i_Right.Graph;
|
|
if (!eq(lG, rG)) {
|
|
log.println("Graphs differ: " + toS(lG) + " != " + toS(rG));
|
|
return false;
|
|
}
|
|
if (!eq(i_Left.Subject, i_Right.Subject)) {
|
|
log.println("Subjects differ: " +
|
|
i_Left.Subject.getStringValue() + " != " +
|
|
i_Right.Subject.getStringValue());
|
|
return false;
|
|
}
|
|
if (!eq(i_Left.Predicate, i_Right.Predicate)) {
|
|
log.println("Predicates differ: " +
|
|
i_Left.Predicate.getStringValue() + " != " +
|
|
i_Right.Predicate.getStringValue());
|
|
return false;
|
|
}
|
|
if (!eq(i_Left.Object, i_Right.Object)) {
|
|
log.println("Objects differ: " +
|
|
i_Left.Object.getStringValue() + " != " +
|
|
i_Right.Object.getStringValue());
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static boolean eq(Statement[] i_Result, Statement[] i_Expected)
|
|
{
|
|
if (i_Result.length != i_Expected.length) {
|
|
log.println("eq: different lengths: " + i_Result.length + " " +
|
|
i_Expected.length);
|
|
return false;
|
|
}
|
|
Statement[] expected = (Statement[])
|
|
java.util.Arrays.asList(i_Expected).toArray();
|
|
java.util.Arrays.sort(i_Result, new StmtComp());
|
|
java.util.Arrays.sort(expected, new StmtComp());
|
|
for (int i = 0; i < expected.length; ++i) {
|
|
if (!eq(i_Result[i], expected[i])) return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static boolean eq(XEnumeration i_Enum, Statement[] i_Expected)
|
|
throws Exception
|
|
{
|
|
Statement[] current = toSeq(i_Enum);
|
|
return eq(current, i_Expected);
|
|
}
|
|
|
|
static boolean eq(XNode i_Left, XNode i_Right)
|
|
{
|
|
if (i_Left == null) {
|
|
return (i_Right == null);
|
|
} else {
|
|
return (i_Right != null) &&
|
|
(i_Left.getStringValue().equals(i_Right.getStringValue())
|
|
// FIXME: hack: blank nodes considered equal
|
|
|| (isBlank(i_Left) && isBlank(i_Right)));
|
|
}
|
|
}
|
|
|
|
static boolean eq(XQuerySelectResult i_Result,
|
|
String[] i_Vars, XNode[][] i_Bindings) throws Exception
|
|
{
|
|
String[] vars = (String[]) i_Result.getBindingNames();
|
|
XEnumeration iter = (XEnumeration) i_Result;
|
|
XNode[][] bindings = toSeqs(iter);
|
|
if (vars.length != i_Vars.length) {
|
|
log.println("var lengths differ");
|
|
return false;
|
|
}
|
|
if (bindings.length != i_Bindings.length) {
|
|
log.println("binding lengths differ: " + i_Bindings.length +
|
|
" vs " + bindings.length );
|
|
return false;
|
|
}
|
|
java.util.Arrays.sort(bindings, new BindingComp());
|
|
java.util.Arrays.sort(i_Bindings, new BindingComp());
|
|
for (int i = 0; i < i_Bindings.length; ++i) {
|
|
if (i_Bindings[i].length != i_Vars.length) {
|
|
log.println("TEST ERROR!");
|
|
throw new Exception();
|
|
}
|
|
if (bindings[i].length != i_Vars.length) {
|
|
log.println("binding length and var length differ");
|
|
return false;
|
|
}
|
|
for (int j = 0; j < i_Vars.length; ++j) {
|
|
if (!eq(bindings[i][j], i_Bindings[i][j])) {
|
|
log.println("bindings differ: " +
|
|
toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j]));
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
for (int i = 0; i < i_Vars.length; ++i) {
|
|
if (!vars[i].equals(i_Vars[i])) {
|
|
log.println("variable names differ: " +
|
|
vars[i] + " != " + i_Vars[i]);
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static String mkNamespace(String i_prefix, String i_namespace)
|
|
{
|
|
return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n";
|
|
}
|
|
|
|
static String mkNss()
|
|
{
|
|
String namespaces = mkNamespace("rdf",
|
|
"http://www.w3.org/1999/02/22-rdf-syntax-ns#");
|
|
namespaces += mkNamespace("pkg",
|
|
"http://docs.oasis-open.org/opendocument/meta/package/common#");
|
|
namespaces += mkNamespace("odf",
|
|
"http://docs.oasis-open.org/opendocument/meta/package/odf#");
|
|
return namespaces;
|
|
}
|
|
|
|
class TestRange implements XTextRange, XMetadatable, XServiceInfo
|
|
{
|
|
String m_Stream;
|
|
String m_XmlId;
|
|
String m_Text;
|
|
TestRange(String i_Str) { m_Text = i_Str; }
|
|
|
|
public String getStringValue() { return ""; }
|
|
public String getNamespace() { return ""; }
|
|
public String getLocalName() { return ""; }
|
|
|
|
public StringPair getMetadataReference()
|
|
{ return new StringPair(m_Stream, m_XmlId); }
|
|
public void setMetadataReference(StringPair i_Ref)
|
|
throws IllegalArgumentException
|
|
{ m_Stream = (String)i_Ref.First; m_XmlId = (String)i_Ref.Second; }
|
|
public void ensureMetadataReference()
|
|
{ m_Stream = "content.xml"; m_XmlId = "42"; }
|
|
|
|
public String getImplementationName() { return null; }
|
|
public String[] getSupportedServiceNames() { return null; }
|
|
public boolean supportsService(String i_Svc)
|
|
{ return i_Svc.equals("com.sun.star.text.Paragraph"); }
|
|
|
|
public XText getText() { return null; }
|
|
public XTextRange getStart() { return null; }
|
|
public XTextRange getEnd() { return null; }
|
|
public String getString() { return m_Text; }
|
|
public void setString(String i_Str) { m_Text = i_Str; }
|
|
}
|
|
}
|
|
|