[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Andras Timar]

 sc/source/filter/lotus/lotform.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 474336de5964333e01d5cee36f96468ff4e46d29
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Nov 30 22:17:10 2014 +0100

    amended solution to @TERM and @CTERM import from Lotus 1-2-3
    
    Change-Id: If23e0d80585911ea75c2a24f1e59e71f1edb4774
    (cherry picked from commit 317b5bc5f801135b027e02d5acfc407cc2d05689)

diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 7c6fc45..f0de971 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -417,7 +417,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
 
         eType = ( pIndexToType )( nOc );
         eOc = ( pIndexToToken)( nOc );
-        if( eOc == ocNoName || eOc == ocZZR )
+        if( eOc == ocNoName )
             pExtName = GetAddInName( nOc );
 
         switch( eType )
@@ -1030,8 +1030,8 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
         ocNoName,           //  114 Call()
         ocIndirect,         //  115 @@()
         ocZins,             //  116 Rate()
-        ocZZR,              //  117 Term()
-        ocZZR,              //  118 Cterm()
+        ocNoName,           //  117 Term()
+        ocNoName,           //  118 Cterm()
         ocLIA,              //  119 Sln()
         ocDIA,              //  120 Syd(), Soy()
         ocGDA,              //  121 Ddb()
@@ -1559,8 +1559,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocNoName,           //  114 Call()
         ocIndirect,         //  115 @@()
         ocZins,             //  116 Rate()
-        ocZZR,              //  117 Term()
-        ocZZR,              //  118 Cterm()
+        ocNoName,           //  117 Term()
+        ocNoName,           //  118 Cterm()
         ocLIA,              //  119 Sln()
         ocDIA,              //  120 Syd(), Soy()
         ocGDA,              //  121 Ddb()
@@ -2038,6 +2038,10 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
             eId=ocNormDist;
     else if (rTest == "CRITBINOMIAL")
             eId=ocKritBinom;
+    else if (rTest == "TERM")
+            eId=ocZZR;
+    else if (rTest == "CTERM")
+            eId=ocZZR;
     return eId;
 }