diff options
29 files changed, 180 insertions, 42 deletions
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx index fd0c56ba4376..1afab0633fd4 100644 --- a/bridges/source/remote/urp/urp_environment.cxx +++ b/bridges/source/remote/urp/urp_environment.cxx @@ -342,10 +342,13 @@ static void SAL_CALL RemoteEnvironment_thisDispose( uno_Environment *pEnvRemote pImpl->m_pReader = 0; } - ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() ); - if( ! g_bStaticDestructorsCalled ) + bool bReleaseStubs = false; + { + ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() ); + bReleaseStubs = !g_bStaticDestructorsCalled; + } + if( bReleaseStubs ) { - // delete the stubs releaseStubs( pEnvRemote ); } } diff --git a/offapi/com/sun/star/awt/MouseWheelBehavior.idl b/offapi/com/sun/star/awt/MouseWheelBehavior.idl new file mode 100755 index 000000000000..5a5d03a4c2e8 --- /dev/null +++ b/offapi/com/sun/star/awt/MouseWheelBehavior.idl @@ -0,0 +1,61 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* 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 +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ +
+#ifndef __com_sun_star_awt_MouseWheelBehavior_idl__ +#define __com_sun_star_awt_MouseWheelBehavior_idl__ + +//============================================================================= + +module com { module sun { module star { module awt { + +//============================================================================= + +/** describes the scroll behavior of the mouse wheel for a control + @since OOo 3.2 + */ +constants MouseWheelBehavior +{ + /** defines that the mouse wheel cannot be used to scroll through the control's content + */ + const short SCROLL_DISABLED = 0; + + /** defines that the mouse can only be used to scroll through the control's content if it currently + has the focus. + */ + const short SCROLL_FOCUS_ONLY = 1; + + /** defines that the mouse can be used to scroll through the control's content, no matter whether or not + it has the focus, as long as the mouse pointer is over the control. + */ + const short SCROLL_ALWAYS = 2; +}; + +//============================================================================= + +}; }; }; }; + +//============================================================================= + +#endif diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl index d33d8f4d71ea..29328056f480 100644 --- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl +++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl @@ -220,6 +220,14 @@ published service UnoControlComboBoxModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel scrool through the control's entry list. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl index 0aa722943e2d..17f72a2be100 100644 --- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl @@ -254,6 +254,14 @@ published service UnoControlCurrencyFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl index a636f2f5f6a5..d14f602e817a 100644 --- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl @@ -266,6 +266,14 @@ published service UnoControlDateFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl index 346c76b6d41a..1575e1f6d6a6 100644 --- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl @@ -299,6 +299,14 @@ published service UnoControlFormattedFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl index 239a00e967f6..56c50b74fe04 100644 --- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl +++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl @@ -203,6 +203,14 @@ published service UnoControlListBoxModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel scrool through the control's entry list. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl index 914c3ed5d6f4..4846980a974c 100644 --- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl @@ -242,6 +242,14 @@ published service UnoControlNumericFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl index cccb61cb5487..b3bb7691e333 100644 --- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl @@ -201,6 +201,14 @@ published service UnoControlPatternFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl index f4170c5a4fd2..696fb5255785 100644 --- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl +++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl @@ -169,6 +169,14 @@ service UnoControlSpinButtonModel is specified with this property.</p> */ [property] long RepeatDelay; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl index 7b4bbcb5e8fe..79bed704660f 100644 --- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl @@ -246,6 +246,14 @@ published service UnoControlTimeFieldModel @since OOo 3.1 */ [optional, property] short WritingMode; + + /** defines how the mouse wheel can be used to scroll through the control's content. + + <p>Usually, the mouse wheel spins the numeric value displayed in the control. Using this property, + and one of the <type>MouseWheelBehavior</type> constants, you can control under which circumstances + this is possible.</p> + */ + [optional, property] short MouseWheelBehavior; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk index ff4d827a298b..c0c501cbe2c5 100644 --- a/offapi/com/sun/star/awt/makefile.mk +++ b/offapi/com/sun/star/awt/makefile.mk @@ -127,6 +127,7 @@ IDLFILES=\ MessageBoxCommand.idl\ MouseButton.idl\ MouseEvent.idl\ + MouseWheelBehavior.idl\ PaintEvent.idl\ Point.idl\ PopupMenuDirection.idl\ diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl index 3865f8093d8b..9d9905d643f3 100644 --- a/offapi/com/sun/star/form/XErrorListener.idl +++ b/offapi/com/sun/star/form/XErrorListener.idl @@ -54,6 +54,7 @@ <p>Please do <em><b>not</b></em> use anymore, this interface is superseeded by <type scope="com::sun::star::sdb">XSQLErrorListener</type>.</p> +@since foo @deprecated */ published interface XErrorListener: com::sun::star::lang::XEventListener diff --git a/offapi/com/sun/star/linguistic2/Dictionary.idl b/offapi/com/sun/star/linguistic2/Dictionary.idl index 4687db6af15b..38f97b9df435 100644 --- a/offapi/com/sun/star/linguistic2/Dictionary.idl +++ b/offapi/com/sun/star/linguistic2/Dictionary.idl @@ -57,7 +57,7 @@ module com { module sun { module star { module linguistic2 { @see com::sun::star::linguistic2::DictionaryList @see com::sun::star::linguistic2::XSearchableDictionaryList - @since OOo 3.01 + @since OOo 3.0.1 */ service Dictionary { diff --git a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl index 7f4d6d3a1524..8da91044d97c 100644 --- a/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl +++ b/offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl @@ -62,7 +62,7 @@ published constants LinguServiceEventFlags //------------------------------------------------------------------------- /** Request new proofreading of the document - @since OOo 3.01 + @since OOo 3.0.1 */ const short PROOFREAD_AGAIN = 8; diff --git a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl index d00a4ed8f8fb..b2334f7c4539 100644 --- a/offapi/com/sun/star/linguistic2/ProofreadingResult.idl +++ b/offapi/com/sun/star/linguistic2/ProofreadingResult.idl @@ -58,7 +58,7 @@ interface XProofreader; //============================================================================= /** holds the results from proofreading a sentence. - @since OOo 3.01 + @since OOo 3.0.1 */ struct ProofreadingResult { diff --git a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl index b16ca8711d6e..851e0f8b8c64 100644 --- a/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl +++ b/offapi/com/sun/star/linguistic2/SingleProofreadingError.idl @@ -45,7 +45,7 @@ module com { module sun { module star { module linguistic2 { //============================================================================= /** holds a single error found by the proofreader. - @since OOo 3.01 + @since OOo 3.0.1 */ struct SingleProofreadingError { diff --git a/offapi/com/sun/star/linguistic2/XProofreader.idl b/offapi/com/sun/star/linguistic2/XProofreader.idl index be7e34483239..d330a40c4e11 100644 --- a/offapi/com/sun/star/linguistic2/XProofreader.idl +++ b/offapi/com/sun/star/linguistic2/XProofreader.idl @@ -65,7 +65,7 @@ module com { module sun { module star { module linguistic2 { //============================================================================= /** API for proofreading a text - @since OOo 3.01 + @since OOo 3.0.1 */ interface XProofreader: com::sun::star::linguistic2::XSupportedLocales { diff --git a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl index b1536cc3b5be..51da34d0fa6f 100644 --- a/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl +++ b/offapi/com/sun/star/linguistic2/XProofreadingIterator.idl @@ -61,7 +61,7 @@ module com { module sun { module star { module linguistic2 { //============================================================================= /** API for the proofreading iterator that mediates between the document and the proofreader. - @since OOo 3.01 + @since OOo 3.0.1 */ interface XProofreadingIterator: com::sun::star::uno::XInterface { diff --git a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl index ddbb8a273255..d52b8b00bb3d 100644 --- a/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl +++ b/offapi/com/sun/star/linguistic2/XSearchableDictionary.idl @@ -60,7 +60,7 @@ interface XSearchableDictionary : com::sun::star::linguistic2::XDictionary @see <type scope="com::sun::star::linguistic2">XDictionaryEntry</type> @see <type scope="com::sun::star::linguistic2">XSearchableDictionaryList</type> - @since OOo 3.01 + @since OOo 3.0.1 */ sequence< com::sun::star::linguistic2::XDictionaryEntry > searchSimilarEntries( [in] string aWord ); diff --git a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl index 8407fbe566c0..0637a9847e51 100644 --- a/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl +++ b/offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl @@ -55,7 +55,7 @@ interface XSetSpellAlternatives : com::sun::star::uno::XInterface /** set the list of suggestions to be returned. - @since OOo 3.01 + @since OOo 3.0.1 */ void setAlternatives( [in] sequence< string > aAlternatives ); @@ -64,7 +64,7 @@ interface XSetSpellAlternatives : com::sun::star::uno::XInterface set the type of error found. @see <tyoe scope="com::sun::star::linguistic2">SpellFailure</type> - @since OOo 3.01 + @since OOo 3.0.1 */ void setFailureType( [in] short nFailureType ); diff --git a/offapi/com/sun/star/sheet/DatabaseRange.idl b/offapi/com/sun/star/sheet/DatabaseRange.idl index b613b4eb74cd..eb2fe13d0262 100644 --- a/offapi/com/sun/star/sheet/DatabaseRange.idl +++ b/offapi/com/sun/star/sheet/DatabaseRange.idl @@ -160,7 +160,7 @@ published service DatabaseRange @see com::sun::star::sheet::FormulaToken @see com::sun::star::sheet::FormulaMapGroupSpecialOffset::DB_AREA - @since OOo 2.x + @since OOo 3.0 */ [optional, readonly, property] long TokenIndex; }; diff --git a/offapi/com/sun/star/sheet/NamedRange.idl b/offapi/com/sun/star/sheet/NamedRange.idl index 65c14dc2fcdf..c6f97c0f09e2 100644 --- a/offapi/com/sun/star/sheet/NamedRange.idl +++ b/offapi/com/sun/star/sheet/NamedRange.idl @@ -84,7 +84,7 @@ published service NamedRange @see com::sun::star::sheet::FormulaToken @see com::sun::star::sheet::FormulaMapGroupSpecialOffset::NAME - @since OOo 2.x + @since OOo 3.0 */ [optional, readonly, property] long TokenIndex; diff --git a/offapi/com/sun/star/style/Style.idl b/offapi/com/sun/star/style/Style.idl index a3492e492130..0965f849576d 100644 --- a/offapi/com/sun/star/style/Style.idl +++ b/offapi/com/sun/star/style/Style.idl @@ -165,7 +165,7 @@ published service Style </ul> - @since OOo 2.0.1. + @since OOo 2.0.1 */ [optional, property] sequence< com::sun::star::beans::NamedValue > ParaStyleConditions; diff --git a/offapi/com/sun/star/text/DocumentSettings.idl b/offapi/com/sun/star/text/DocumentSettings.idl index 43fd5eff8f40..171a5caebb9f 100644 --- a/offapi/com/sun/star/text/DocumentSettings.idl +++ b/offapi/com/sun/star/text/DocumentSettings.idl @@ -129,8 +129,6 @@ published service DocumentSettings /** specifies if the former (till OpenOffice.org 1.1) or the new line spacing formatting is applied. - @since OOo 2.0.0 - <p>This property controls how a set line spacing at a paragraph influences the formatting of the text lines and the spacing between paragraphs. @@ -144,14 +142,13 @@ published service DocumentSettings a proportional line spacing is only applied below a text line and it's always added to the paragraph spacing between two paragraphs.</p> + @since OOo 2.0.0 */ [optional, property] boolean UseFormerLineSpacing; // ------------------------------------------------------------ /** specifies if paragraph and table spacing is added at the bottom of table cells - @since OOo 2.0.0 - <p>This property controls, if the spacing of the last paragraph respectively table of a table cell is added at the bottom of this table cells @@ -162,14 +159,13 @@ published service DocumentSettings the spacing of the last paragraph respectively table of a table cell isn't added at the bottom of this table cell.</p> + @since OOo 2.0.0 */ [optional, property] boolean AddParaSpacingToTableCells; // ------------------------------------------------------------ /** specifies if the former (till OpenOffice.org 1.1) or the new object positioning is applied. - @since OOo 2.0.0 - <p>This property controls how floating screen objects (Writer fly frames and drawing objects are positioned. If <TRUE/>, the object positioning till OpenOffice.org 1.1 is @@ -181,6 +177,7 @@ published service DocumentSettings its vertical position, doesn't include the lower spacing and the line spacing of the previous paragraph.</p> + @since OOo 2.0.0 */ [optional, property] boolean UseFormerObjectPositioning; @@ -188,8 +185,6 @@ published service DocumentSettings /** specifies if the text wrap of floating screen objects are considered in a specified way in the positioning algorithm. - @since OOo 2.0.0 - <p>This property controls how floating screen objects (Writer fly frames and drawing objects) are positioned. If <TRUE/>, the object positioning algorithm will consider @@ -199,6 +194,7 @@ published service DocumentSettings If <FALSE/> (default value), the former object positioning algorithm (known from OpenOffice.org 1.1) is applied.</p> + @since OOo 2.0.0 */ [optional, property] boolean ConsiderTextWrapOnObjPos; diff --git a/offapi/com/sun/star/text/NumberingLevel.idl b/offapi/com/sun/star/text/NumberingLevel.idl index 987dfa53f565..46b014d9cd71 100644 --- a/offapi/com/sun/star/text/NumberingLevel.idl +++ b/offapi/com/sun/star/text/NumberingLevel.idl @@ -201,8 +201,6 @@ published service NumberingLevel /** position and space mode - @since OOo 3.0 - <p> Specifies the position and space mode of the numbering level. For valid values see com::sun::star::text::PositionAndSpaceMode. @@ -211,53 +209,55 @@ published service NumberingLevel If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy, ListtabStopPosition, FirstLineIndent, IndentAt are used. </p> + + @since OOo 3.0 */ [optional, property] short PositionAndSpaceMode; /** character following the list label - @since OOo 3.0 - <p> Specifies the character following the list label. For valid values see com::sun::star::text::LabelFollow. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT. </p> + + @since OOo 3.0 */ [optional, property] short LabelFollowedBy; /** list tab position - @since OOo 3.0 - <p> Specifies the position of the list tab stop - only non-negative values are allowed. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT and LabelFollowedBy equal LABELFOLLOW_LISTTAB </p> + + @since OOo 3.0 */ [optional, property] long ListtabStopPosition; /** additional line indent for the first text line - @since OOo 3.0 - <p> Specifies the first line indent. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT. </p> + + @since OOo 3.0 */ [optional, property] long FirstLineIndent; /** indentation of the text lines - @since OOo 3.0 - <p> Specifies the indent of the text lines Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT. </p> + + @since OOo 3.0 */ [optional, property] long IndentAt; }; diff --git a/offapi/com/sun/star/text/ReferenceFieldPart.idl b/offapi/com/sun/star/text/ReferenceFieldPart.idl index c58679fada90..2ac96da25ee2 100644 --- a/offapi/com/sun/star/text/ReferenceFieldPart.idl +++ b/offapi/com/sun/star/text/ReferenceFieldPart.idl @@ -88,8 +88,6 @@ published constants ReferenceFieldPart /** The numbering label and depending of the reference field context numbering lables of superior list levels of the reference are displayed. - @since OOo 3.0 - <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p> <p>The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts - named "referenced item" in the following - is displayed. To unambiguous @@ -102,23 +100,23 @@ published constants ReferenceFieldPart be the level of the most superior level, then no list label content of superior levels greater or equal than X are added. If the referenced item isn't numbered, nothing is displayed.</p> + + @since OOo 3.0 */ const short NUMBER = 8; //------------------------------------------------------------------------- /** The numbering label of the reference is displayed. - @since OOo 3.0 - <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p> <p>The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts, is displayed. If this paragraph isn't numbered, nothing is displayed.</p> + + @since OOo 3.0 */ const short NUMBER_NO_CONTEXT = 9; //------------------------------------------------------------------------- /** The numbering label and numbering lables of superior list levels of the reference are displayed. - @since OOo 3.0 - <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p> <p>The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts - named "referenced item" in the following - is displayed and the contents @@ -128,6 +126,8 @@ published constants ReferenceFieldPart be the level of the most superior level, then no list label content of superior levels greater or equal than X are added. If the referenced item is numbered nothing is displayed.</p> + + @since OOo 3.0 */ const short NUMBER_FULL_CONTEXT = 10; }; diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl index f9e356f64732..88d87ccb4798 100644 --- a/offapi/com/sun/star/text/ViewSettings.idl +++ b/offapi/com/sun/star/text/ViewSettings.idl @@ -342,14 +342,18 @@ published service ViewSettings [optional, property] boolean ShowNonprintingCharacters; //------------------------------------------------------------------------- /** metric unit of the horizontal ruler + + <p>Uses values <type scope="com::sun::star::awt">FieldUnit</type></p> + @since OOo 3.1.0 - <p>Uses values from com::sun::star::awt::FieldUnit</p> */ [optional, property] long HorizontalRulerMetric; //------------------------------------------------------------------------- /** metric unit of the vertical ruler + + <p>Uses values from <type scope="com::sun::star::awt">FieldUnit</type></p> + @since OOo 3.1.0 - <p>Uses values from com::sun::star::awt::FieldUnit</p> */ [optional, property] long VerticalRulerMetric; }; diff --git a/offapi/com/sun/star/text/fieldmaster/Database.idl b/offapi/com/sun/star/text/fieldmaster/Database.idl index 79253e4c2b1b..d8554d7b4d69 100644 --- a/offapi/com/sun/star/text/fieldmaster/Database.idl +++ b/offapi/com/sun/star/text/fieldmaster/Database.idl @@ -85,7 +85,7 @@ published service Database //------------------------------------------------------------------------ /** contains the DataColumnName but it enables the fieldmaster and its depending fields to work without setting DataSourceName, DataTableName and CommandType - @since OOo 2.x + @since OOo 2.3 */ [optional, property] string Name; |