mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:staticcall

Browse Source 
Change-Id: Id5c17212031b6710f38413c833c0df2b33f42475
This commit is contained in:
Stephan Bergmann 2014-06-13 18:41:45 +02:00
parent 448c62835b
commit 66d40a1fcc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/osx/salmenu.cxx
View File

@ -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 // 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 // in mirrored UI case; best done by actually executing the same code
sal_uInt16 nArrangeIndex; 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.x = pWin->ImplGetFrame()->maGeometry.nX - pParentAquaSalFrame->maGeometry.nX + offset;
displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset; displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset;
pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false); pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);

2
vcl/osx/vclnsapp.mm
View File

@ -79,7 +79,7 @@
{ {
NSEventType eType = [pEvent type]; NSEventType eType = [pEvent type];
if( eType == NSApplicationDefined ) if( eType == NSApplicationDefined )
GetSalData()->mpFirstInstance->handleAppDefinedEvent( pEvent ); AquaSalInstance::handleAppDefinedEvent( pEvent );
else if( eType == NSKeyDown && ([pEvent modifierFlags] & NSCommandKeyMask) != 0 ) else if( eType == NSKeyDown && ([pEvent modifierFlags] & NSCommandKeyMask) != 0 )
{ {
NSWindow* pKeyWin = [NSApp keyWindow]; NSWindow* pKeyWin = [NSApp keyWindow];