callcatcher: recently unused code

11 files changed, 1 insertions, 524 deletions

diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx
index 96da4cad6..c952081b1 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -545,33 +545,6 @@ void global_InitAppOptions();
 //------------------------------------------------------------------------
 
 // static
-/*N*/ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
-/*N*/ {
-/*N*/   // new TextEncoding values
-/*N*/   if ( CharClass::isAsciiNumeric( rCharSet ) )
-/*N*/   {
-/*?*/       sal_Int32 nVal = rCharSet.ToInt32();
-/*?*/       if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
-/*?*/           return osl_getThreadTextEncoding();
-/*?*/       return (CharSet) nVal;
-/*N*/   }
-/*N*/   // old CharSet values for compatibility
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("ANSI")     ) return RTL_TEXTENCODING_MS_1252;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("MAC")      ) return RTL_TEXTENCODING_APPLE_ROMAN;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC")    ) return RTL_TEXTENCODING_IBM_850;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return RTL_TEXTENCODING_IBM_437;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return RTL_TEXTENCODING_IBM_850;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return RTL_TEXTENCODING_IBM_860;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
-/*N*/   else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
-/*N*/ //    else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return osl_getThreadTextEncoding();
-/*N*/   else return osl_getThreadTextEncoding();
-/*N*/ }
-
-//------------------------------------------------------------------------
-
-// static
 /*N*/ String ScGlobal::GetCharsetString( CharSet eVal )
 /*N*/ {
 /*N*/   const sal_Char* pChar;
diff --git a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc b/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
deleted file mode 100644
index e734e1c9c..000000000
--- a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-#include "bf_sc.hrc"
-//#define RID_SCDLG_ASCII 256
-#define RB_SEPARATED 1
-#define RB_FIXED 2
-#define FT_CHARSET 3
-#define LB_CHARSET 4
-#define FL_SEPOPT 5
-#define FT_FIELDSEP 6
-#define CB_FIELDSEP 7
-#define FT_TEXTSEP 8
-#define CB_TEXTSEP 9
-#define FL_FIELDOPT 10
-#define FT_TYPE 12
-#define FT_PREVIEW 13
-#define LB_TYPE1 23
-#define FL_WIDTH 30
-#define BTN_OK 31
-#define BTN_CANCEL 32
-#define BTN_HELP 33
-#define CTR_TABLEBOX 41
-#define CKB_TAB 51
-#define CKB_SPACE 52
-#define CKB_SEMICOLON 53
-#define CKB_COMMA 54
-#define CKB_OTHER 55
-#define ED_OTHER 56
-#define FT_AT_ROW 59
-#define NF_AT_ROW 60
-#define CB_ASONCE 90
diff --git a/binfilter/bf_sc/source/ui/dbgui/makefile.mk b/binfilter/bf_sc/source/ui/dbgui/makefile.mk
index 687e7e1b2..906da3dd1 100644
--- a/binfilter/bf_sc/source/ui/dbgui/makefile.mk
+++ b/binfilter/bf_sc/source/ui/dbgui/makefile.mk
@@ -43,13 +43,11 @@ INC+= -I$(PRJ)$/inc$/bf_sc
 
 SLOFILES =	\
     $(SLO)$/sc_imoptdlg.obj	\
-    $(SLO)$/sc_asciiopt.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  \
         sc_pivot.src		\
         sc_imoptdlg.src    \
-        sc_asciiopt.src    \
         sc_outline.src
 
 # --- Tagets -------------------------------------------------------
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
deleted file mode 100644
index 9ae3b96f0..000000000
--- a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include "asciiopt.hxx"
-#include "asciiopt.hrc"
-
-#include <rtl/tencinfo.h>
-namespace binfilter {
-
-
-// ============================================================================
-
-//! TODO make dynamic
-#ifdef WIN
-const sal_Int32 ASCIIDLG_MAXROWS                = 10000;
-#else
-const sal_Int32 ASCIIDLG_MAXROWS                = 32000;
-#endif
-
-static const sal_Char pStrFix[] = "FIX";
-static const sal_Char pStrMrg[] = "MRG";
-
-
-// ============================================================================
-
-/*N*/ ScAsciiOptions::ScAsciiOptions() :
-/*N*/   bFixedLen       ( FALSE ),
-/*N*/   aFieldSeps      ( ';' ),
-/*N*/   bMergeFieldSeps ( FALSE ),
-/*N*/   cTextSep        ( 34 ),
-/*N*/   eCharSet        ( osl_getThreadTextEncoding() ),
-/*N*/   bCharSetSystem  ( FALSE ),
-/*N*/   nStartRow       ( 1 ),
-/*N*/   nInfoCount      ( 0 ),
-/*N*/     pColStart       ( NULL ),
-/*N*/   pColFormat      ( NULL )
-/*N*/ {
-/*N*/ }
-
-
-/*N*/ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
-/*N*/   bFixedLen       ( rOpt.bFixedLen ),
-/*N*/   aFieldSeps      ( rOpt.aFieldSeps ),
-/*N*/   bMergeFieldSeps ( rOpt.bMergeFieldSeps ),
-/*N*/   cTextSep        ( rOpt.cTextSep ),
-/*N*/   eCharSet        ( rOpt.eCharSet ),
-/*N*/   bCharSetSystem  ( rOpt.bCharSetSystem ),
-/*N*/   nStartRow       ( rOpt.nStartRow ),
-/*N*/   nInfoCount      ( rOpt.nInfoCount )
-/*N*/ {
-/*N*/   if (nInfoCount)
-/*N*/   {
-/*N*/       pColStart = new xub_StrLen[nInfoCount];
-/*N*/       pColFormat = new BYTE[nInfoCount];
-/*N*/       for (USHORT i=0; i<nInfoCount; i++)
-/*N*/       {
-/*N*/           pColStart[i] = rOpt.pColStart[i];
-/*N*/           pColFormat[i] = rOpt.pColFormat[i];
-/*N*/       }
-/*N*/   }
-/*N*/   else
-/*N*/   {
-/*N*/       pColStart = NULL;
-/*N*/       pColFormat = NULL;
-/*N*/   }
-/*N*/ }
-
-
-/*N*/ ScAsciiOptions::~ScAsciiOptions()
-/*N*/ {
-/*N*/   delete[] pColStart;
-/*N*/   delete[] pColFormat;
-/*N*/ }
-
-
-
-
-
-
-
-
-
-//
-//  Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-//  darum ab Version 336 Komma stattdessen
-//
-
-
-/*N*/ void ScAsciiOptions::ReadFromString( const String& rString )
-/*N*/ {
-/*N*/   xub_StrLen nCount = rString.GetTokenCount(',');
-/*N*/   String aToken;
-/*N*/   xub_StrLen nSub;
-/*N*/   xub_StrLen i;
-/*N*/
-/*N*/       //
-/*N*/       //  Feld-Trenner
-/*N*/       //
-/*N*/
-/*N*/   if ( nCount >= 1 )
-/*N*/   {
-/*N*/       bFixedLen = bMergeFieldSeps = FALSE;
-/*N*/       aFieldSeps.Erase();
-/*N*/
-/*N*/       aToken = rString.GetToken(0,',');
-/*N*/       if ( aToken.EqualsAscii(pStrFix) )
-/*N*/           bFixedLen = TRUE;
-/*N*/       nSub = aToken.GetTokenCount('/');
-/*N*/       for ( i=0; i<nSub; i++ )
-/*N*/       {
-/*N*/           String aCode = aToken.GetToken( i, '/' );
-/*N*/           if ( aCode.EqualsAscii(pStrMrg) )
-/*N*/               bMergeFieldSeps = TRUE;
-/*N*/           else
-/*N*/           {
-/*N*/               sal_Int32 nVal = aCode.ToInt32();
-/*N*/               if ( nVal )
-/*N*/                   aFieldSeps += (sal_Unicode) nVal;
-/*N*/           }
-/*N*/       }
-/*N*/   }
-/*N*/
-/*N*/       //
-/*N*/       //  Text-Trenner
-/*N*/       //
-/*N*/
-/*N*/   if ( nCount >= 2 )
-/*N*/   {
-/*N*/       aToken = rString.GetToken(1,',');
-/*N*/       sal_Int32 nVal = aToken.ToInt32();
-/*N*/       cTextSep = (sal_Unicode) nVal;
-/*N*/   }
-/*N*/
-/*N*/       //
-/*N*/       //  Zeichensatz
-/*N*/       //
-/*N*/
-/*N*/   if ( nCount >= 3 )
-/*N*/   {
-/*N*/       aToken = rString.GetToken(2,',');
-/*N*/       eCharSet = ScGlobal::GetCharsetValue( aToken );
-/*N*/   }
-/*N*/
-/*N*/       //
-/*N*/       //  Startzeile
-/*N*/       //
-/*N*/
-/*N*/   if ( nCount >= 4 )
-/*N*/   {
-/*N*/       aToken = rString.GetToken(3,',');
-/*N*/       nStartRow = aToken.ToInt32();
-/*N*/   }
-/*N*/
-/*N*/       //
-/*N*/       //  Spalten-Infos
-/*N*/       //
-/*N*/
-/*N*/   if ( nCount >= 5 )
-/*N*/   {
-/*N*/       delete[] pColStart;
-/*N*/       delete[] pColFormat;
-/*N*/
-/*N*/       aToken = rString.GetToken(4,',');
-/*N*/       nSub = aToken.GetTokenCount('/');
-/*N*/       nInfoCount = nSub / 2;
-/*N*/       if (nInfoCount)
-/*N*/       {
-/*N*/           pColStart = new xub_StrLen[nInfoCount];
-/*N*/           pColFormat = new BYTE[nInfoCount];
-/*N*/           for (USHORT nInfo=0; nInfo<nInfoCount; nInfo++)
-/*N*/           {
-/*N*/               pColStart[nInfo]  = (xub_StrLen) aToken.GetToken( 2*nInfo, '/' ).ToInt32();
-/*N*/               pColFormat[nInfo] = (BYTE) aToken.GetToken( 2*nInfo+1, '/' ).ToInt32();
-/*N*/           }
-/*N*/       }
-/*N*/       else
-/*N*/       {
-/*N*/           pColStart = NULL;
-/*N*/           pColFormat = NULL;
-/*N*/       }
-/*N*/   }
-/*N*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src
deleted file mode 100644
index 62c486120..000000000
--- a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-#define NO_LOCALIZE_EXPORT
-
-#include "asciiopt.hrc"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 468f2bb29..5ff9c49fd 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -60,7 +60,6 @@
 #include "scerrors.hxx"
 #include "stlpool.hxx"
 #include "autostyl.hxx"
-#include "asciiopt.hxx"
 #include "docpool.hxx"      // LoadCompleted
 #include "progress.hxx"
 #include "pntlock.hxx"
@@ -77,6 +76,7 @@
 #include "ViewSettingsSequenceDefines.hxx"
 
 #include <rtl/logfile.hxx>
+#include <vcl/virdev.hxx>
 namespace binfilter {
 using namespace ::com::sun::star;
 
diff --git a/binfilter/bf_sc/source/ui/inc/asciiopt.hxx b/binfilter/bf_sc/source/ui/inc/asciiopt.hxx
deleted file mode 100644
index c3b7e4134..000000000
--- a/binfilter/bf_sc/source/ui/inc/asciiopt.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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 SC_ASCIIOPT_HXX
-#define SC_ASCIIOPT_HXX
-
-#include <bf_tools/string.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/field.hxx>
-#include <tools/stream.hxx>
-#include <bf_svx/txencbox.hxx>
-
-#include "csvtablebox.hxx"
-namespace binfilter {
-
-
-// ============================================================================
-
-class ScAsciiOptions
-{
-private:
-    BOOL        bFixedLen;
-    String      aFieldSeps;
-    BOOL        bMergeFieldSeps;
-    sal_Unicode cTextSep;
-    CharSet     eCharSet;
-    BOOL        bCharSetSystem;
-    long        nStartRow;
-    USHORT      nInfoCount;
-    xub_StrLen* pColStart;  //! TODO replace with vector
-    BYTE*       pColFormat; //! TODO replace with vector
-
-public:
-                    ScAsciiOptions();
-                    ScAsciiOptions(const ScAsciiOptions& rOpt);
-                    ~ScAsciiOptions();
-
-
-
-    void            ReadFromString( 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; }
-    BOOL                IsFixedLen() const      { return bFixedLen; }
-    USHORT              GetInfoCount() const    { return nInfoCount; }
-    const xub_StrLen*   GetColStart() const     { return pColStart; }
-    const BYTE*         GetColFormat() const    { return pColFormat; }
-    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; }
-    void    SetTextSep( sal_Unicode c )         { cTextSep = c; }
-    void    SetStartRow( long nRow)             { nStartRow= nRow; }
-
-};
-
-
-// ============================================================================
-
-
-
-// ============================================================================
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/csvgrid.hxx b/binfilter/bf_sc/source/ui/inc/csvgrid.hxx
index 7374817ef..00124dfe7 100644
--- a/binfilter/bf_sc/source/ui/inc/csvgrid.hxx
+++ b/binfilter/bf_sc/source/ui/inc/csvgrid.hxx
@@ -48,7 +48,6 @@ class ColorConfig;
 
 class EditEngine;
 class ScEditEngineDefaulter;
-class ScAsciiOptions;
 class ScAccessibleCsvControl;
 
 
diff --git a/binfilter/bf_sc/source/ui/inc/csvtablebox.hxx b/binfilter/bf_sc/source/ui/inc/csvtablebox.hxx
deleted file mode 100644
index 1d9a8199f..000000000
--- a/binfilter/bf_sc/source/ui/inc/csvtablebox.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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 _SC_CSVTABLEBOX_HXX
-#define _SC_CSVTABLEBOX_HXX
-
-#include <vcl/ctrl.hxx>
-#include <vcl/scrbar.hxx>
-
-#include "csvcontrol.hxx"
-#include "csvruler.hxx"
-#include "csvgrid.hxx"
-class ListBox;
-namespace binfilter {
-
-class ScAsciiOptions;
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
index 60e847ea1..3f6ebe230 100644
--- a/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
+++ b/binfilter/bf_sc/source/ui/inc/imoptdlg.hxx
@@ -59,10 +59,6 @@ public:
             : nFieldSepCode(0),nTextSepCode(0),eCharSet(RTL_TEXTENCODING_DONTKNOW),bFixedWidth(FALSE)
         {}
 
-        ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, const String& rStr )
-            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr),bFixedWidth(FALSE)
-        { eCharSet = ScGlobal::GetCharsetValue(aStrFont); }
-
         ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc )
             : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),bFixedWidth(FALSE)
         { SetTextEncoding( nEnc ); }
diff --git a/binfilter/inc/bf_sc/global.hxx b/binfilter/inc/bf_sc/global.hxx
index 049828856..440b84df9 100644
--- a/binfilter/inc/bf_sc/global.hxx
+++ b/binfilter/inc/bf_sc/global.hxx
@@ -617,7 +617,6 @@ public:
     static inline sal_Unicode ToUpperAlpha( sal_Unicode c )
         { return ( c >= 'a' && c <= 'z' ) ? ( c-'a'+'A' ) : c; }
 
-    static  CharSet         GetCharsetValue( const String& rCharSet );
     static  String          GetCharsetString( CharSet eVal );
 
     /// a "ReadOnly" formatter for UNO/XML export