[Libreoffice-commits] core.git: formula/source

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 7994b77819a5de7a6da46ab01386883559e7a7d1
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jan 7 19:24:08 2016 +0100

    tdf#96198 postpone conversion from WEEKNUM to ISOWEEKNUM, tdf#50950 follow-up
    
    Have two releases be able to read ISOWEEKNUM first.
    
    Change-Id: I7ea8141043d18076a65396374dec40a806c8ab6a

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 526f83f..cf44e92 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1290,6 +1290,12 @@ void FormulaCompiler::Factor()
                 pFacToken->SetByte( nSepCount );
                 if (nSepCount == 2)
                 {
+                    /* XXX TODO FIXME: activate this conversion to ISOWEEKNUM
+                     * when at least two releases can actually handle the real
+                     * ISOWEEKNUM with one parameter, i.e. for 5.3 or 5.2 if
+                     * 5.0.5 is patched. Until then unconditionally use the
+                     * WEEKNUM_OOO compatibility function. */
+#if 0
                     // An old mode!=1 indicates ISO week, remove argument if
                     // literal double value and keep function. Anything else
                     // can not be resolved, there exists no "like ISO but week
@@ -1312,6 +1318,11 @@ void FormulaCompiler::Factor()
                         // compatibility function.
                         pFacToken->NewOpCode( ocWeeknumOOo, FormulaToken::PrivateAccess());
                     }
+#else
+                    (void) nSepPos;
+                    // Use compatibility function.
+                    pFacToken->NewOpCode( ocWeeknumOOo, FormulaToken::PrivateAccess());
+#endif
                 }
                 PutCode( pFacToken );
             }