[Libreoffice-commits] .: Branch 'integration/dev300_m98' - vcl/aqua

[Norbert Thiebaud]

 vcl/aqua/source/app/salinst.cxx        |   14 ++++++++++++++
 vcl/aqua/source/gdi/salatslayout.cxx   |   17 -----------------
 vcl/aqua/source/window/salframeview.mm |    2 +-
 3 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit fc3b674809b64fb46cf35302a4879578e4183d17
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 28 20:40:17 2011 -0600

    fix mis-merge in vcl for MacOS

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 1894e54..dcbf7b7 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -566,6 +566,20 @@ void AquaSalInstance::AcquireYieldMutex( ULONG nCount )
     }
 }
 
+bool AquaSalInstance::CheckYieldMutex()
+{
+    bool bRet = true;
+
+    SalYieldMutex* pYieldMutex = mpSalYieldMutex;
+    if ( pYieldMutex->GetThreadId() !=
+         osl::Thread::getCurrentIdentifier() )
+    {
+        bRet = false;
+    }
+
+    return bRet;
+}
+
 // -----------------------------------------------------------------------
 
 bool AquaSalInstance::isNSAppThread() const
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 27763e2..d6abb0c 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -1089,23 +1089,6 @@ void ATSLayout::InvalidateMeasurements()
     DELETEAZ( mpDeltaY );
 }
 
-// -----------------------------------------------------------------------
-
-#define DELETEAZ( X ) { delete[] X; X = NULL; }
-
-void ATSLayout::InvalidateMeasurements()
-{
-    mnGlyphCount = -1;
-    DELETEAZ( mpGlyphIds );
-    DELETEAZ( mpCharWidths );
-    DELETEAZ( mpChars2Glyphs );
-    DELETEAZ( mpGlyphs2Chars );
-    DELETEAZ( mpGlyphRTLFlags );
-    DELETEAZ( mpGlyphAdvances );
-    DELETEAZ( mpGlyphOrigAdvs );
-    DELETEAZ( mpDeltaY );
-}
-
 // =======================================================================
 
 // glyph fallback is supported directly by Aqua
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index c0d0b35..992ab99 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -169,7 +169,7 @@ static AquaSalFrame* getMouseContainerFrame()
 {
     if( GetSalData() && GetSalData()->mpFirstInstance )
     {
-        vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
+        osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
         if( pMutex )
         {
             pMutex->acquire();