diff -cNr offapi/com/sun/star/sheet/FilterOperator2.idl offapi.new/com/sun/star/sheet/FilterOperator2.idl
*** offapi/com/sun/star/sheet/FilterOperator2.idl Thu Jan 1 08:00:00 1970
--- offapi.new/com/sun/star/sheet/FilterOperator2.idl Mon Feb 18 15:30:58 2008
***************
*** 0 ****
--- 1,169 ----
+ /*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: OpenCommandArgument2.idl,v $
+ *
+ * $Revision: 1.7 $
+ *
+ * last change: $Author: rt $ $Date: 2005/09/08 07:41:59 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+ #ifndef __com_sun_star_sheet_FilterOperator2_idl__
+ #define __com_sun_star_sheet_FilterOperator2_idl__
+
+ //=============================================================================
+
+ module com { module sun { module star { module sheet {
+
+ //=============================================================================
+
+ /** specifies the type of a single condition in a filter descriptor.
+
+
This constants group extends the FilterOperator enum by
+ additional filter operators.
+
+ @since OOo 3.0
+ */
+ published constants FilterOperator2
+ {
+
+ //-------------------------------------------------------------------------
+
+ /** selects empty entries.
+ */
+ const long EMPTY = 0;
+
+ //-------------------------------------------------------------------------
+
+ /** selects non-empty entries.
+ */
+ const long NOT_EMPTY = 1;
+
+ //-------------------------------------------------------------------------
+
+ /** value has to be equal to the specified value.
+ */
+ const long EQUAL = 2;
+
+ //-------------------------------------------------------------------------
+
+ /** value must not be equal to the specified value.
+ */
+ const long NOT_EQUAL = 3;
+
+ //-------------------------------------------------------------------------
+
+ /** value has to be greater than the specified value.
+ */
+ const long GREATER = 4;
+
+ //-------------------------------------------------------------------------
+
+ /** value has to be greater than or equal to the specified value.
+ */
+ const long GREATER_EQUAL = 5;
+
+ //-------------------------------------------------------------------------
+
+ /** value has to be less than the specified value.
+ */
+ const long LESS = 6;
+
+ //-------------------------------------------------------------------------
+
+ /** value has to be less than or equal to the specified value.
+ */
+ const long LESS_EQUAL = 7;
+
+ //-------------------------------------------------------------------------
+
+ /** selects a specified number of entries with the greatest values.
+ */
+ const long TOP_VALUES = 8;
+
+ //-------------------------------------------------------------------------
+
+ /** selects a specified percentage of entries with the greatest values.
+ */
+ const long TOP_PERCENT = 9;
+
+ //-------------------------------------------------------------------------
+
+ /** selects a specified number of entries with the lowest values.
+ */
+ const long BOTTOM_VALUES = 10;
+
+ //-------------------------------------------------------------------------
+
+ /** selects a specified percentage of entries with the lowest values.
+ */
+ const long BOTTOM_PERCENT = 11;
+
+ //-------------------------------------------------------------------------
+
+ /** selects contains entries.
+ */
+ const long CONTAINS = 12;
+
+ //-------------------------------------------------------------------------
+
+ /** selects does-not-contain entries.
+ */
+ const long DOES_NOT_CONTAIN = 13;
+
+ //-------------------------------------------------------------------------
+
+ /** selects begins-with entries.
+ */
+ const long BEGINS_WITH = 14;
+
+ //-------------------------------------------------------------------------
+
+ /** selects does-not-begin-with entries.
+ */
+ const long DOES_NOT_BEGIN_WITH = 15;
+ //-------------------------------------------------------------------------
+
+ /** selects ends-with entries.
+ */
+ const long ENDS_WITH = 16;
+
+ //-------------------------------------------------------------------------
+
+ /** selects does-not-end-with entries.
+ */
+ const long DOES_NOT_END_WITH = 17;
+
+ };
+
+ //=============================================================================
+
+ }; }; }; };
+
+ #endif
+
diff -cNr offapi/com/sun/star/sheet/TableFilterField2.idl offapi.new/com/sun/star/sheet/TableFilterField2.idl
*** offapi/com/sun/star/sheet/TableFilterField2.idl Thu Jan 1 08:00:00 1970
--- offapi.new/com/sun/star/sheet/TableFilterField2.idl Mon Feb 18 15:16:34 2008
***************
*** 0 ****
--- 1,108 ----
+ /*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: TableFilterField.idl,v $
+ *
+ * $Revision: 1.6 $
+ *
+ * last change: $Author: rt $ $Date: 2005/09/08 04:58:16 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+ #ifndef __com_sun_star_sheet_TableFilterField2_idl__
+ #define __com_sun_star_sheet_TableFilterField2_idl__
+
+
+ #ifndef __com_sun_star_sheet_FilterConnection_idl__
+ #include
+ #endif
+
+ //=============================================================================
+
+ module com { module sun { module star { module sheet {
+
+ //=============================================================================
+
+ /** describes a single condition in a filter descriptor.
+
+ This struct has the FilterOperator2 constants group as
+ member, whereas the TableFilterField struct uses the
+ FilterOperator enum.
+
+ @see com::sun::star::sheet::SheetFilterDescriptor
+
+ @since OOo 3.0
+ */
+ published struct TableFilterField2
+ {
+ //-------------------------------------------------------------------------
+
+ /** specifies how the condition is connected to the previous condition.
+ */
+ FilterConnection Connection;
+
+ //-------------------------------------------------------------------------
+
+ /** specifies which field (column) is used for the condition.
+ */
+ long Field;
+
+ //-------------------------------------------------------------------------
+
+ /** specifies the type of the condition as defined in
+ FilterOperator2.
+ */
+ long Operator;
+
+ //-------------------------------------------------------------------------
+
+ /** selects whether the TableFilterField2::NumericValue
+ or the TableFilterField2::StringValue is used.
+ */
+ boolean IsNumeric;
+
+ //-------------------------------------------------------------------------
+
+ /** specifies a numeric value for the condition.
+ */
+ double NumericValue;
+
+ //-------------------------------------------------------------------------
+
+ /** specifies a string value for the condition.
+ */
+ string StringValue;
+
+ };
+
+ //=============================================================================
+
+ }; }; }; };
+
+
+ #endif
+
diff -cNr offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl offapi.new/com/sun/star/sheet/XSheetFilterDescriptor2.idl
*** offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl Thu Jan 1 08:00:00 1970
--- offapi.new/com/sun/star/sheet/XSheetFilterDescriptor2.idl Mon Feb 18 15:13:56 2008
***************
*** 0 ****
--- 1,85 ----
+ /*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XSheetFilterDescriptor.idl,v $
+ *
+ * $Revision: 1.8 $
+ *
+ * last change: $Author: rt $ $Date: 2005/09/08 05:19:41 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+ #ifndef __com_sun_star_sheet_XSheetFilterDescriptor2_idl__
+ #define __com_sun_star_sheet_XSheetFilterDescriptor2_idl__
+
+ #ifndef __com_sun_star_uno_XInterface_idl__
+ #include
+ #endif
+
+ #ifndef __com_sun_star_sheet_TableFilterField2_idl__
+ #include
+ #endif
+
+ //=============================================================================
+
+ module com { module sun { module star { module sheet {
+
+ //=============================================================================
+
+ /** provides access to a collection of filter conditions (filter fields).
+
+ This interface uses the TableFilterField2 struct,
+ whereas the XSheetFilterDescriptor interface uses the
+ TableFilterField struct.
+
+ @see com::sun::star::sheet::SheetFilterDescriptor
+
+ @since OOo 3.0
+ */
+ published interface XSheetFilterDescriptor2: com::sun::star::uno::XInterface
+ {
+ //-------------------------------------------------------------------------
+
+ /** returns the collection of filter fields.
+ */
+ sequence< com::sun::star::sheet::TableFilterField2 > getFilterFields2();
+
+ //-------------------------------------------------------------------------
+
+ /** sets a new collection of filter fields.
+ */
+ void setFilterFields2(
+ [in] sequence< com::sun::star::sheet::TableFilterField2 > aFilterFields );
+
+ };
+
+ //=============================================================================
+
+ }; }; }; };
+
+ #endif
+
diff -cNr offapi/com/sun/star/sheet/makefile.mk offapi.new/com/sun/star/sheet/makefile.mk
*** offapi/com/sun/star/sheet/makefile.mk Thu Jan 10 20:43:34 2008
--- offapi.new/com/sun/star/sheet/makefile.mk Mon Feb 18 14:39:06 2008
***************
*** 126,131 ****
--- 126,132 ----
FillMode.idl\
FilterConnection.idl\
FilterOperator.idl\
+ FilterOperator2.idl\
FormulaLanguage.idl\
FormulaMapGroup.idl\
FormulaMapGroupSpecialOffset.idl\
***************
*** 204,209 ****
--- 205,211 ----
TableConditionalEntryEnumeration.idl\
TableConditionalFormat.idl\
TableFilterField.idl\
+ TableFilterField2.idl\
TableOperationMode.idl\
TablePageBreakData.idl\
TablePageStyle.idl\
***************
*** 294,299 ****
--- 296,302 ----
XSheetConditionalEntries.idl\
XSheetConditionalEntry.idl\
XSheetFilterDescriptor.idl\
+ XSheetFilterDescriptor2.idl\
XSheetFilterable.idl\
XSheetFilterableEx.idl\
XSheetLinkable.idl\