[Libreoffice-commits] core.git: vcl/osx

[Stephan Bergmann]

 vcl/osx/salmenu.cxx |    2 +-
 vcl/osx/vclnsapp.mm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 66d40a1fcc554e528f89e1732c26ff587cfd4bd1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 13 18:41:45 2014 +0200

    loplugin:staticcall
    
    Change-Id: Id5c17212031b6710f38413c833c0df2b33f42475

diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 59b7651..4f3920e 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -365,7 +365,7 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR
     // do the same strange semantics as vcl popup windows to arrive at a frame geometry
     // in mirrored UI case; best done by actually executing the same code
     sal_uInt16 nArrangeIndex;
-    pWin->SetPosPixel( pWin->ImplCalcPos( pWin, rRect, nFlags, nArrangeIndex ) );
+    pWin->SetPosPixel( FloatingWindow::ImplCalcPos( pWin, rRect, nFlags, nArrangeIndex ) );
     displayPopupFrame.origin.x = pWin->ImplGetFrame()->maGeometry.nX - pParentAquaSalFrame->maGeometry.nX + offset;
     displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset;
     pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 531125a..ea544f7 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -79,7 +79,7 @@
 {
     NSEventType eType = [pEvent type];
     if( eType == NSApplicationDefined )
-        GetSalData()->mpFirstInstance->handleAppDefinedEvent( pEvent );
+        AquaSalInstance::handleAppDefinedEvent( pEvent );
     else if( eType == NSKeyDown && ([pEvent modifierFlags] & NSCommandKeyMask) != 0 )
     {
         NSWindow* pKeyWin = [NSApp keyWindow];