diff options
Diffstat (limited to 'offapi')
23 files changed, 198 insertions, 159 deletions
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl index c802db2f870e..5fce0f1ae325 100644 --- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl @@ -45,7 +45,7 @@ @since OOo 3.3 */ -service DefaultGridDataModel : ::com::sun::star::awt::grid::XMutableGridDataModel; +published service DefaultGridDataModel : ::com::sun::star::awt::grid::XMutableGridDataModel; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl index 0fe19dfea71a..cec141027cd8 100644 --- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl @@ -40,9 +40,8 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -published struct GridColumnEvent: com::sun::star::lang::EventObject +published struct GridColumnEvent : ::com::sun::star::lang::EventObject { - /** Contains the name of the attributes whose value changed. **/ string AttributeName; /** Contains the old value **/ diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl index 7430f3d97e66..738b11ed745a 100644 --- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl @@ -45,7 +45,7 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -struct GridDataEvent: com::sun::star::lang::EventObject +published struct GridDataEvent: com::sun::star::lang::EventObject { /** denotes the first column affected by a change. diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl index e9b87c2fe7ed..9ff468f5697e 100644 --- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl @@ -31,37 +31,26 @@ #include <com/sun/star/lang/EventObject.idl> #endif -#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ -#include <com/sun/star/awt/grid/SelectionEventType.idl> -#endif - //============================================================================= module com { module sun { module star { module awt { module grid { //============================================================================= -/** An event used by a <type>XGridControl</type> to notify changes in the selection. +/** An event used by a <type>XGridControl</type> to notify changes in its row selection. - @see XGridControl + @see XGridRowSelection @see XGridSelectionListener */ -struct GridSelectionEvent: com::sun::star::lang::EventObject +published struct GridSelectionEvent: com::sun::star::lang::EventObject { - //------------------------------------------------------------------------- - - /** the selected row*/ - long Row; - - /** the selected column*/ - long Column; - - /**number of selected rows, if multiple rows selected*/ - long Range; - - /** Contains the action <type>SelectionEventType</types> that was performed **/ - SelectionEventType Action; + /** denotes the indexes of the rows being selected at the time the event was fired. + */ + sequence< long > SelectedRowIndexes; + /** denotes the indexes of the columns being selected at the time the event was fired. + */ + sequence< long > SelectedColumnIndexes; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl deleted file mode 100644 index c7ee61498cc3..000000000000 --- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl +++ /dev/null @@ -1,66 +0,0 @@ -/************************************************************************* - * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef __com_sun_star_awt_grid_SelectionEventType_idl__ -#define __com_sun_star_awt_grid_SelectionEventType_idl__ - - -//============================================================================= - -module com { module sun { module star { module awt { module grid { - -//============================================================================= - -/** specifies the type of a selection event, as used by - <type>GridSelectionEvent</type>. - */ -enum SelectionEventType -{ - //------------------------------------------------------------------------- - - /** This value indicates that a selection was added to the grid control - */ - ADD, - - //------------------------------------------------------------------------- - - /** This value indicates that a selection was removed from the grid control - */ - REMOVE, - - //------------------------------------------------------------------------- - - /** This value indicates that a selection was changed - */ - CHANGE - -}; - -//============================================================================= - -}; }; }; }; }; - -#endif diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl index 5141e8a52cce..0c7cbd76fa70 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl @@ -35,6 +35,10 @@ #include <com/sun/star/awt/grid/XGridControl.idl> #endif +#ifndef __com_sun_star_awt_grid_XGridRowSelection_idl__ +#include <com/sun/star/awt/grid/XGridRowSelection.idl> +#endif + //============================================================================= module com { module sun { module star { module awt { module grid { @@ -45,12 +49,12 @@ /** A control that displays a set of tabular data. - <p> <h4>The Column Model</h4> + <p>The horizontal structure of the grid is defined by the <type>XGridColumnModel</type> implemented in <type>DefaultGridColumnModel</type> The <type>XGridColumn</type> implemented in <typeGridColumn</type> describes the properties and behavior of a single column. Use the <member>XGridColumnModel::addColumn()</member> to add a column to the column model. </p> - <p> + <h4>The Data Model</h4> <p> All row data are stored in the <type>XGridDataModel</type>. Use the <type>DefaultGridDataModel</type> to add <member>XGridDataModel::addRow()</member> or remove <member>XGridDataModel::removeRow()</member> rows. @@ -61,18 +65,19 @@ <h4>Selection</h4> <p>If you are interested in knowing when the selection changes implement a <type>XGridSelectionListener</type> and add the instance with the method - <member>XGridSelection::addSelectionListener()</member>. - You than will be notified for any selection change. + <member>XGridRowSelection::addSelectionListener()</member>. + You than will be notified for any selection change.</p> - The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control. - </p> + <p>The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.</p> @since OOo 3.3 */ service UnoControlGrid { service com::sun::star::awt::UnoControl; - interface com::sun::star::awt::grid::XGridControl; + interface ::com::sun::star::awt::grid::XGridControl; + + interface ::com::sun::star::awt::grid::XGridRowSelection; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl index 02b4d93f621d..6f373aea580f 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -45,7 +45,7 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -service UnoControlGridModel +published service UnoControlGridModel { /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */ service com::sun::star::awt::UnoControlModel; @@ -132,14 +132,14 @@ service UnoControlGridModel /** controls whether or not to paint horizontal and vertical lines between the grid cells. - @see LineColor + @see GridLineColor */ [property] boolean UseGridLines; /** specifies the color to be used when drawing lines between cells <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, - depending on the system's style settings.</p> + depending on the control's style settings.</p> @see UseGridLines */ @@ -148,17 +148,47 @@ service UnoControlGridModel /** specifies the color to be used when drawing the background of row or column headers <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, - depending on the system's style settings.</p> + depending on the control's style settings.</p> */ [property, maybevoid] ::com::sun::star::util::Color HeaderBackgroundColor; /** specifies the color to be used when drawing the text within row or column headers <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, - depending on the system's style settings.</p> + depending on the control's style settings.</p> */ [property, maybevoid] ::com::sun::star::util::Color HeaderTextColor; + /** specifies the color to be used when drawing the background of selected cells, while the control has the focus. + + <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, + depending on the control's style settings.</p> + */ + [property, maybevoid] ::com::sun::star::util::Color ActiveSelectionBackgroundColor; + + /** specifies the color to be used when drawing the background of selected cells, while the control does not have + the focus. + + <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, + depending on the control's style settings.</p> + */ + [property, maybevoid] ::com::sun::star::util::Color InactiveSelectionBackgroundColor; + + /** specifies the color to be used when drawing the text of selected cells, while the control has the focus. + + <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, + depending on the control's style settings.</p> + */ + [property, maybevoid] ::com::sun::star::util::Color ActiveSelectionTextColor; + + /** specifies the color to be used when drawing the text of selected cells, while the control does not have + the focus. + + <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, + depending on the control's style settings.</p> + */ + [property, maybevoid] ::com::sun::star::util::Color InactiveSelectionTextColor; + /** specifies the colors to be used as background for data rows. <p>If this sequence is non-empty, the data rows will be rendered with alternating background colors: Assuming @@ -167,19 +197,13 @@ service UnoControlGridModel <p>If this sequence is empty, all rows will use the same background color as the control as whole.</p> - <p>If this property does not exist at a particular implementation, or is <VOID/>, rows will be painted + <p>If this property has a value of <VOID/>, rows will be painted in alternating background colors, every second row having a background color derived from the control's selection color.</p> */ [property, maybevoid] sequence< ::com::sun::star::util::Color > RowBackgroundColors; /** specifies the vertical alignment of the content in the control. - - <pre> - TOP - MIDDLE - BOTTOM - </pre> */ [property] com::sun::star::style::VerticalAlignment VerticalAlign; @@ -190,14 +214,14 @@ service UnoControlGridModel /** specifies the color to be used when drawing cell texts <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, - depending on the system's style settings.</p> + depending on the control's style settings.</p> */ [property, maybevoid] ::com::sun::star::util::Color TextColor; /** specifies the color to be used when drawing text lines (underlining and strikethrough) <p>If this property has a value of <VOID/>, the grid control renderer will use some default color, - depending on the system's style settings.</p> + depending on the control's style settings.</p> */ [property, maybevoid] com::sun::star::util::Color TextLineColor; diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl index 434be67ed3f8..4604920e56a3 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl @@ -49,7 +49,7 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -interface XGridColumnModel +published interface XGridColumnModel { /** implements life time control for the component */ diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl index b742c1acb484..f8413046839a 100644 --- a/offapi/com/sun/star/awt/grid/XGridControl.idl +++ b/offapi/com/sun/star/awt/grid/XGridControl.idl @@ -27,7 +27,9 @@ #ifndef __com_sun_star_awt_grid_XGridControl_idl__ #define __com_sun_star_awt_grid_XGridControl_idl__ -#include <com/sun/star/awt/grid/XGridSelection.idl> +#include <com/sun/star/uno/XInterface.idl> +#include <com/sun/star/lang/IndexOutOfBoundsException.idl> +#include <com/sun/star/util/VetoException.idl> //============================================================================= @@ -41,7 +43,7 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -interface XGridControl : XGridSelection +published interface XGridControl { /** retrieves the column which a given point belongs to @@ -78,6 +80,24 @@ interface XGridControl : XGridSelection columns, or if grid data model does not contain any rows), then <code>-1</code> is returned.</p> */ long getCurrentRow(); + + /** moves the cursor to the given cell + @param ColumnIndex + the column index of the cell to activate. + @param RowIndex + the row index of the cell to activate. + @throws ::com::sun::star::lang::IndexOutOfBoundsException + if either <code>ColumnIndex</code> or <code>RowIndex</code> are out of range. + @throws ::com::sun::star::util::VetoException + if moving the cursor to another cell is vetoed. + */ + void goToCell( + [in] long ColumnIndex, + [in] long RowIndex + ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException + , ::com::sun::star::util::VetoException + ); }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl index 9a324aee2668..9840ff9bf779 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl @@ -49,7 +49,7 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -interface XGridDataListener: com::sun::star::lang::XEventListener +published interface XGridDataListener: com::sun::star::lang::XEventListener { /** is called when one or more rows of data have been inserted into a grid control's data model. diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl index 469a4d1eb3bf..dee29a1a8f10 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -46,13 +46,13 @@ module com { module sun { module star { module awt { module grid { @since OOo 3.3 */ -interface XGridDataModel +published interface XGridDataModel { /** implements life time control for the component */ interface ::com::sun::star::lang::XComponent; - /** allows cloning the complete column model + /** allows cloning the complete data model */ interface ::com::sun::star::util::XCloneable; @@ -69,7 +69,7 @@ interface XGridDataModel @throws ::com::sun::star::lang::IndexOutOfBoundsException if the column or row index do not denote a valid cell position. */ - any getCellData( [in] long Column, [in] long Row ) + any getCellData( [in] long Column, [in] long RowIndex ) raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); /** retrieves the tool tip to be displayed when the mouse hovers over a given cell @@ -82,7 +82,7 @@ interface XGridDataModel @throws ::com::sun::star::lang::IndexOutOfBoundsException if the column or row index do not denote a valid cell position. */ - any getCellToolTip( [in] long Column, [in] long Row ) + any getCellToolTip( [in] long Column, [in] long RowIndex ) raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); /** retrieves the heading of a given row @@ -97,6 +97,20 @@ interface XGridDataModel any getRowHeading( [in] long RowIndex ) raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); + + /** retrieves the data for a complete row + + <p>This method is provided for performance and convenience reasons, it delivers the same result + as subsequent calls to <member>getCellData</member> would.</p> + + @param Row + the index of the row whose data should is to be retrieved. + @raises ::com::sun::star::lang::IndexOutOfBoundsException + of the given row index does not denote a valid row. + */ + sequence< any > + getRowData( [in] long RowIndex ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl index aa7fd5e42b4b..7dd4903ef218 100644 --- a/offapi/com/sun/star/awt/grid/XGridSelection.idl +++ b/offapi/com/sun/star/awt/grid/XGridRowSelection.idl @@ -27,9 +27,8 @@ #ifndef __com_sun_star_awt_grid_XGridSelection_idl__ #define __com_sun_star_awt_grid_XGridSelection_idl__ -#include <com/sun/star/uno/XInterface.idl> #include <com/sun/star/awt/grid/XGridSelectionListener.idl> -#include <com/sun/star/view/SelectionType.idl> +#include <com/sun/star/lang/IndexOutOfBoundsException.idl> //============================================================================= @@ -38,8 +37,10 @@ module com { module sun { module star { module awt { module grid { //============================================================================= /** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. + + @since OpenOffice.org 3.4 */ -interface XGridSelection +published interface XGridRowSelection { /** Selects all rows. */ @@ -49,8 +50,12 @@ interface XGridSelection @param RowIndex denotes the index of the row to select + + @raises ::com::sun::star::lang::IndexOutOfBoundsException + if <code>RowIndex</code> does not denote a valid row index */ - void selectRow( [in] long RowIndex ); + void selectRow( [in] long RowIndex ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); /** Deselects all selected rows. */ @@ -61,27 +66,31 @@ interface XGridSelection @param RowIndex denotes the index of the row to deselect */ - void deselectRow( [in] long RowIndex ); + void deselectRow( [in] long RowIndex ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); /** Returns the indicies of all selected rows. @returns a sequence of indicies. */ - sequence< long > getSelection(); + sequence< long > getSelectedRows(); /** Returns whether rows are selected. @returns - <true/> if rows are selected otherwise <false/>. + <true/> if and only if at least one row is selected. */ - boolean isSelectionEmpty(); + boolean hasSelectedRows(); /** Returns whether a specific row is selected. - @param - the index of a row. + + @param RowIndex + the index of a row. If the value does not denote a valid row index, i.e. is smaller than <code>0</code> + or greater than the number of rows, this is silently ignored, and <false/> is returned. + @returns - <true/> if row are selected otherwise <false/>. + <true/> if and only if there is a row with the given index, and it is selected currently. */ - boolean isSelectedIndex( [in] long index); + boolean isRowSelected( [in] long RowIndex ); /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes. @param listener @@ -89,15 +98,11 @@ interface XGridSelection */ void addSelectionListener( [in] XGridSelectionListener listener); - //------------------------------------------------------------------------- - /** Removes a listener previously added with <method>addSelectionListener()</method>. @param listener the listener to remove. */ void removeSelectionListener( [in] XGridSelectionListener listener); - - }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl index 61e8d3050b0d..61f36c267dae 100644 --- a/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridSelectionListener.idl @@ -41,13 +41,10 @@ module com { module sun { module star { module awt { module grid { //============================================================================= -/** An instance of this interface is used by the <type>XGridSelection</type> to +/** An instance of this interface is used by the <type>XGridRowSelection</type> to get notifications about selection changes. - - <p>Usually you must not implement this interface yourself, but you must notify it correctly if - you implement the <type>XGridSelection</type> yourself</p>. */ -interface XGridSelectionListener: com::sun::star::lang::XEventListener +published interface XGridSelectionListener: com::sun::star::lang::XEventListener { //------------------------------------------------------------------------- /** Invoked after a selection was changed. diff --git a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl index 5e10820ff9ef..3c0fbf6b654a 100755..100644 --- a/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl @@ -39,9 +39,9 @@ module com { module sun { module star { module awt { module grid { /** allows to modify the data represented by a <type>XGridDataModel</type> */ -interface XMutableGridDataModel : XGridDataModel +published interface XMutableGridDataModel : XGridDataModel { - /** adds a row to the model. + /** appends a row to the model. @param Heading denotes the heading of the row. @@ -50,7 +50,7 @@ interface XMutableGridDataModel : XGridDataModel */ void addRow( [in] any Heading, [in] sequence< any > Data ); - /** adds multiple rows of data to the model. + /** appends multiple rows of data to the model. @param Headings denotes the headings of the to-be-added rows. @param Data @@ -61,6 +61,38 @@ interface XMutableGridDataModel : XGridDataModel void addRows( [in] sequence< any > Headings, [in] sequence< sequence< any > > Data ) raises ( ::com::sun::star::lang::IllegalArgumentException ); + /** inserts a row into the set of data rows + + @param Index + denotes the position at which the row is to be inserted + @param Heading + denotes the heading of the row. + @param Data + specifies the content of the row. + @throws ::com::sun::star::lang::IndexOutOfBoundsException + if <code>Index</code> is smaller than <code>0</code> or greater than the number of + rows in the model. + */ + void insertRow( [in] long Index, [in] any Heading, [in] sequence< any > Data ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException ); + + /** inserts multiple rows of data into the model. + @param Index + denotes the position at which the rows are to be inserted + @param Headings + denotes the headings of the to-be-added rows. + @param Data + specifies the data of the rows to be added. + @throws ::com::sun::star::lang::IllegalArgumentException + if <code>Titles</code> and <code>Data</code> are of different length. + @throws ::com::sun::star::lang::IndexOutOfBoundsException + if <code>Index</code> is smaller than <code>0</code> or greater than the number of + rows in the model. + */ + void insertRows( [in] long Index, [in] sequence< any > Headings, [in] sequence< sequence< any > > Data ) + raises ( ::com::sun::star::lang::IndexOutOfBoundsException + , ::com::sun::star::lang::IllegalArgumentException ); + /** removes a row of data from the model @param RowIndex diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk index 8499dca27d82..67a566edcdce 100644 --- a/offapi/com/sun/star/awt/grid/makefile.mk +++ b/offapi/com/sun/star/awt/grid/makefile.mk @@ -40,10 +40,9 @@ PACKAGE=com$/sun$/star$/awt$/grid IDLFILES=\ GridColumnEvent.idl\ GridDataEvent.idl\ - SelectionEventType.idl\ GridSelectionEvent.idl\ XGridSelectionListener.idl\ - XGridSelection.idl\ + XGridRowSelection.idl\ XGridColumn.idl\ XGridColumnListener.idl\ XGridDataListener.idl\ diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPage.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPage.idl index 6244b18e0c77..b4ba2d156314 100644 --- a/offapi/com/sun/star/awt/tab/UnoControlTabPage.idl +++ b/offapi/com/sun/star/awt/tab/UnoControlTabPage.idl @@ -41,7 +41,7 @@ module com { module sun { module star { module awt { module tab { @since OOo 3.4 */ -service UnoControlTabPage +published service UnoControlTabPage { service com::sun::star::awt::UnoControlContainer; diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainer.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainer.idl index 488ce4b5354a..081d5dda5f65 100644 --- a/offapi/com/sun/star/awt/tab/UnoControlTabPageContainer.idl +++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageContainer.idl @@ -40,7 +40,7 @@ module com { module sun { module star { module awt { module tab { @since OOo 3.4 */ -service UnoControlTabPageContainer +published service UnoControlTabPageContainer { service com::sun::star::awt::UnoControl; diff --git a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl index 266f6a56119a..b669375b811e 100644 --- a/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl +++ b/offapi/com/sun/star/awt/tab/UnoControlTabPageModel.idl @@ -38,15 +38,9 @@ module com { module sun { module star { module awt { module tab { /** specifies the standard model of a XTabPageModel. @since OOo 3.4 */ -published service UnoControlTabPageModel : XTabPageModel +published service UnoControlTabPageModel { - /** Creates a new XTabPageModel with a given ID. - */ - create([in] short tabPageID); - - /** Creates a new XTabPageModel with a given ID and a url which is used to load the tab page model. - */ - load([in] short tabPageID,[in] string url); + interface XTabPageModel; }; //============================================================================= diff --git a/offapi/com/sun/star/awt/tab/XTabPage.idl b/offapi/com/sun/star/awt/tab/XTabPage.idl index 0c79d34075d5..c66c305da699 100644 --- a/offapi/com/sun/star/awt/tab/XTabPage.idl +++ b/offapi/com/sun/star/awt/tab/XTabPage.idl @@ -28,6 +28,7 @@ #define __com_sun_star_awt_tab_XTabPage_idl__ #include <com/sun/star/awt/tab/XTabPageModel.idl> + //============================================================================= module com { module sun { module star { module awt { module tab { diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl index 0349b04cc637..cc4f9ebc9e3c 100644 --- a/offapi/com/sun/star/awt/tab/XTabPageContainer.idl +++ b/offapi/com/sun/star/awt/tab/XTabPageContainer.idl @@ -47,7 +47,7 @@ published interface XTabPageContainer @returns the number of tab pages. */ - long getTabPageCount(); + short getTabPageCount(); //------------------------------------------------------------------------- @@ -86,7 +86,7 @@ published interface XTabPageContainer @param listener the listener to add. */ - [oneway] void addTabPageListener( [in] XTabPageContainerListener listener); + [oneway] void addTabPageContainerListener( [in] XTabPageContainerListener listener); //------------------------------------------------------------------------- @@ -94,7 +94,7 @@ published interface XTabPageContainer @param listener the listener to remove. */ - [oneway] void removeTabPageListener( [in] XTabPageContainerListener listener); + [oneway] void removeTabPageContainerListener( [in] XTabPageContainerListener listener); //------------------------------------------------------------------------- /** Specifies the ID of the current active tab page. diff --git a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl index 8b3bf2d9afbd..e2ac2633363f 100644 --- a/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl +++ b/offapi/com/sun/star/awt/tab/XTabPageContainerModel.idl @@ -34,6 +34,8 @@ module com { module sun { module star { module awt { module tab { +published interface XTabPageModel; + //============================================================================= /** specifies an interface for a UnoControlTabPageContainerModel. @@ -44,6 +46,21 @@ published interface XTabPageContainerModel { interface com::sun::star::container::XIndexContainer; interface com::sun::star::container::XContainer; + + /** creates a TabPageModel which can be inserted into the container. + @param TabPageID + the id of the tab page + */ + XTabPageModel createTabPage( [in] short TabPageID ); + + /** creates a TabPageModel which can be inserted into the container, by loading it from a user interface + resource file. + @param TabPageID + the id of the tab page + @param ResourceURL + the URL of the user interface resource to load + */ + XTabPageModel loadTabPage( [in] short TabPageID, [in] string ResourceURL ); }; //============================================================================= diff --git a/offapi/com/sun/star/awt/tab/XTabPageModel.idl b/offapi/com/sun/star/awt/tab/XTabPageModel.idl index b07c3ea4ec6d..9d98322a9449 100644 --- a/offapi/com/sun/star/awt/tab/XTabPageModel.idl +++ b/offapi/com/sun/star/awt/tab/XTabPageModel.idl @@ -76,7 +76,7 @@ published interface XTabPageModel /** specifies a tooltip text that should be displayed in the tab bar. */ - [attribute] string Tooltip; + [attribute] string ToolTip; }; diff --git a/offapi/com/sun/star/sheet/ExternalLinkType.idl b/offapi/com/sun/star/sheet/ExternalLinkType.idl index 976524506775..09bcd68ff70e 100644 --- a/offapi/com/sun/star/sheet/ExternalLinkType.idl +++ b/offapi/com/sun/star/sheet/ExternalLinkType.idl @@ -54,6 +54,15 @@ constants ExternalLinkType */ const long DDE = 2; + /** Reference to the own document. + */ + const long SELF = 3; + + /** For special use cases. Behaviour is dependent on the implementation of + the formula parser. + */ + const long SPECIAL = 4; + }; //============================================================================= |