CWS-TOOLING: integrate CWS calc51

2009-07-17 15:47:46 +0200 er  r274098 : #i101544# more thorough reference checking in chart data ranges; also prevent some possible crash if invalid ranges were to be passed to document/cell access.
2009-07-16 14:20:11 +0200 er  r274051 : #i101544# let ScRefTokenHelper::compileRangeRepresentation() fail on all possible non-reference occasions
2009-07-07 10:11:40 +0200 nn  r273776 : #i35579# don't use long instead of sal_Int32
2009-07-03 16:41:39 +0200 nn  r273711 : msvc warnings
2009-07-03 14:18:45 +0200 nn  r273698 : msvc warning
2009-07-03 11:30:41 +0200 nn  r273685 : #i35579# move new tokens to the end
2009-07-03 10:12:55 +0200 nn  r273681 : CWS-TOOLING: rebase CWS calc51 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 17:57:30 +0200 nn  r273529 : #i103027# EnterData: if it's a formula, don't pass EditTextObject to undo
2009-06-29 14:31:18 +0200 er  r273474 : #i101544# #i101645# #i102388# applied diff from CWS dr68ooo311
2009-06-29 10:30:20 +0200 nn  r273457 : #i103161# DeleteCells: always leave list action
2009-06-24 16:16:34 +0200 nn  r273353 : gcc warnings
2009-06-17 11:50:28 +0200 tbe  r273055 : #i35579# Standard filter requires more options
2009-06-17 11:44:22 +0200 tbe  r273054 : #i35579# Standard filter requires more options
2009-06-17 11:22:23 +0200 tbe  r273052 : #i35579# Standard filter requires more options
2009-06-15 18:29:32 +0200 nn  r273006 : #160063# UseFormulaData: check parenthesis position
2009-06-12 15:41:16 +0200 nn  r272923 : #i99250# handle range lists in DoAutoOutline (patch from dtardon)
2009-06-11 15:07:05 +0200 nn  r272874 : #i86943# GetNextPos: skip overlapped cells
2009-06-11 11:17:37 +0200 nn  r272856 : #i97726# EnterData: get text from EditTextObject for repeat string of undo action
2009-06-10 20:45:07 +0200 nn  r272839 : #i102566# minimum amount of code between updates of calculation progress (patch by cmc)
2009-06-10 20:22:02 +0200 nn  r272838 : #i69524# PasteFile: specify target for SID_OPENDOC
2009-06-09 17:33:08 +0200 nn  r272789 : #i16615# absolute/relative reference conversion for cell ranges (patch by gaojingmei)

4 files changed, 352 insertions, 0 deletions

diff --git a/offapi/com/sun/star/sheet/FilterOperator2.idl b/offapi/com/sun/star/sheet/FilterOperator2.idl
new file mode 100644
index 000000000000..94935979c8f5
--- /dev/null
+++ b/offapi/com/sun/star/sheet/FilterOperator2.idl
@@ -0,0 +1,164 @@
+/*************************************************************************
+ *
+ * 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: FilterOperator2.idl,v $
+ * $Revision: 1.7 $
+ *
+ * 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_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.
+
+    <p>This constants group extends the <type>FilterOperator</type> enum by
+    additional filter operators.</p>
+
+    @since OOo 3.2
+ */
+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 --git a/offapi/com/sun/star/sheet/TableFilterField2.idl b/offapi/com/sun/star/sheet/TableFilterField2.idl
new file mode 100644
index 000000000000..1cf50ddd547b
--- /dev/null
+++ b/offapi/com/sun/star/sheet/TableFilterField2.idl
@@ -0,0 +1,106 @@
+/*************************************************************************
+ *
+ * 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: TableFilterField2.idl,v $
+ * $Revision: 1.7 $
+ *
+ * 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_sheet_TableFilterField2_idl__
+#define __com_sun_star_sheet_TableFilterField2_idl__
+
+
+#ifndef __com_sun_star_sheet_FilterConnection_idl__
+#include <com/sun/star/sheet/FilterConnection.idl>
+#endif
+
+#ifndef __com_sun_star_sheet_FilterOperator2_idl__
+#include <com/sun/star/sheet/FilterOperator2.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** describes a single condition in a filter descriptor.
+
+    <p>This struct has the <type>FilterOperator2</type> constants group as
+    member, whereas the <type>TableFilterField</type> struct uses the
+    <type>FilterOperator</type> enum.</p>
+
+    @see com::sun::star::sheet::SheetFilterDescriptor
+    @since OOo 3.2
+ */
+published struct TableFilterField2
+{
+    //-------------------------------------------------------------------------
+
+    /** specifies how the condition is connected to the previous condition.
+     */
+    com::sun::star::sheet::FilterConnection Connection;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies which field (column) is used for the condition.
+     */
+    long Field;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies the type of the condition as defined in
+    <type>FilterOperator2</type>.
+    */
+    long Operator;
+
+    //-------------------------------------------------------------------------
+
+    /** selects whether the <member>TableFilterField2::NumericValue</member>
+        or the <member>TableFilterField2::StringValue</member> is used.
+     */
+    boolean IsNumeric;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies a numeric value for the condition.
+     */
+    double NumericValue;
+
+    //-------------------------------------------------------------------------
+
+    /** specifies a string value for the condition.
+     */
+    string StringValue;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+
+#endif
+
diff --git a/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
new file mode 100644
index 000000000000..cc26a73c1674
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl
@@ -0,0 +1,79 @@
+/*************************************************************************
+ *
+ * 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: XSheetFilterDescriptor2.idl,v $
+ * $Revision: 1.9 $
+ *
+ * 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_sheet_XSheetFilterDescriptor2_idl__
+#define __com_sun_star_sheet_XSheetFilterDescriptor2_idl__
+
+#ifndef __com_sun_star_sheet_TableFilterField2_idl__
+#include <com/sun/star/sheet/TableFilterField2.idl>
+#endif
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+module com {  module sun {  module star {  module sheet {
+
+//=============================================================================
+
+/** provides access to a collection of filter conditions (filter fields).
+
+    <p>This interface uses the <type>TableFilterField2</type> struct,
+    whereas the <type>XSheetFilterDescriptor</type> interface uses the
+    <type>TableFilterField</type> struct.</p>
+
+    @see com::sun::star::sheet::SheetFilterDescriptor
+    @since OOo 3.2
+ */
+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 --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk
index f6ca0810604e..2ab831840d88 100644
--- a/offapi/com/sun/star/sheet/makefile.mk
+++ b/offapi/com/sun/star/sheet/makefile.mk
@@ -138,6 +138,7 @@ IDLFILES=\
     FillMode.idl\
     FilterConnection.idl\
     FilterOperator.idl\
+    FilterOperator2.idl\
     FormulaLanguage.idl\
     FormulaMapGroup.idl\
     FormulaMapGroupSpecialOffset.idl\
@@ -219,6 +220,7 @@ IDLFILES=\
     TableConditionalEntryEnumeration.idl\
     TableConditionalFormat.idl\
     TableFilterField.idl\
+    TableFilterField2.idl\
     TableOperationMode.idl\
     TablePageBreakData.idl\
     TablePageStyle.idl\
@@ -315,6 +317,7 @@ IDLFILES=\
     XSheetConditionalEntries.idl\
     XSheetConditionalEntry.idl\
     XSheetFilterDescriptor.idl\
+    XSheetFilterDescriptor2.idl\
     XSheetFilterable.idl\
     XSheetFilterableEx.idl\
     XSheetLinkable.idl\