diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-09-23 12:35:11 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-09-23 19:07:17 +0200 |
commit | d2e8e301fcb2d0513d919b897f51f7a7586198b8 (patch) | |
tree | 9239a9c62dc0c3d23b0e0a90e58f8eaa0a04ccec /vcl/osx | |
parent | 203865e128ddea66041bb1597333dfb04ec81186 (diff) |
loplugin:fragiledestructor (macOS)
Change-Id: I85542ed9e631ad8589d3bc3469d171ab1d5cb4f9
Reviewed-on: https://gerrit.libreoffice.org/79396
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/osx')
-rw-r--r-- | vcl/osx/salframe.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index f72ec1f53f57..8a18aa8e39b9 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -97,7 +97,7 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle AquaSalFrame::~AquaSalFrame() { if (mbFullScreen) - ShowFullScreen(false, maGeometry.nDisplayScreenNumber); + doShowFullScreen(false, maGeometry.nDisplayScreenNumber); assert( GetSalData()->mpInstance->IsMainThread() ); @@ -107,7 +107,7 @@ AquaSalFrame::~AquaSalFrame() AquaSalMenu::setDefaultMenu(); // cleanup clipping stuff - ResetClipRegion(); + doResetClipRegion(); [SalFrameView unsetMouseFrame: this]; @@ -752,6 +752,11 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { + doShowFullScreen(bFullScreen, nDisplay); +} + +void AquaSalFrame::doShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) +{ if (!mpNSWindow) { if (Application::IsBitmapRendering() && bFullScreen) @@ -1706,6 +1711,11 @@ void AquaSalFrame::CaptureMouse( bool bCapture ) void AquaSalFrame::ResetClipRegion() { + doResetClipRegion(); +} + +void AquaSalFrame::doResetClipRegion() +{ if ( !mpNSWindow ) return; |