using SvxTextEncodingBox

2 files changed, 29 insertions, 14 deletions

diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 07f3ce90df7e..b5b27cd3c7fc 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: asciiopt.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:57 $
+ *  last change: $Author: er $ $Date: 2000-12-20 12:08:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,6 +96,9 @@
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
+#ifndef _SVX_TXENCBOX_HXX
+#include <svx/txencbox.hxx>
+#endif
 
 #ifndef _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGS
@@ -128,6 +131,7 @@ private:
     BOOL        bMergeFieldSeps;
     sal_Unicode cTextSep;
     CharSet     eCharSet;
+    BOOL        bCharSetSystem;
     long        nStartRow;
     USHORT      nInfoCount;
     xub_StrLen* pColStart;
@@ -148,6 +152,7 @@ public:
     void            InterpretColumnList( const String& rString );
 
     CharSet             GetCharSet() const      { return eCharSet; }
+    BOOL                GetCharSetSystem() const    { return bCharSetSystem; }
     const String&       GetFieldSeps() const    { return aFieldSeps; }
     BOOL                IsMergeSeps() const     { return bMergeFieldSeps; }
     sal_Unicode         GetTextSep() const      { return cTextSep; }
@@ -158,6 +163,7 @@ public:
     long                GetStartRow() const     { return nStartRow; }
 
     void    SetCharSet( CharSet eNew )          { eCharSet = eNew; }
+    void    SetCharSetSystem( BOOL bSet )       { bCharSetSystem = bSet; }
     void    SetFixedLen( BOOL bSet )            { bFixedLen = bSet; }
     void    SetFieldSeps( const String& rStr )  { aFieldSeps = rStr; }
     void    SetMergeSeps( BOOL bSet )           { bMergeFieldSeps = bSet; }
@@ -178,12 +184,13 @@ class ScImportAsciiDlg : public ModalDialog
 
     BOOL            bVFlag;
 
+    FixedText       aFtCharSet;
+    SvxTextEncodingBox aLbCharSet;
+    BOOL            bCharSetSystem;
+
     FixedText       aFtRow;
     NumericField    aNfRow;
 
-    FixedText       aFtCharSet;
-    ListBox         aLbCharSet;
-
     RadioButton     aRbFixed;
     RadioButton     aRbSeparated;
 
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index e355940de04b..06aa3cb14c5d 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: imoptdlg.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:59 $
+ *  last change: $Author: er $ $Date: 2000-12-20 12:08:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,9 @@
 #include <vcl/group.hxx>
 #endif
 
+#ifndef _SVX_TXENCBOX_HXX
+#include <svx/txencbox.hxx>
+#endif
 
 #ifndef SC_SCGLOB_HXX
 #include "global.hxx"
@@ -102,19 +105,20 @@ public:
                 ScImportOptionsDlg( Window*                 pParent,
                                     BOOL                    bAsciiImport = TRUE,
                                     const ScImportOptions*  pOptions = NULL,
-                                    const String*           pStrTitle = NULL );
+                                    const String*           pStrTitle = NULL,
+                                    BOOL                    bMultiByte = FALSE );
 
                 ~ScImportOptionsDlg();
 
     void GetImportOptions( ScImportOptions& rOptions ) const;
 
 private:
+    FixedText           aFtFont;
+    SvxTextEncodingBox  aLbFont;
     FixedText           aFtFieldSep;
     ComboBox            aEdFieldSep;
     FixedText           aFtTextSep;
     ComboBox            aEdTextSep;
-    FixedText           aFtFont;
-    ListBox             aLbFont;
     GroupBox            aGbFieldOpt;
     OKButton            aBtnOk;
     CancelButton        aBtnCancel;
@@ -122,7 +126,6 @@ private:
 
     ScDelimiterTable*   pFieldSepTab;
     ScDelimiterTable*   pTextSepTab;
-    String              aCharKeyList;
 
 private:
     USHORT GetCodeFromCombo( const ComboBox& rEd ) const;
@@ -139,8 +142,12 @@ public:
         ScImportOptions( const String& rStr );
 
         ScImportOptions( USHORT nFieldSep, USHORT nTextSep, const String& rStr )
-            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr),eCharSet(RTL_TEXTENCODING_DONTKNOW)
-        { eCharSet = GetCharsetValue(aStrFont); }
+            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr)
+        { eCharSet = ScGlobal::GetCharsetValue(aStrFont); }
+
+        ScImportOptions( USHORT nFieldSep, USHORT nTextSep, rtl_TextEncoding nEnc )
+            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep)
+        { SetTextEncoding( nEnc ); }
 
         ScImportOptions( const ScImportOptions& rCpy )
             : nFieldSepCode (rCpy.nFieldSepCode),
@@ -167,7 +174,8 @@ public:
                                 && aStrFont      == rCmp.aStrFont;
                         }
     String  BuildString() const;
-    String  BuildParaString( const String& rTyp, const String& rDsn ) const;
+
+    void    SetTextEncoding( rtl_TextEncoding nEnc );
 
     USHORT  nFieldSepCode;
     USHORT  nTextSepCode;