Revert "Fix fdo#55142 - wrong character pos calculation on mac."

Caused fdo#55350, better fix in the next commit.

This reverts commit f1651ee579bf38a49b839dbcb28ac38c0163a3d2.

2 files changed, 2 insertions, 28 deletions

diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index a57068db0efc..5c0bff7a6243 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 eeb7aa43f2b3..19fe1f48b9f7 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