#80953# SortOptions-delimiter: char->sal_Unicode

4 files changed, 21 insertions, 18 deletions

diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index f971c5ebaad5..17701b37d46e 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sortopt.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
+ *  last change: $Author: os $ $Date: 2000-12-15 14:43:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,7 +93,7 @@ struct SwSortOptions
     SwSortOptions(const SwSortOptions& rOpt);
 
     BOOL            bTable;
-    char            nDeli;
+    sal_Unicode     cDeli;
     SwSortDirection eDirection;
     SwSortKeys      aKeys;
 };
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index f0414cc11b6a..05904a876029 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docsort.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ *  last change: $Author: os $ $Date: 2000-12-15 14:46:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -291,7 +291,7 @@ String SwSortTxtElement::GetKey(USHORT nId) const
     // fuer TextNodes
     const String& rStr = pTxtNd->GetTxt();
 
-    sal_Unicode nDeli = pOptions->nDeli;
+    sal_Unicode nDeli = pOptions->cDeli;
     USHORT nDCount = pOptions->aKeys[nId]->nColumnId, i = 1;
     xub_StrLen nStart = 0;
 
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 25b34bf95418..20ab978905c5 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sortopt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:16 $
+ *  last change: $Author: os $ $Date: 2000-12-15 14:46:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,7 +107,7 @@ SwSortKey::SwSortKey(const SwSortKey& rOld) :
 
 SwSortOptions::SwSortOptions() :
     eDirection(SRT_ROWS),
-    nDeli(9),
+    cDeli(9),
     bTable(FALSE)
 {
 }
@@ -115,7 +115,7 @@ SwSortOptions::SwSortOptions() :
 
 SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
     eDirection(rOpt.eDirection),
-    nDeli(rOpt.nDeli),
+    cDeli(rOpt.cDeli),
     bTable(rOpt.bTable)
 {
     for(USHORT i=0; i < rOpt.aKeys.Count(); ++i)
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index fdfdeee7b030..1a949551beb0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: srtdlg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-30 11:47:50 $
+ *  last change: $Author: os $ $Date: 2000-12-15 14:46:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,7 +110,7 @@ static BOOL   bAsc1  = TRUE;
 static BOOL   bAsc2  = TRUE;
 static BOOL   bAsc3  = TRUE;
 static BOOL   bCol   = FALSE;
-static char   nDeli  = '\t';
+static sal_Unicode    cDeli  = '\t';
 
 
 
@@ -236,11 +236,11 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
     aSortDn2RB.Check(!bAsc2);
     aSortUp3RB.Check(bAsc3);
     aSortDn3RB.Check(!bAsc3);
-    aDelimTabRB.Check(nDeli == '\t');
+    aDelimTabRB.Check(cDeli == '\t');
 
     if(!aDelimTabRB.IsChecked())
     {
-        aDelimEdt.SetText(nDeli);
+        aDelimEdt.SetText(cDeli);
         aDelimFreeRB.Check(TRUE);
         DelimHdl(&aDelimFreeRB);
     }
@@ -301,14 +301,14 @@ void SwSortDlg::Apply()
     }
     aOptions.eDirection =  aRowRB.IsChecked() ?
                         SRT_ROWS    : SRT_COLUMNS;
-    sal_Unicode nDeli = '\t';
+    sal_Unicode cDeli = '\t';
     if(!aDelimTabRB.IsChecked())
     {
         String aTmp(aDelimEdt.GetText());
         if( aTmp.Len() )
-            nDeli = aTmp.GetChar( 0 );
+            cDeli = aTmp.GetChar( 0 );
     }
-    aOptions.nDeli      =  nDeli;
+    aOptions.cDeli      =  cDeli;
     aOptions.bTable     =  rSh.IsTableMode();
 
     BOOL bRet;
@@ -379,6 +379,9 @@ IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/11/30 11:47:50  jp
+    Bug #80930#: handle the return value correct
+
     Revision 1.1.1.1  2000/09/18 17:14:45  hr
     initial import