[Libreoffice-commits] .: oox/inc oox/source

[Ivan Timofeev]

 oox/inc/oox/xls/unitconverter.hxx |    1 -
 oox/source/xls/formulabase.cxx    |    3 ---
 oox/source/xls/unitconverter.cxx  |    1 -
 3 files changed, 5 deletions(-)

New commits:
commit c2ad01cc22d79aeed31d97220430d9a9fd4fd2b1
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Mon Feb 13 20:12:57 2012 +0400

    remove unused fields

diff --git a/oox/inc/oox/xls/unitconverter.hxx b/oox/inc/oox/xls/unitconverter.hxx
index a6ae756..e3cd263 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/oox/inc/oox/xls/unitconverter.hxx
@@ -110,7 +110,6 @@ private:
 
     DoubleVector        maCoeffs;           /// Coefficients for unit conversion.
     OoxErrorCodeMap     maOoxErrCodes;      /// Maps error code strings to BIFF error constants.
-    BiffErrorCodeMap    maBiffErrCodes;     /// Maps BIFF error constants to error code strings.
     sal_Int32           mnNullDate;         /// Nulldate of this workbook (number of days since 0000-01-01).
 };
 
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 0b10950..98925d7 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -833,7 +833,6 @@ struct FunctionProviderImpl
     typedef RefMap< sal_uInt16, FunctionInfo >  FuncIdMap;
 
     FunctionInfoVector  maFuncs;            /// All function infos in one list.
-    FuncNameMap         maOdfFuncs;         /// Maps ODF function names to function data.
     FuncNameMap         maOoxFuncs;         /// Maps OOXML function names to function data.
     FuncIdMap           maBiff12Funcs;      /// Maps BIFF12 function indexes to function data.
     FuncIdMap           maBiffFuncs;        /// Maps BIFF2-BIFF8 function indexes to function data.
@@ -931,8 +930,6 @@ void FunctionProviderImpl::initFunc( const FunctionData& rFuncData, sal_uInt8 nM
 
     // insert the function info into the member maps
     maFuncs.push_back( xFuncInfo );
-    if( !xFuncInfo->maOdfFuncName.isEmpty() )
-        maOdfFuncs[ xFuncInfo->maOdfFuncName ] = xFuncInfo;
     if( !xFuncInfo->maOoxFuncName.isEmpty() )
         maOoxFuncs[ xFuncInfo->maOoxFuncName ] = xFuncInfo;
     if( xFuncInfo->mnBiff12FuncId != NOID )
diff --git a/oox/source/xls/unitconverter.cxx b/oox/source/xls/unitconverter.cxx
index 2438023..636fb72 100644
--- a/oox/source/xls/unitconverter.cxx
+++ b/oox/source/xls/unitconverter.cxx
@@ -239,7 +239,6 @@ sal_uInt8 UnitConverter::calcBiffErrorCode( const OUString& rErrorCode ) const
 void UnitConverter::addErrorCode( sal_uInt8 nErrorCode, const OUString& rErrorCode )
 {
     maOoxErrCodes[ rErrorCode ]  = nErrorCode;
-    maBiffErrCodes[ nErrorCode ] = rErrorCode;
 }
 
 double UnitConverter::getCoefficient( Unit eUnit ) const