[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - 2 commits - librelogo/source sc/source

[Takeshi Abe]

 librelogo/source/LibreLogo/LibreLogo.py |    4 ++--
 sc/source/core/tool/compiler.cxx        |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3881ea57892b78dcbc52d46a22616ac72bd4c335
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sun Jul 17 00:03:34 2016 +0900

    Resolves: tdf#100941 LibreLogo: replace literal '\n' with newline
    
    by simple SearchAlgorithms2's ABSOLUTE(=1), rather than using
    SearchAlgorithms' REGEXP(=1).
    BTW avoid RowDirection because it is for Calc only.
    
    Change-Id: I50ab460110ed43befb3e378e94f4fda0f2777f4d
    Reviewed-on: https://gerrit.libreoffice.org/27250
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit b1a6d157683b8182089ed5854179c8da8c416304)
    Reviewed-on: https://gerrit.libreoffice.org/27282

diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index 0f21c36..b7077e10 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -392,9 +392,9 @@ def __translate__(arg = None):
         pagebreak = False
         selection.setString(text)
     # convert to paragraphs
-    __dispatcher__(".uno:ExecuteSearch", (__getprop__("SearchItem.SearchString", r"\n"), __getprop__("SearchItem.ReplaceString", r"\n"), \
+    __dispatcher__(".uno:ExecuteSearch", (__getprop__("SearchItem.SearchString", r"\n"), __getprop__("SearchItem.ReplaceString", "\n"), \
         __getprop__("Quiet", True), __getprop__("SearchItem.Command", 3), __getprop__("SearchItem.StyleFamily", 2), \
-        __getprop__("SearchItem.AlgorithmType", 1), __getprop__("SearchItem.RowDirection", 1), __getprop__("SearchItem.SearchFlags", 65536)))
+        __getprop__("SearchItem.AlgorithmType2", 1), __getprop__("SearchItem.SearchFlags", 0)))
     # set 2-page layout
     if pagebreak:
         selection.getStart().BreakType = 4
commit b1ba2092631c4f05e14a0280978e96f4494a78d3
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jul 14 18:30:43 2016 +0200

    forward compatibility for several _xlfn.ORG.OPENOFFICE.* functions in OOXML
    
    as they will be written by LibreOffice 5.3
    
    ERRORTYPE, MULTIRANGE, GOALSEEK, EASTERSUNDAY, CURRENT and STYLE.
    
    Change-Id: Ifad317ccb2ae6dd0e53cadf2ad298490c14f1010
    Reviewed-on: https://gerrit.libreoffice.org/27225
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index adff3f4..5f827b9 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2750,7 +2750,14 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
             OpCode          eOp;
         };
         static const FunctionName aOoxmlAliases[] = {
-            { "EFFECTIVE",  ocEffective }   // EFFECTIVE -> EFFECT
+            { "EFFECTIVE",                          ocEffective },      // EFFECTIVE -> EFFECT
+            // LibreOffice 5.3 will correctly write this, be able to read it.
+            { "_xlfn.ORG.OPENOFFICE.ERRORTYPE",     ocErrorType },      // _xlfn.ORG.OPENOFFICE.ERRORTYPE -> ERRORTYPE
+            { "_xlfn.ORG.OPENOFFICE.MULTIRANGE",    ocMultiArea },      // _xlfn.ORG.OPENOFFICE.MULTIRANGE -> MULTIRANGE
+            { "_xlfn.ORG.OPENOFFICE.GOALSEEK",      ocBackSolver },     // _xlfn.ORG.OPENOFFICE.GOALSEEK -> GOALSEEK
+            { "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY",  ocEasterSunday },   // _xlfn.ORG.OPENOFFICE.EASTERSUNDAY -> EASTERSUNDAY
+            { "_xlfn.ORG.OPENOFFICE.CURRENT",       ocCurrent },        // _xlfn.ORG.OPENOFFICE.CURRENT -> CURRENT
+            { "_xlfn.ORG.OPENOFFICE.STYLE",         ocStyle }           // _xlfn.ORG.OPENOFFICE.STYLE -> STYLE
         };
         for (const FunctionName& rOoxmlAlias : aOoxmlAliases)
         {