[Libreoffice-commits] .: 2 commits - vcl/aqua vcl/inc

[Libreoffice Gerrit user]

 vcl/aqua/source/gdi/atsui/salatslayout.cxx |    2 +-
 vcl/aqua/source/gdi/atsui/salgdi.cxx       |   29 ++---------------------------
 vcl/inc/aqua/atsui/salgdi.h                |    1 -
 3 files changed, 3 insertions(+), 29 deletions(-)

New commits:
commit da9a26f5f49ea56422bb791d4f96725283d3e8c6
Author: Sergey Farbotka <z8sergey8z at gmail.com>
Date:   Tue Oct 2 17:36:09 2012 +0200

    Fix fdo#55142 - use proper output offsets.
    
    Change-Id: I76e6158f1ac64b9dd555cf8aee3ce8bdd5d035c5

diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 4145dbf..5d9ad09 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -437,7 +437,7 @@ void ATSLayout::DrawText( SalGraphics& rGraphics ) const
         {
             const SubPortion& rSubPortion = *it;
             // calculate sub-portion offset for rotated text
-            Fixed nXOfsFixed = 0, nYOfsFixed = 0;
+            Fixed nXOfsFixed = rSubPortion.mnXOffset, nYOfsFixed = 0;
             if( rAquaGraphics.mnATSUIRotation != 0 )
             {
                 const double fRadians = rAquaGraphics.mnATSUIRotation * (M_PI/0xB40000);
commit d6418f680b8861dfea1ce1be6e9358b23cfb3064
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Oct 2 17:31:56 2012 +0200

    Revert "Fix fdo#55142 - wrong character pos calculation on mac."
    
    Caused fdo#55350, better fix in the next commit.
    
    This reverts commit f1651ee579bf38a49b839dbcb28ac38c0163a3d2.

diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index a57068d..5c0bff7 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -354,8 +354,6 @@ AquaSalGraphics::AquaSalGraphics()
 {
     // create the style object for font attributes
     ATSUCreateStyle( &maATSUStyle );
-
-    ResetFontStyle();
 }
 
 // -----------------------------------------------------------------------
@@ -581,29 +579,6 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::ResetFontStyle()
-{
-    ATSUClearStyle(maATSUStyle);
-
-    // Set justification attributes
-    ATSJustPriorityWidthDeltaOverrides nPriorityJustOverrides;
-    memset(nPriorityJustOverrides, 0, sizeof(nPriorityJustOverrides));
-
-    nPriorityJustOverrides[kJUSTLetterPriority].growFlags = kJUSTOverrideLimits;
-    nPriorityJustOverrides[kJUSTLetterPriority].shrinkFlags = kJUSTOverrideLimits;
-
-    ATSUAttributeTag        theTag = kATSUPriorityJustOverrideTag;
-    ByteCount               theSize = sizeof(ATSJustPriorityWidthDeltaOverrides);
-    ATSUAttributeValuePtr   thePtr = &nPriorityJustOverrides;
-    OSStatus eStatus = ATSUSetAttributes(maATSUStyle, 1, &theTag, &theSize, &thePtr);
-    if (eStatus != noErr)
-    {
-        DBG_WARNING("AquaSalGraphics::ResetFontStyle() : Could not override justification attributes!\n");
-    }
-}
-
-// -----------------------------------------------------------------------
-
 // callbacks from ATSUGlyphGetCubicPaths() fore GetGlyphOutline()
 struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; };
 
@@ -723,7 +698,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac
 {
     if( !pReqFont )
     {
-        ResetFontStyle();
+        ATSUClearStyle( maATSUStyle );
         mpMacFontData = NULL;
         return 0;
     }
@@ -809,7 +784,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac
     if( eStatus != noErr )
     {
         DBG_WARNING( "AquaSalGraphics::SetFont() : Could not set font attributes!\n");
-        ResetFontStyle();
+        ATSUClearStyle( maATSUStyle );
         mpMacFontData = NULL;
         return 0;
     }
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index eeb7aa4..19fe1f4 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -353,7 +353,6 @@ private:
     bool GetRawFontData( const PhysicalFontFace* pFontData,
                          std::vector<unsigned char>& rBuffer,
                          bool* pJustCFF );
-    void ResetFontStyle();
 };
 
 // --- some trivial inlines