diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-05-25 14:53:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-28 20:29:42 +0200 |
| commit | 2f7812a4fa1503bd8391cd8deb07d6606519e182 (patch) | |
| tree | 5a4287ef8d9a5c0a8cf74bbe63ef3e14824ad886 /vcl | |
| parent | 54ddc4ff4c2ff7e8b2c502d6b475cfdc9b8e3cec (diff) | |
Bin ten year old temporary hack
Cmd-W works just fine without any special handling at this low level,
as far as I can see.
Change-Id: Ib00964553984b7aeec89d9fab9fc425c08de910a
Reviewed-on: https://gerrit.libreoffice.org/54917
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/vclnsapp.mm | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index edf7549a0993..882ee3fb79a7 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -104,25 +104,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH if( pKeyWin && [pKeyWin isKindOfClass: [SalFrameWindow class]] ) { AquaSalFrame* pFrame = [static_cast<SalFrameWindow*>(pKeyWin) getSalFrame]; - // handle Cmd-W - // FIXME: the correct solution would be to handle this in framework - // in the menu code - // however that is currently being revised, so let's use a preliminary solution here - // this hack is based on assumption - // a) Cmd-W is the same in all languages in OOo's menu config - // b) Cmd-W is the same in all languages in on MacOS - // for now this seems to be true unsigned int nModMask = ([pEvent modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)); - if( (pFrame->mnStyleMask & NSClosableWindowMask) != 0 ) - { - if( nModMask == NSCommandKeyMask - && [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] ) - { - [static_cast<SalFrameWindow*>(pFrame->getNSWindow()) windowShouldClose: nil]; - return; - } - } - /* * #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize all windows */ |