moved ScSortParam from global to sortparam.[ch]xx

6 files changed, 141 insertions, 53 deletions

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index c62a0d361e9f..203051c23d37 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: datauno.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:48 $
+ *  last change: $Author: er $ $Date: 2001-03-12 16:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,6 +143,8 @@ class ScSubTotalFieldObj;
 class ScDatabaseRangeObj;
 class ScDataPilotDescriptorBase;
 
+struct ScSortParam;
+
 
 class ScDataUnoConversion
 {
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 70bf65fa07e5..3a73a12f8dd5 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbcolect.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:48 $
+ *  last change: $Author: er $ $Date: 2001-03-12 16:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,11 @@
 #endif
 
 #ifndef SC_SCGLOB_HXX
-#include "global.hxx" // ->Konstanten (MAXSORT, MAXQUERY)
+#include "global.hxx"       // MAXQUERY
+#endif
+
+#ifndef SC_SORTPARAM_HXX
+#include "sortparam.hxx"    // MAXSORT
 #endif
 
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 319dab5b3bac..391d55e6e9d4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: document.hxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: nn $ $Date: 2001-03-12 09:29:21 $
+ *  last change: $Author: er $ $Date: 2001-03-12 16:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -160,6 +160,7 @@ class ScMatrix;
 class ScScriptTypeData;
 class ScPoolHelper;
 class ScImpExpLogMsg;
+struct ScSortParam;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 888b9c4a7b51..eb5ce9ab1cd3 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: nn $ $Date: 2001-02-14 19:18:12 $
+ *  last change: $Author: er $ $Date: 2001-03-12 16:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,6 @@
 
 class ImageList;
 class Bitmap;
-class International;
 class SfxItemSet;
 class Color;
 
@@ -131,7 +130,6 @@ struct LabelData;
 #define MAXZOOM     400
 
 #define MAXSUBTOTAL 3
-#define MAXSORT     3
 #define MAXQUERY    8
 #define PIVOT_MAXFIELD  8
 
@@ -499,6 +497,7 @@ class EditTextObject;
 class SfxObjectShell;
 class SvNumberFormatter;
 class ScUnitConverter;
+class International;
 class CharClass;
 class LocaleDataWrapper;
 class CalendarWrapper;
@@ -1322,46 +1321,6 @@ enum ScSubTotalFunc
 
 // -----------------------------------------------------------------------
 
-struct ScSubTotalParam;
-struct ScQueryParam;
-
-// -----------------------------------------------------------------------
-
-struct ScSortParam
-{
-    USHORT      nCol1;
-    USHORT      nRow1;
-    USHORT      nCol2;
-    USHORT      nRow2;
-    BOOL        bHasHeader;
-    BOOL        bByRow;
-    BOOL        bCaseSens;
-    BOOL        bUserDef;
-    USHORT      nUserIndex;
-    BOOL        bIncludePattern;
-    BOOL        bInplace;
-    USHORT      nDestTab;
-    USHORT      nDestCol;
-    USHORT      nDestRow;
-    BOOL        bDoSort[MAXSORT];
-    USHORT      nField[MAXSORT];
-    BOOL        bAscending[MAXSORT];
-
-    ScSortParam();
-    ScSortParam( const ScSortParam& r );
-    // zum Sortieren von Zwischenergebnissen:
-    ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld );
-    ScSortParam( const ScQueryParam&, USHORT nCol );    // TopTen Sortierung
-
-    ScSortParam&    operator=   ( const ScSortParam& r );
-    BOOL            operator==  ( const ScSortParam& rOther ) const;
-    void            Clear       ();
-
-    void            MoveToDest();
-};
-
-// -----------------------------------------------------------------------
-
 /*
  * Dialog liefert die ausgezeichneten Feldwerte "leer"/"nicht leer"
  * als Konstanten SC_EMPTYFIELDS bzw. SC_NONEMPTYFIELDS in nVal in
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
new file mode 100644
index 000000000000..9953a9c9ca07
--- /dev/null
+++ b/sc/inc/sortparam.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ *  $RCSfile: sortparam.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: er $ $Date: 2001-03-12 16:41:44 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 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
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SC_SORTPARAM_HXX
+#define SC_SORTPARAM_HXX
+
+#ifndef _STRING_HXX
+#include <tools/string.hxx>
+#endif
+#ifndef _SOLAR_H
+#include <tools/solar.h>
+#endif
+#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
+#include <com/sun/star/lang/Locale.hpp>
+#endif
+
+
+#define MAXSORT     3
+
+
+struct ScSubTotalParam;
+struct ScQueryParam;
+
+struct ScSortParam
+{
+    USHORT      nCol1;
+    USHORT      nRow1;
+    USHORT      nCol2;
+    USHORT      nRow2;
+    BOOL        bHasHeader;
+    BOOL        bByRow;
+    BOOL        bCaseSens;
+    BOOL        bUserDef;
+    USHORT      nUserIndex;
+    BOOL        bIncludePattern;
+    BOOL        bInplace;
+    USHORT      nDestTab;
+    USHORT      nDestCol;
+    USHORT      nDestRow;
+    BOOL        bDoSort[MAXSORT];
+    USHORT      nField[MAXSORT];
+    BOOL        bAscending[MAXSORT];
+    ::com::sun::star::lang::Locale      aCollatorLocale;
+    String      aCollatorAlgorithm;
+
+    ScSortParam();
+    ScSortParam( const ScSortParam& r );
+    /// SubTotals sort
+    ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld );
+    /// TopTen sort
+    ScSortParam( const ScQueryParam&, USHORT nCol );
+
+    ScSortParam&    operator=   ( const ScSortParam& r );
+    BOOL            operator==  ( const ScSortParam& rOther ) const;
+    void            Clear       ();
+
+    void            MoveToDest();
+};
+
+
+#endif // SC_SORTPARAM_HXX
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2d336d1bb269..3e6eb51e5e0f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sab $ $Date: 2001-02-23 06:55:58 $
+ *  last change: $Author: er $ $Date: 2001-03-12 16:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,9 @@
 #ifndef SC_COLUMN_HXX
 #include "column.hxx"
 #endif
+#ifndef SC_SORTPARAM_HXX
+#include "sortparam.hxx"
+#endif
 
 namespace utl {
     class SearchParam;