offapi/com/sun/star/text/textfield/SetExpression.idl | 43 ++++++++++++------- offapi/type_reference/types.rdb |binary sw/source/core/unocore/unomap.cxx | 1 xmloff/source/text/txtfldi.cxx | 1 4 files changed, 28 insertions(+), 17 deletions(-)
New commits: commit 10459e41c4e28bb70e21761d46028a0341109b26 Author: Michael Stahl <mst...@redhat.com> Date: Tue Mar 19 13:28:35 2013 +0100 remove unused VariableName code/comments Change-Id: Ifa0ae6d870b48f4f1dec013c183efc64736dd8ea diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 8e1f682..0aacac7 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -1734,7 +1734,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s {SW_PROP_NMID(UNO_NAME_INPUT), FIELD_PROP_BOOL1, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, {SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL3, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, {SW_PROP_NMID(UNO_NAME_IS_VISIBLE), FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, - //TODO: UNO_NAME_VARIABLE_NAME gibt es das wirklich? {SW_PROP_NMID(UNO_NAME_SEQUENCE_VALUE), FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0}, {SW_PROP_NMID(UNO_NAME_SUB_TYPE), FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0}, {SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE, CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0}, diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 245d7e4..7e1fb29 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -154,7 +154,6 @@ const sal_Char sAPI_full_name[] = "FullName"; const sal_Char sAPI_place_holder_type[] = "PlaceHolderType"; const sal_Char sAPI_place_holder[] = "PlaceHolder"; const sal_Char sAPI_hint[] = "Hint"; -const sal_Char sAPI_variable_name[] = "VariableName"; const sal_Char sAPI_name[] = "Name"; const sal_Char sAPI_sub_type[] = "SubType"; const sal_Char sAPI_numbering_separator[] = "NumberingSeparator"; commit cd360473ae2618c24f4d3b83382fde9f1c7b175d Author: Michael Stahl <mst...@redhat.com> Date: Tue Mar 19 13:28:08 2013 +0100 offapi: reformat SetExpression.idl Change-Id: I6119582d0809c12a273b15ea021758f8d3a6e196 diff --git a/offapi/com/sun/star/text/textfield/SetExpression.idl b/offapi/com/sun/star/text/textfield/SetExpression.idl index cb79b8b..d68c2c9 100644 --- a/offapi/com/sun/star/text/textfield/SetExpression.idl +++ b/offapi/com/sun/star/text/textfield/SetExpression.idl @@ -35,48 +35,61 @@ published service SetExpression /** contains the textual content of the field. */ - [property]string Content; + [property] string Content; + /** contains the current content of the text field. - <p> This property is especially useful for import/export purposes. </p> + <p>This property is especially useful for import/export purposes.</p> */ - [property]string CurrentPresentation; + [property] string CurrentPresentation; /** this is the number format for this field. @see com::sun::star::util::NumberFormatter */ - [property]long NumberFormat; + [property] long NumberFormat; + /** specifies the type of the numbering as <type scope="com::sun::star::style">NumberingType</type> */ - [property]short NumberingType; + [property] short NumberingType; + /** determines whether the content is displayed or evaluated. */ - [property]boolean IsShowFormula; + [property] boolean IsShowFormula; + /** contains an informational text that is displayed at the user interface if it's an input field. */ - [property]string Hint; + [property] string Hint; + /** determines whether this field is an input field. */ - [property]boolean IsInput; + [property] boolean IsInput; + /** determines whether the field is visible. */ - [property]boolean IsVisible; + [property] boolean IsVisible; + /** contains the sequence value when this field is used as sequence field. */ - [property]short SequenceValue; + [property] short SequenceValue; + /** determines the type of the variable as described in <type scope="com::sun::star::text">SetVariableType</type> */ - [property]short SubType; + [property] short SubType; + /** contains the numerical value of the field. */ [property]double Value; - /** contains the name of the set expression field master this field is connected to. + + /** contains the name of the set expression field master this field is + connected to. */ [property, readonly] string VariableName; - /** determines whether changes in language attributes at the position the text field - is located also change the number format as appropriate for this language. + + /** determines whether changes in language attributes at the position + the text field is located also change the number format as appropriate + for this language. @since OOo 1.1.2 */ commit 3b2cbfaa5623ea8443ce1084ece642139de7539d Author: Michael Stahl <mst...@redhat.com> Date: Tue Mar 19 13:22:17 2013 +0100 API CHANGE: SetExpression VariableName is read-only The implementation in Writer has been read-only since initial CVS import, so adapt com.sun.star.text.textfield.SetExpression to implementation. Change-Id: I70cdd5d0a44cb86426f533c00f86874e8dde8b87 SERVICE: /UCR/com/sun/star/text/textfield/SetExpression incompatible change: Field 11 ('VariableName') of r1 is not longer a property of this SERVICE in r2 incompatible change: Field 11 ('VariableName') of r2 is a new property compared to this SERVICE in r1 and is not 'optional' diff --git a/offapi/com/sun/star/text/textfield/SetExpression.idl b/offapi/com/sun/star/text/textfield/SetExpression.idl index 31cfec2..cb79b8b 100644 --- a/offapi/com/sun/star/text/textfield/SetExpression.idl +++ b/offapi/com/sun/star/text/textfield/SetExpression.idl @@ -74,7 +74,7 @@ published service SetExpression [property]double Value; /** contains the name of the set expression field master this field is connected to. */ - [property]string VariableName; + [property, readonly] string VariableName; /** determines whether changes in language attributes at the position the text field is located also change the number format as appropriate for this language. diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 5c4c99c..b5a34d5 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits