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

[Czeber László Ádám (via logerrit)]

 sc/source/core/data/conditio.cxx |    2 ++
 vcl/quartz/salgdi.cxx            |    6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit a47221ba0debb637f16e7b70c1d59e5cf6b3cfd6
Author:     Czeber László Ádám <czeber.laszloa...@nisz.hu>
AuthorDate: Fri May 26 10:14:11 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 31 08:56:36 2023 +0200

    tdf#152037 XLSX import: fix false alarm data validation error
    
    Fix validation error on valid input by adding missing
    SimplifyCompiledFormula() to the implementation of
    setFormula1() and setFormula2() of XSheetCondition UNO API,
    which used by the XLSX input filter.
    
    Change-Id: I8389227eb5a609c29e8d466cf62420bae36f7927
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152295
    Tested-by: László Németh <nem...@numbertext.org>
    Reviewed-by: László Németh <nem...@numbertext.org>
    (cherry picked from commit b14118feb4da3b68caea3e9e60b4eb0f2f83593b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152328
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 8da18a4a0471..54f89dd3a7b3 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -474,6 +474,7 @@ void ScConditionEntry::SetFormula1( const ScTokenArray& 
rArray )
     if( rArray.GetLen() > 0 )
     {
         pFormula1.reset( new ScTokenArray( rArray ) );
+        SimplifyCompiledFormula(pFormula1, nVal1, bIsStr1, aStrVal1);
         bRelRef1 = lcl_HasRelRef( mpDoc, pFormula1.get() );
     }
 
@@ -486,6 +487,7 @@ void ScConditionEntry::SetFormula2( const ScTokenArray& 
rArray )
     if( rArray.GetLen() > 0 )
     {
         pFormula2.reset( new ScTokenArray( rArray ) );
+        SimplifyCompiledFormula(pFormula2, nVal2, bIsStr2, aStrVal2);
         bRelRef2 = lcl_HasRelRef( mpDoc, pFormula2.get() );
     }
 
commit b203a86f9249c217bf3a218da96d606573419a85
Author:     Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Mon May 29 11:01:56 2023 +0300
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 31 08:56:26 2023 +0200

    tdf#149297: Fix Y position of vertical glyphs on macOS
    
    Remove the Y position offset that became redundant and now double shifts
    the glyphs after:
    
    commit dd0d0b44fd1c6c0292d7b2eb3f5cf2baa21e4481
    Author: Mark Hung <mark...@gmail.com>
    Date:   Sun May 2 15:12:46 2021 +0800
    
        vcl: adjust LayoutText() for vertical writing.
    
    Change-Id: Iac7abfa69acfe75860d05800f446c25ed622bb95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152366
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@libreoffice.org>
    (cherry picked from commit ab1985d0b39e8bcc976543b9700e04610f434423)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152324
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 0793c15dd4ab..522ccb2b3add 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -346,16 +346,10 @@ void AquaGraphicsBackend::drawTextLayout(const 
GenericSalLayout& rLayout, bool b
         if (rFont.mfFontRotation)
         {
             if (pGlyph->IsVertical())
-            {
                 bUprightGlyph = true;
-                // Adjust the position of upright (vertical) glyphs.
-                aGCPos.y -= CTFontGetAscent(pCTFont) - 
CTFontGetDescent(pCTFont);
-            }
             else
-            {
                 // Transform the position of rotated glyphs.
                 aGCPos = CGPointApplyAffineTransform(aGCPos, aRotMatrix);
-            }
         }
 
         aGlyphIds.push_back(pGlyph->glyphId());