From de8c35bb47c4847bb378ba1aed717872d8ba4dd3 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:19 +0100 Subject: odfmetadata4: #i109968#,#i109601#: add css.text.TextRangeContentProperties --- .../sun/star/text/TextRangeContentProperties.idl | 133 +++++++++++++++++++++ offapi/com/sun/star/text/makefile.mk | 1 + 2 files changed, 134 insertions(+) create mode 100644 offapi/com/sun/star/text/TextRangeContentProperties.idl diff --git a/offapi/com/sun/star/text/TextRangeContentProperties.idl b/offapi/com/sun/star/text/TextRangeContentProperties.idl new file mode 100644 index 000000000000..74acb67cf9ed --- /dev/null +++ b/offapi/com/sun/star/text/TextRangeContentProperties.idl @@ -0,0 +1,133 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_text_TextRangeContentProperties_idl__ +#define __com_sun_star_text_TextRangeContentProperties_idl__ + +#ifndef __com_sun_star_table_XCell_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XTextContent_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XDocumentIndex_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XTextTable_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XTextFrame_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XTextSection_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XDocumentIndexMark_idl__ +#include +#endif + +#ifndef __com_sun_star_text_XFootnote_idl__ +#include +#endif + + +//============================================================================= + +module com { module sun { module star { module text { + +//============================================================================= + +/** describes the structural properties to retrieve text contents. + + @since OOo 3.3 + */ +service TextRangeContentProperties +{ + //------------------------------------------------------------------------- + /** may contain a document index. */ + [optional, readonly, property] com::sun::star::text::XDocumentIndex + DocumentIndex; + + //------------------------------------------------------------------------- + /** may contain a text table. */ + [optional, readonly, property] com::sun::star::text::XTextTable + TextTable; + + //------------------------------------------------------------------------- + /** may contain a table cell. */ + [optional, readonly, property] com::sun::star::table::XCell Cell; + + //------------------------------------------------------------------------- + /** may contain a text frame. */ + [optional, readonly, property] com::sun::star::text::XTextFrame + TextFrame; + + //------------------------------------------------------------------------- + /** may contain a text section. */ + [optional, readonly, property] com::sun::star::text::XTextSection + TextSection; + + //------------------------------------------------------------------------- + /** may contain a document index mark. */ + [optional, readonly, property] com::sun::star::text::XDocumentIndexMark + DocumentIndexMark; + + //------------------------------------------------------------------------- + /** may contain a reference mark. */ + [optional, readonly, property] com::sun::star::text::XTextContent + ReferenceMark; + + //------------------------------------------------------------------------- + /** may contain a footnote. */ + [optional, readonly, property] com::sun::star::text::XFootnote Footnote; + + //------------------------------------------------------------------------- + /** may contain a endnote. */ + [optional, readonly, property] com::sun::star::text::XFootnote Endnote; + + //------------------------------------------------------------------------- + /** may contain a nested text content. + + For example, may contain an InContentMetadata or a + MetadataField. + */ + [optional, readonly, property] com::sun::star::text::XTextContent + NestedTextContent; + +}; + +//============================================================================= + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/text/makefile.mk b/offapi/com/sun/star/text/makefile.mk index 28c3d1eaece3..4e6d24746af8 100644 --- a/offapi/com/sun/star/text/makefile.mk +++ b/offapi/com/sun/star/text/makefile.mk @@ -173,6 +173,7 @@ IDLFILES=\ TextPortionEnumeration.idl\ TextRange.idl\ TextRanges.idl\ + TextRangeContentProperties.idl\ TextSection.idl\ TextSections.idl\ TextSortable.idl\ -- cgit v1.2.3 From 0797739d84b9d613390d176803a0e9d71e0a5d18 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 9 Mar 2010 13:27:21 +0100 Subject: odfmetadata4: #i109601#: add XChild interface to MetadataField, InContentMetadata. --- offapi/com/sun/star/text/InContentMetadata.idl | 10 ++++++++++ offapi/com/sun/star/text/textfield/MetadataField.idl | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/offapi/com/sun/star/text/InContentMetadata.idl b/offapi/com/sun/star/text/InContentMetadata.idl index f6aec7bbee63..5eac10714576 100755 --- a/offapi/com/sun/star/text/InContentMetadata.idl +++ b/offapi/com/sun/star/text/InContentMetadata.idl @@ -32,6 +32,10 @@ #include #endif +#ifndef __com_sun_star_container_XChild_idl__ +#include +#endif + #ifndef __com_sun_star_text_TextContent_idl__ #include #endif @@ -68,6 +72,12 @@ service InContentMetadata annotated range of text can be enumerated. */ interface com::sun::star::container::XEnumerationAccess; + //------------------------------------------------------------------------- + /** The TextContent that is the parent of this text range. + @since OOo 3.3 + */ + interface com::sun::star::container::XChild; + }; diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl index 64918b12849f..962df24dcc06 100755 --- a/offapi/com/sun/star/text/textfield/MetadataField.idl +++ b/offapi/com/sun/star/text/textfield/MetadataField.idl @@ -32,6 +32,10 @@ #include #endif +#ifndef __com_sun_star_container_XChild_idl__ +#include +#endif + #ifndef __com_sun_star_text_TextField_idl__ #include #endif @@ -77,6 +81,13 @@ service MetadataField MetadataField can be enumerated. */ interface com::sun::star::container::XEnumerationAccess; + //------------------------------------------------------------------------- + /** The TextContent + that is the parent of this MetadataField. + @since OOo 3.3 + */ + interface com::sun::star::container::XChild; + //------------------------------------------------------------------------- /** this is the number format for this field. @see com::sun::star::util::NumberFormatter -- cgit v1.2.3 From 9f69ed267e3b04e5236b70703e72f04e456c67ca Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 15 Mar 2010 11:34:42 +0100 Subject: odfmetadata4: #i110033#: API change: remove rdfs:label statements for RDFa. css.rdf.XDocumentRepository: method getStatementRDFa() also returns a bool. librdf_repository: setStatementRDFa() no longer generates the rdfs:label statement. getStatementRDFa() no longer handles the rdfs:label statement. add a set to store elements with xhtml:content. RDFaExportHelper: adapt export to new getStatementRDFa() and lack of rdfs:label statement. --- offapi/com/sun/star/rdf/XDocumentRepository.idl | 28 ++++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl b/offapi/com/sun/star/rdf/XDocumentRepository.idl index ee42faf0c51c..215fd89fa954 100644 --- a/offapi/com/sun/star/rdf/XDocumentRepository.idl +++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl @@ -28,6 +28,10 @@ #ifndef __com_sun_star_rdf_XDocumentRepository_idl__ #define __com_sun_star_rdf_XDocumentRepository_idl__ +#ifndef __com_sun_star_beans_Pair_idl__ +#include +#endif + #ifndef __com_sun_star_rdf_XMetadatable_idl__ #include #endif @@ -84,13 +88,6 @@ interface XDocumentRepository : XRepository Subject Predicate XLiteral(RDFaContent^^RDFaDatatype) - Further, add the following RDF statement to the same unspecified - named graph: -
    -
  • - Subject rdfs:label XLiteral(Object->getText()) -
    • -

@@ -172,13 +169,13 @@ interface XDocumentRepository : XRepository
  • if the element has no RDFa meta-data attributes: the empty sequence.
  • if the element has RDFa meta-data attributes: - and no rdfa:content attached: - a sequence with the RDFa-statements corresponding to the - attributes
    • -
  • if the element has RDFa meta-data attributes, - and also rdfa:content attached: - a sequence with the RDFa-statements corresponding to the - attributes, including the RDFa-labels-statement
    • +
      +
    • a sequence with the RDFa-statements corresponding to the + attributes.
      • +
    • a flag indicating whether there is a xhtml:content + attribute.
      • +
    + @throws com::sun::star::lang::IllegalArgumentException @@ -190,7 +187,8 @@ interface XDocumentRepository : XRepository @see Statement */ - sequence getStatementRDFa([in] XMetadatable Element) + com::sun::star::beans::Pair< sequence, boolean > + getStatementRDFa([in] XMetadatable Element) raises( com::sun::star::lang::IllegalArgumentException, RepositoryException ); -- cgit v1.2.3