vcl/inc/osx/salframe.h | 4 ++++ vcl/osx/salframe.cxx | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)
New commits: commit d2e8e301fcb2d0513d919b897f51f7a7586198b8 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon Sep 23 12:35:11 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Mon Sep 23 19:07:17 2019 +0200 loplugin:fragiledestructor (macOS) Change-Id: I85542ed9e631ad8589d3bc3469d171ab1d5cb4f9 Reviewed-on: https://gerrit.libreoffice.org/79396 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 2038cf99b33f..2fcdef3609e9 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -200,6 +200,10 @@ private: // methods void initWindowAndView(); + void doShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); + + void doResetClipRegion(); + private: // data static AquaSalFrame* s_pCaptureFrame; 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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits