language and algorithm in sort dialog

2 files changed, 27 insertions, 8 deletions

diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index e3fafa2e4d03..d7490e5545b8 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sortdlg.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:01 $
+ *  last change: $Author: nn $ $Date: 2001-03-13 10:03:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,12 +91,12 @@
 #define BTN_DOWN3           12
 
 // TP_SORT_OPTIONS:
-#define GB_DIRECTION        1
+#define FL_DIRECTION        1
 #define LB_SORT_USER        2
 #define LB_OUTAREA          3
 #define ED_OUTAREA          4
 #define FT_AREA_LABEL       5
-#define FT_AREA             6
+//#define FT_AREA             6
 #define BTN_SORT_USER       7
 #define BTN_CASESENSITIVE   8
 #define BTN_LABEL           9
@@ -106,6 +106,9 @@
 #define BTN_LEFT_RIGHT      13
 #define STR_COL_LABEL       14
 #define STR_ROW_LABEL       15
+#define FL_LANGUAGE         16
+#define LB_LANGUAGE         17
+#define LB_ALGORITHM        18
 
 
 
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index b2b871272cde..b62ec31433e7 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpsort.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: er $ $Date: 2001-03-12 16:49:49 $
+ *  last change: $Author: nn $ $Date: 2001-03-13 10:03:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,10 @@
 #include <svtools/stdctrl.hxx>
 #endif
 
+#ifndef _SVX_LANGBOX_HXX
+#include <svx/langbox.hxx>
+#endif
+
 
 #ifndef SC_SCGLOB_HXX
 #include "global.hxx"
@@ -175,6 +179,8 @@ private:
 
 class ScDocument;
 class ScRangeData;
+class CollatorRessource;
+class CollatorWrapper;
 
 class ScTabPageSortOptions : public SfxTabPage
 {
@@ -208,15 +214,21 @@ private:
     CheckBox    aBtnSortUser;
     ListBox     aLbSortUser;
 
+    FixedLine   aLineLang;
+    SvxLanguageBox aLbLanguage;
+    ListBox     aLbAlgorithm;
+
+    FixedLine   aLineDirection;
     RadioButton aBtnTopDown;
     RadioButton aBtnLeftRight;
-    GroupBox    aGbDirection;
+
     FixedText   aFtAreaLabel;
-    FixedInfo   aFtArea;
+//  FixedInfo   aFtArea;
     String      aStrRowLabel;
     String      aStrColLabel;
     String      aStrUndefined;
     String      aStrNoName;
+    String      aStrAreaLabel;
 
     const USHORT        nWhichSort;
     const ScSortParam&  rSortData;
@@ -225,6 +237,9 @@ private:
     ScSortDlg*          pDlg;
     ScAddress           theOutPos;
 
+    CollatorRessource*  pColRes;
+    CollatorWrapper*    pColWrap;
+
 #ifdef _TPSORT_CXX
 private:
     void Init                   ();
@@ -236,6 +251,7 @@ private:
     DECL_LINK( SelOutPosHdl, ListBox * );
     void EdOutPosModHdl ( Edit* pEd );
     DECL_LINK( SortDirHdl, RadioButton * );
+    DECL_LINK( FillAlgorHdl, void * );
 #endif
 };