From e947b6c55b1b2c6980f316f39a14dbbb790d457c Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Fri, 12 Feb 2010 16:51:46 +0100 Subject: recent changes for grid control --- offapi/com/sun/star/awt/grid/GridDataEvent.idl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl index c97f654dd..779751ff3 100644 --- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl @@ -30,10 +30,7 @@ #ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ #define __com_sun_star_awt_grid_GridDataEvent_idl__ -#ifndef __com_sun_star_lang_EventObject_idl__ #include -#endif - //============================================================================= @@ -70,7 +67,7 @@ struct GridDataEvent: com::sun::star::lang::EventObject string headerName; /** Contains the changed row**/ - sequence rowData; + sequence rowData; }; -- cgit v1.2.3 From 70896e64953da52a380fe5cc259b2c49280a2611 Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Fri, 12 Feb 2010 16:52:56 +0100 Subject: recent changes for grid control --- .../sun/star/awt/grid/GridInvalidDataException.idl | 56 ++++++++++++++++++ .../star/awt/grid/GridInvalidModelException.idl | 56 ++++++++++++++++++ .../com/sun/star/awt/grid/UnoControlGridModel.idl | 66 +++++++++++++++++++++- offapi/com/sun/star/awt/grid/XGridColumn.idl | 25 ++++++-- offapi/com/sun/star/awt/grid/XGridColumnModel.idl | 14 ++++- offapi/com/sun/star/awt/grid/XGridControl.idl | 19 ++++--- offapi/com/sun/star/awt/grid/XGridDataModel.idl | 10 +++- offapi/com/sun/star/awt/grid/makefile.mk | 4 +- 8 files changed, 227 insertions(+), 23 deletions(-) create mode 100644 offapi/com/sun/star/awt/grid/GridInvalidDataException.idl create mode 100644 offapi/com/sun/star/awt/grid/GridInvalidModelException.idl diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl new file mode 100644 index 000000000..ef1e3c6e7 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl @@ -0,0 +1,56 @@ +/************************************************************************* + * + * 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: ExpandVetoException.idl,v $ + * $Revision: 1.3 $ + * + * 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_awt_grid_GridInvalidDataException_idl__ +#define __com_sun_star_awt_grid_GridInvalidDataException_idl__ + +#ifndef __com_sun_star_uno_RuntimeException_idl__ +#include +#endif + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown + or data count doesn't match with column count. + */ +exception GridInvalidDataException : com::sun::star::uno::RuntimeException +{ + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl new file mode 100644 index 000000000..17c859d87 --- /dev/null +++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl @@ -0,0 +1,56 @@ +/************************************************************************* + * + * 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: ExpandVetoException.idl,v $ + * $Revision: 1.3 $ + * + * 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_awt_grid_GridInvalidModelException_idl__ +#define __com_sun_star_awt_grid_GridInvalidModelException_idl__ + +#ifndef __com_sun_star_uno_RuntimeException_idl__ +#include +#endif + + +//============================================================================= + +module com { module sun { module star { module awt { module grid { + +//============================================================================= + +/** Exception is thrown when data or column model isn't set. + */ +exception GridInvalidModelException : com::sun::star::uno::RuntimeException +{ + +}; + +//============================================================================= + +}; }; }; }; }; + +#endif + \ No newline at end of file diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl index 092a756f5..e71c38c44 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -38,8 +38,14 @@ #include -#include - +#include + +#include + +#include + +#include + //============================================================================= module com { module sun { module star { module awt { module grid { @@ -87,10 +93,66 @@ service UnoControlGridModel */ [property] boolean VScroll; + /** Specifies that the control can be reached with the TAB key. + */ + [property] boolean Tabstop; + /** Specifies the selection mode that is enabled for this grid control.

The default value is SelectionType::SINGLE

*/ [property] ::com::sun::star::view::SelectionType SelectionModel; + /** Specifies the background color of odd rows. If color for even rows isn't set, then specifies + the color of all rows. Default value is white. + */ + [property] ::com::sun::star::util::Color BackgroundColor; + + /** Specifies the background color of even rows. Default value is white. + */ + [property] ::com::sun::star::util::Color EvenRowBackgroundColor; + + /** Specifies the background color of header. Default value is white. + */ + [property] ::com::sun::star::util::Color HeaderBackgroundColor; + + /** Specifies the text color. Default value is black. + */ + [property] ::com::sun::star::util::Color TextColor; + + /** Specifies the line color. Default value is white. + */ + [property] ::com::sun::star::util::Color LineColor; + + /** specifies the vertical alignment of the content in the control. + + 
+            TOP
+            MIDDLE
+            BOTTOM
+
+ */ + [property] com::sun::star::style::VerticalAlignment VerticalAlign; + + /** specifies the font attributes of the text in the control. + */ + [property] com::sun::star::awt::FontDescriptor FontDescriptor; + + /** specifies the FontEmphasis + value of the text in the control. + */ + [property] short FontEmphasisMark; + + /** specifies the FontRelief + value of the text in the control. + */ + [property] short FontRelief; + + /** specifies the help text of the control. + */ + [property] string HelpText; + + /** specifies the help URL of the control. + */ + [property] string HelpURL; }; diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl index 121ca80a3..7ce5b6cfd 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumn.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -33,6 +33,8 @@ #ifndef __com_sun_star_uno_XInterface_idl__ #include #endif +#include + //============================================================================= @@ -49,20 +51,31 @@ interface XGridColumn: com::sun::star::uno::XInterface /** Specifies the default column witdth. **/ [attribute] long ColumnWidth; - /* + + /** Specifies the preferred column witdth. **/ [attribute] long PreferredWidth; + /** Specifies the min column witdth. **/ [attribute] long MinWidth; + /** Specifies the max column witdth. **/ [attribute] long MaxWidth; + + /** Specifies whether column has fixed size or not. **/ + [attribute] boolean Resizeable; + + /** Specifies the horizontal alignment of the content in the control. - [attribute] boolean Resizable; - */ - + 
+            LEFT
+            CENTER
+            RIGHT
+
+ */ + [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign; + /** A title is displayed in the colum header row if UnoControlGridModel::ShowRowHeader is set to **/ [attribute] string Title; - - }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl index 118f75e6e..025fbb0ee 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl @@ -51,7 +51,11 @@ interface XGridColumnModel: com::sun::star::uno::XInterface /** Specifies whether column selection is allowed */ [attribute] boolean ColumnSelectionAllowed; - + + /**Specifies the height of column header. + */ + [attribute] long ColumnHeaderHeight; + /** Returns the number of columns. @returns the number of columns. @@ -84,11 +88,17 @@ interface XGridColumnModel: com::sun::star::uno::XInterface /** Returns a specific column. @param index - the position of the reuquested column. + the position of the requested column. @returns the requested column. */ XGridColumn getColumn( [in] long index); + + /** Sets default columns to the column model. + @param elements + the number of default columns that should be set. + */ + void setDefaultColumns([in] long elements); /* long getTotalColumnWidth(); diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl index c69b0d25c..35e2b06c8 100644 --- a/offapi/com/sun/star/awt/grid/XGridControl.idl +++ b/offapi/com/sun/star/awt/grid/XGridControl.idl @@ -47,20 +47,21 @@ module com { module sun { module star { module awt { module grid { */ interface XGridControl: XGridSelection { - /** Specifies the XGridColumnModel of the control. - */ - [attribute] XGridColumnModel ColumnModel; - - /** Specifies the XGridDataModel of the control. - */ - [attribute] XGridDataModel DataModel; - - /** Converting */ long getItemIndexAtPoint( [in] long x, [in] long y); + /** Sets tooltip for row + @param textForTooltip + text, which will be shown as tooltip. + If only cell content should be displayed, leave sequence empty. + @param columnsForTooltip + column numbers, which define the cell content that should be shown in the tooltip. + If only text should be shown, leave this sequence empty. + */ + void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip); + /** registers a listener for mouse events. */ //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl index 03b124a99..47c5a75b5 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -1,5 +1,6 @@ /************************************************************************* * + * $Revision: 1.8 $ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2008 by Sun Microsystems, Inc. @@ -7,7 +8,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -57,7 +57,11 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent /** Returns the content of each row. */ - [attribute,readonly] sequence< sequence< string > > Data; + [attribute,readonly] sequence< sequence< any > > Data; + + /**Specifies the width of row header. + */ + [attribute] long RowHeaderWidth; /** Returns the number of rows in in the model. @returns @@ -72,7 +76,7 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent @param data the content of the row. */ - void addRow( [in] string headername, [in] sequence< string > data ); + void addRow( [in] string headername, [in] sequence< any > data ); /** Removes a row from the model. diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk index 124ca44ed..9f6e5f252 100644 --- a/offapi/com/sun/star/awt/grid/makefile.mk +++ b/offapi/com/sun/star/awt/grid/makefile.mk @@ -61,7 +61,9 @@ IDLFILES=\ ScrollBarMode.idl\ XGridControl.idl\ UnoControlGrid.idl\ - UnoControlGridModel.idl + UnoControlGridModel.idl\ + GridInvalidDataException.idl\ + GridInvalidModelException.idl # ------------------------------------------------------------------ .INCLUDE : target.mk -- cgit v1.2.3 From bf3c98496faf8ec53605d816195680e9b9f57890 Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Thu, 11 Mar 2010 17:56:43 +0100 Subject: bugs fixed for build on macOS --- offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl | 1 + offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl | 2 ++ offapi/com/sun/star/awt/grid/GridColumn.idl | 6 ++++-- offapi/com/sun/star/awt/grid/GridColumnEvent.idl | 2 ++ offapi/com/sun/star/awt/grid/GridDataEvent.idl | 2 ++ offapi/com/sun/star/awt/grid/GridInvalidDataException.idl | 8 +++++--- offapi/com/sun/star/awt/grid/GridInvalidModelException.idl | 7 ++++--- offapi/com/sun/star/awt/grid/UnoControlGrid.idl | 3 ++- offapi/com/sun/star/awt/grid/UnoControlGridModel.idl | 6 ++++-- offapi/com/sun/star/awt/grid/XGridCell.idl | 2 +- offapi/com/sun/star/awt/grid/XGridCellRenderer.idl | 5 ++--- offapi/com/sun/star/awt/grid/XGridColumn.idl | 5 +++-- offapi/com/sun/star/awt/grid/XGridColumnListener.idl | 8 +++++--- offapi/com/sun/star/awt/grid/XGridColumnModel.idl | 8 +++++--- offapi/com/sun/star/awt/grid/XGridControl.idl | 14 ++++---------- offapi/com/sun/star/awt/grid/XGridControlListener.idl | 6 +++--- offapi/com/sun/star/awt/grid/XGridDataListener.idl | 6 ++++-- offapi/com/sun/star/awt/grid/XGridDataModel.idl | 4 +++- offapi/com/sun/star/awt/grid/XGridSelection.idl | 2 +- 19 files changed, 57 insertions(+), 40 deletions(-) diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl index 0d693051e..6222e5319 100644 --- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl +++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl @@ -41,6 +41,7 @@ //============================================================================= /** If you do not want to implement the XGridColumnModel yourself, use this service. + @since OOo 3.3.0 */ service DefaultGridColumnModel { diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl index ef03259c6..86d26e092 100644 --- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl @@ -41,6 +41,8 @@ //============================================================================= /** If you do not want to implement the XGridDataModel yourself, use this service. + + @since OOo 3.3.0 */ service DefaultGridDataModel { diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl index b685b2dda..b7d30ba4f 100644 --- a/offapi/com/sun/star/awt/grid/GridColumn.idl +++ b/offapi/com/sun/star/awt/grid/GridColumn.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnoControlEdit.idl,v $ - * $Revision: 1.9 $ + * $RCSfile: UnoControlGridColumn.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -41,6 +41,8 @@ //============================================================================= /** Represents a column as used by the DefaultGridColumnModel + + @since OOo 3.3.0 */ service GridColumn { diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl index a6c5dd6d1..90c8b688e 100644 --- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl @@ -52,6 +52,8 @@ module com { module sun { module star { module awt { module grid { @see XGridColumnModel @see XGridControl @see XGridColumnListener + + @since OOo 3.3.0 */ struct GridColumnEvent: com::sun::star::lang::EventObject { diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl index 779751ff3..d035a1bdc 100644 --- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl @@ -46,6 +46,8 @@ module com { module sun { module star { module awt { module grid { @see XGridDataModel @see XGridControl @see XGridDataListener + + @sonce OOo 3.3.0 */ struct GridDataEvent: com::sun::star::lang::EventObject { diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl index ef1e3c6e7..e2d44d346 100644 --- a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl +++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ExpandVetoException.idl,v $ - * $Revision: 1.3 $ + * $RCSfile: GridInvalidDataException.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -42,7 +42,9 @@ module com { module sun { module star { module awt { module grid { //============================================================================= /** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown - or data count doesn't match with column count. + or data count doesn't match with column count. + + @since OOo 3.3.0 */ exception GridInvalidDataException : com::sun::star::uno::RuntimeException { diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl index 17c859d87..71e79d5fa 100644 --- a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl +++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ExpandVetoException.idl,v $ - * $Revision: 1.3 $ + * $RCSfile: GridInvalidModelException.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -42,6 +42,8 @@ module com { module sun { module star { module awt { module grid { //============================================================================= /** Exception is thrown when data or column model isn't set. + + @since OOo 3.3.0 */ exception GridInvalidModelException : com::sun::star::uno::RuntimeException { @@ -53,4 +55,3 @@ exception GridInvalidModelException : com::sun::star::uno::RuntimeException }; }; }; }; }; #endif - \ No newline at end of file diff --git a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl index cd9fff21b..90ec8dd10 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnoControlEdit.idl,v $ + * $RCSfile: UnoControlGrid.idl,v $ * $Revision: 1.9 $ * * This file is part of OpenOffice.org. @@ -69,6 +69,7 @@ The XGridSelection interface provides a bunch of methods to set and get selection for the grid control.

+ @since OOo 3.3.0 */ service UnoControlGrid { diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl index e71c38c44..49cd9092e 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnoControlEditModel.idl,v $ - * $Revision: 1.16 $ + * $RCSfile: UnoControlGridModel.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -53,6 +53,8 @@ module com { module sun { module star { module awt { module grid { //============================================================================= /** specifies the standard model of a UnoControlGridModel. + + @since OOo 3.3.0 */ service UnoControlGridModel { diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl index 7a4ab1559..eeb5fb08c 100644 --- a/offapi/com/sun/star/awt/grid/XGridCell.idl +++ b/offapi/com/sun/star/awt/grid/XGridCell.idl @@ -42,7 +42,7 @@ module com { module sun { module star { module awt { module grid { //============================================================================= -interface XGridCell: com::sun::star::uno::XInterface +interface XGridCell { [attribute] string Value; diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl index e8d18772c..91d7c6057 100644 --- a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl +++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl @@ -40,10 +40,9 @@ module com { module sun { module star { module awt { module grid { //============================================================================= -/** gives access to the items of a list box and makes it possible to - register item and action event listeners. +/** renderer for cells */ -interface XGridCellRenderer: com::sun::star::uno::XInterface +interface XGridCellRenderer { //------------------------------------------------------------------------- diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl index 7ce5b6cfd..98914f527 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumn.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XGridColumn.idl,v $ - * $Revision: 1.8 $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -43,8 +43,9 @@ module com { module sun { module star { module awt { module grid { //============================================================================= /** The XGridColumn defines the properties and behavior of a column in a grid control + @since OOo 3.3.0 */ -interface XGridColumn: com::sun::star::uno::XInterface +interface XGridColumn { /** Specifies the an idendifier of the colomn.**/ [attribute] any Identifier; diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl index 2480ab15d..89d4666e2 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ + * $RCSfile: XGridColumnListener.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -49,8 +49,10 @@ module com { module sun { module star { module awt { module grid {

Usually you must not implement this interface yourself, but you must notify it correctly if you implement the XGridColumnModel yourself

. + + @since OOo 3.3.0 */ -interface XGridColumnListener: com::sun::star::uno::XInterface +interface XGridColumnListener { /** Invoked after a column was added to the column model. diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl index 025fbb0ee..defcd9c2a 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ + * $RCSfile: XGridColumnModel.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -45,8 +45,10 @@ module com { module sun { module star { module awt { module grid { retrieve the column structure that is displayed in the actual control. If you do not need your own model implementation, you can also use the DefaultGridColumnModel. + + @since OOo 3.3.0 */ -interface XGridColumnModel: com::sun::star::uno::XInterface +interface XGridColumnModel { /** Specifies whether column selection is allowed */ diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl index 35e2b06c8..6df1474b6 100644 --- a/offapi/com/sun/star/awt/grid/XGridControl.idl +++ b/offapi/com/sun/star/awt/grid/XGridControl.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ + * $RCSfile: XGridControl.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,8 @@ module com { module sun { module star { module awt { module grid { /** An interface to a control that displays a tabular data. @see UnoControlGrid + + @since OOo 3.3.0 */ interface XGridControl: XGridSelection { @@ -61,14 +63,6 @@ interface XGridControl: XGridSelection If only text should be shown, leave this sequence empty. */ void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip); - - /** registers a listener for mouse events. - */ - //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); - - /** unregisters a listener for mouse events. - */ - //[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener ); }; diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl index 3c997dc00..6c29bc349 100644 --- a/offapi/com/sun/star/awt/grid/XGridControlListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ + * $RCSfile: XGridControlListener.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -40,7 +40,7 @@ module com { module sun { module star { module awt { module grid { //============================================================================= -interface XGridControlListener: com::sun::star::uno::XInterface +interface XGridControlListener { }; diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl index a657225a5..a5c61b012 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl @@ -6,8 +6,8 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ - * $Revision: 1.8 $ + * $RCSfile: XGridDataListener.idl,v $ + * $Revision: 1.0 $ * * This file is part of OpenOffice.org. * @@ -49,6 +49,8 @@ module com { module sun { module star { module awt { module grid {

Usually you must not implement this interface yourself, but you must notify it correctly if you implement the XGridDataModel yourself

. + + @since OOo 3.3.0 */ interface XGridDataListener: com::sun::star::lang::XEventListener { diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl index 47c5a75b5..b228e9eaa 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -7,7 +7,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XListBox.idl,v $ + * $RCSfile: XGridDataModel.idl,v $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,8 @@ module com { module sun { module star { module awt { module grid { retrieve the content data that is displayed in the actual control. If you do not need your own model implementation, you can also use the DefaultGridDataModel. + + @since OOo 3.3.0 */ interface XGridDataModel: ::com::sun::star::lang::XComponent { diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl index 35c7d689b..601b5a3ab 100644 --- a/offapi/com/sun/star/awt/grid/XGridSelection.idl +++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl @@ -42,7 +42,7 @@ module com { module sun { module star { module awt { module grid { /** This interfaces provides access to the selection of row for UnoControlGrid. */ -interface XGridSelection: com::sun::star::uno::XInterface +interface XGridSelection { /** Returns the lowest index of the selection. @returns -- cgit v1.2.3 From 571b8b2d8f953e494208728a29af8b4f0c7ac465 Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Fri, 12 Mar 2010 12:49:14 +0100 Subject: changes in XGridColumnListener --- offapi/com/sun/star/awt/grid/XGridColumnListener.idl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl index 2480ab15d..5d9bee563 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl @@ -52,15 +52,15 @@ module com { module sun { module star { module awt { module grid { */ interface XGridColumnListener: com::sun::star::uno::XInterface { - /** - Invoked after a column was added to the column model. - */ - void columnAdded( [in] GridColumnEvent event ); - - /** - Invoked after a column was removed from the column model. - */ - void columnRemoved( [in] GridColumnEvent event ); + // /** + // Invoked after a column was added to the column model. + //*/ + //void columnAdded( [in] GridColumnEvent event ); + // + // /** + // Invoked after a column was removed from the column model. + //*/ + //void columnRemoved( [in] GridColumnEvent event ); /** Invoked after a column was modified. -- cgit v1.2.3 From 72467f901dedc705de4fea71c42279910b72f87c Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Mon, 22 Mar 2010 11:17:10 +0100 Subject: recent changes for grid control --- offapi/com/sun/star/awt/grid/GridColumnEvent.idl | 20 ++---------- .../com/sun/star/awt/grid/GridSelectionEvent.idl | 13 +++++--- .../com/sun/star/awt/grid/SelectionEventType.idl | 8 ++++- .../com/sun/star/awt/grid/UnoControlGridModel.idl | 7 +++-- offapi/com/sun/star/awt/grid/XGridColumn.idl | 30 +++++++++++++++++- offapi/com/sun/star/awt/grid/XGridColumnModel.idl | 30 ++++++++---------- offapi/com/sun/star/awt/grid/XGridSelection.idl | 36 ++++++++++++---------- 7 files changed, 83 insertions(+), 61 deletions(-) diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl index a6c5dd6d1..866c66255 100644 --- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl @@ -33,25 +33,14 @@ #ifndef __com_sun_star_lang_EventObject_idl__ #include #endif - -#ifndef __com_sun_star_awt_grid_XGridColumn_idl__ -#include -#endif - + //============================================================================= module com { module sun { module star { module awt { module grid { //============================================================================= -/** An event used by a XGridColumnModel to notify changes in the column - model to the XGridControl. - You usually need to fill this event only if you implement the XGridColumnModel - yourself. - - @see XGridColumnModel - @see XGridControl - @see XGridColumnListener +/** An event used by a XGridColumn to notify changes in the column. */ struct GridColumnEvent: com::sun::star::lang::EventObject { @@ -63,12 +52,9 @@ struct GridColumnEvent: com::sun::star::lang::EventObject /** Contains the new value **/ any newValue; - + /** Contains the index of the changed column**/ long index; - - /** Contains the changed column**/ - XGridColumn column; //------------------------------------------------------------------------- }; diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl index bc70417dd..ae6c34be8 100644 --- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl +++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl @@ -53,14 +53,17 @@ struct GridSelectionEvent: com::sun::star::lang::EventObject { //------------------------------------------------------------------------- - /** Contains the x coordinate of the selected cell**/ - long x; + /** the selected row*/ + long Row; - /** Contains the y coordinate of the selected cell**/ - long y; + /** the selected column*/ + long Column; + + /**number of selected rows, if multiple rows selected*/ + long Range; /** Contains the action SelectionEventType that was performed **/ - SelectionEventType action; + SelectionEventType Action; }; diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl index 734551f8c..eadded7b7 100644 --- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl +++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl @@ -52,7 +52,13 @@ enum SelectionEventType /** This value indicates that a selection was removed from the grid control */ - REMOVE + REMOVE, + + //------------------------------------------------------------------------- + + /** This value indicates that a selection was changed + */ + CHANGE }; diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl index e71c38c44..4c543754e 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -101,10 +101,11 @@ service UnoControlGridModel

The default value is SelectionType::SINGLE

*/ [property] ::com::sun::star::view::SelectionType SelectionModel; - /** Specifies the background color of odd rows. If color for even rows isn't set, then specifies - the color of all rows. Default value is white. + + /** Specifies the background color of rows. If color for even rows is set, then specifies + the color of odd rows. Default value is white. */ - [property] ::com::sun::star::util::Color BackgroundColor; + [property] ::com::sun::star::util::Color RowBackgroundColor; /** Specifies the background color of even rows. Default value is white. */ diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl index 7ce5b6cfd..3f97833f1 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumn.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl @@ -34,6 +34,7 @@ #include #endif #include +#include //============================================================================= @@ -44,7 +45,7 @@ module com { module sun { module star { module awt { module grid { /** The XGridColumn defines the properties and behavior of a column in a grid control */ -interface XGridColumn: com::sun::star::uno::XInterface +interface XGridColumn { /** Specifies the an idendifier of the colomn.**/ [attribute] any Identifier; @@ -76,6 +77,33 @@ interface XGridColumn: com::sun::star::uno::XInterface /** A title is displayed in the colum header row if UnoControlGridModel::ShowRowHeader is set to **/ [attribute] string Title; + + /** Adds a listener for the GridColumnEvent posted after the grid changes. + @param Listener + the listener to add. + */ + [oneway] void addColumnListener( [in] XGridColumnListener listener); + + //------------------------------------------------------------------------- + + /** Removes a listener previously added with addColumnListener(). + @param Listener + the listener to remove. + */ + [oneway] void removeColumnListener( [in] XGridColumnListener listener); + + /**Updates changed column widths, when column widths are being resized. + @param name + can be PrefWidth or ColWidth, depending on which was changed + @param width + the new column width + */ + void updateColumn( [in] string name, [in] long width); + /**Sets column index + @param index + index, which is the index of the column in the column array of the column model + */ + void setIndex( [in] long index ); }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl index 025fbb0ee..dece271d0 100644 --- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl @@ -33,7 +33,8 @@ #include #include -#include + +#include //============================================================================= @@ -48,9 +49,9 @@ module com { module sun { module star { module awt { module grid { */ interface XGridColumnModel: com::sun::star::uno::XInterface { - /** Specifies whether column selection is allowed - */ - [attribute] boolean ColumnSelectionAllowed; + ///** Specifies whether column selection is allowed + //*/ + //[attribute] boolean ColumnSelectionAllowed; /**Specifies the height of column header. */ @@ -99,24 +100,17 @@ interface XGridColumnModel: com::sun::star::uno::XInterface the number of default columns that should be set. */ void setDefaultColumns([in] long elements); + + /**Creates new XGridColumn with the settings of other column. To be used if the columns which are added to + the column model have the same settings. + @param column + the column, which is already created + */ + XGridColumn copyColumn( [in] XGridColumn column ); /* long getTotalColumnWidth(); */ - - /** Adds a listener for the GridColumnEvent posted after the grid changes. - @param Listener - the listener to add. - */ - [oneway] void addColumnListener( [in] XGridColumnListener listener); - - //------------------------------------------------------------------------- - - /** Removes a listener previously added with addColumnListener(). - @param Listener - the listener to remove. - */ - [oneway] void removeColumnListener( [in] XGridColumnListener listener); }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl index 35c7d689b..dad4f9e17 100644 --- a/offapi/com/sun/star/awt/grid/XGridSelection.idl +++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl @@ -56,21 +56,25 @@ interface XGridSelection: com::sun::star::uno::XInterface */ long getMaxSelectionIndex(); - /** Adds a selection intervall. - @param start - the start row index. - @param length - the number of rows to be selected. + /** Selects all rows. */ - [oneway] void insertIndexIntervall( [in] long start, [in] long length); + [oneway] void selectAllRows(); - /** Removes a selection intervall. - @param start - the start row index. - @param length - the number of rows to be selected. + /** Selects multiple rows. Previous selections will be removed. + @param rangeOfRows + array of rows indexes, which will be selected. */ - [oneway] void removeIndexIntervall( [in] long start, [in] long length); + [oneway] void selectRows( [in] sequence< long > rangeOfRows); + + /** Deselects all selected rows. + */ + [oneway] void deselectAllRows(); + + /** Deselects selected rows. Selected rows, which aren't in the range remain selected. + @param rangeOfRows + array of rows indexes, which will be deselected. + */ + [oneway] void deselectRows( [in] sequence< long > rangeOfRows); /** Returns the indicies of all selected rows. @returns @@ -93,17 +97,17 @@ interface XGridSelection: com::sun::star::uno::XInterface boolean isSelectedIndex( [in] long index); /** Marks a row as selected. - @param + @param index the index of a row. */ - [oneway] void selectRow( [in] long y); + [oneway] void selectRow( [in] long index); /* [oneway] void selectColumn( [in] long x); */ /** Adds a listener for the GridSelectionEvent posted after the grid changes. - @param Listener + @param listener the listener to add. */ [oneway] void addSelectionListener( [in] XGridSelectionListener listener); @@ -111,7 +115,7 @@ interface XGridSelection: com::sun::star::uno::XInterface //------------------------------------------------------------------------- /** Removes a listener previously added with addSelectionListener(). - @param Listener + @param listener the listener to remove. */ [oneway] void removeSelectionListener( [in] XGridSelectionListener listener); -- cgit v1.2.3 From a47fcba59d088bf4ee7f12d7f0674deb6a0469cc Mon Sep 17 00:00:00 2001 From: Mihaela Kedikova Date: Fri, 23 Apr 2010 17:41:32 +0200 Subject: gridcontrol_03:bug fix for #i111107#, added update methods to xgriddatamodel --- offapi/com/sun/star/awt/grid/UnoControlGridModel.idl | 2 +- offapi/com/sun/star/awt/grid/XGridDataModel.idl | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl index 9f9165cdd..ce2c8d5eb 100644 --- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl +++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl @@ -153,7 +153,7 @@ service UnoControlGridModel /** specifies the help URL of the control. */ [property] string HelpURL; - + }; //============================================================================= diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl index 77416024b..7489e4960 100644 --- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl +++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl @@ -89,6 +89,26 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent */ void removeAll(); + /**Updates the content of a given cell. + @param row + the row index + @param column + the column index + @param value + the new value of the cell. + */ + void updateCell([in] long row, [in] long column, [in] any value ); + + /**Updates the content of a given row. + @param row + the row index + @param columns + column indexes of the cells, which should be updated + @param value + the new values of the cells. + */ + void updateRow([in] long row, [in] sequence< long > columns, [in] sequence< any > values); + //------------------------------------------------------------------------- /** Adds a listener for the GridDataEvent posted after the grid changes. -- cgit v1.2.3