diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index ec2b0a845ba7..5ead0e735409 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -98,10 +98,10 @@ SalSystem *AndroidSalInstance::CreateSalSystem() class AndroidSalFrame : public SvpSalFrame { public: - AndroidSalFrame( AndroidSalInstance *pInstance, + AndroidSalFrame( AndroidSalInstance& rInstance, SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle ) - : SvpSalFrame(pInstance, pParent, nSalFrameStyle) + : SvpSalFrame(rInstance, pParent, nSalFrameStyle) { if (pParent == NULL && viewWidth > 1 && viewHeight > 1) SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); @@ -146,12 +146,12 @@ public: SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle ) { - return new AndroidSalFrame( this, NULL, nStyle ); + return new AndroidSalFrame(*this, NULL, nStyle); } SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) { - return new AndroidSalFrame( this, pParent, nStyle ); + return new AndroidSalFrame(*this, pParent, nStyle); } // This is our main entry point: diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index ee5d47cbac7c..129ab25a81ef 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -40,10 +40,10 @@ SvpSalFrame* SvpSalFrame::s_pFocusFrame = nullptr; #define SvpSalGraphics AquaSalGraphics #endif -SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, +SvpSalFrame::SvpSalFrame( SvpSalInstance& rInstance, SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle ) : - m_pInstance( pInstance ), + m_rInstance(rInstance), m_pParent( static_cast(pParent) ), m_nStyle( nSalFrameStyle ), m_bVisible( false ), @@ -62,16 +62,14 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance, if( m_pParent ) m_pParent->m_aChildren.push_back( this ); - if( m_pInstance ) - m_pInstance->insertFrame(this); + m_rInstance.insertFrame(this); SetPosSize( 0, 0, 800, 600, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT ); } SvpSalFrame::~SvpSalFrame() { - if( m_pInstance ) - m_pInstance->eraseFrame(this); + m_rInstance.eraseFrame(this); std::vector Children = m_aChildren; for( auto& rChild : Children ) @@ -88,7 +86,7 @@ SvpSalFrame::~SvpSalFrame() // pass focus to another frame, preferably a document style window if( s_pFocusFrame == nullptr ) { - for (auto pSalFrame : m_pInstance->getFrames() ) + for (auto pSalFrame : m_rInstance.getFrames()) { SvpSalFrame* pFrame = static_cast( pSalFrame ); if( pFrame->m_bVisible && @@ -124,7 +122,7 @@ void SvpSalFrame::GetFocus() if( s_pFocusFrame ) s_pFocusFrame->LoseFocus(); s_pFocusFrame = this; - m_pInstance->PostEvent( this, nullptr, SalEvent::GetFocus ); + m_rInstance.PostEvent(this, nullptr, SalEvent::GetFocus); } } @@ -132,7 +130,7 @@ void SvpSalFrame::LoseFocus() { if( s_pFocusFrame == this ) { - m_pInstance->PostEvent( this, nullptr, SalEvent::LoseFocus ); + m_rInstance.PostEvent(this, nullptr, SalEvent::LoseFocus); s_pFocusFrame = nullptr; } } @@ -169,7 +167,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) bool SvpSalFrame::PostEvent(std::unique_ptr pData) { - m_pInstance->PostEvent( this, pData.release(), SalEvent::UserEvent ); + m_rInstance.PostEvent(this, pData.release(), SalEvent::UserEvent); return true; } @@ -214,7 +212,7 @@ void SvpSalFrame::Show( bool bVisible, bool bNoActivate ) if (bVisible) { m_bVisible = true; - m_pInstance->PostEvent( this, nullptr, SalEvent::Resize ); + m_rInstance.PostEvent(this, nullptr, SalEvent::Resize); if( ! bNoActivate ) GetFocus(); } @@ -278,7 +276,7 @@ void SvpSalFrame::SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth } } if( m_bVisible ) - m_pInstance->PostEvent( this, nullptr, SalEvent::Resize ); + m_rInstance.PostEvent(this, nullptr, SalEvent::Resize); #endif } diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 8d941191db08..21a99648f524 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -178,12 +178,12 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers ) SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle ) { - return new SvpSalFrame( this, nullptr, nStyle ); + return new SvpSalFrame(*this, nullptr, nStyle); } SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) { - return new SvpSalFrame( this, pParent, nStyle ); + return new SvpSalFrame(*this, pParent, nStyle); } void SvpSalInstance::DestroyFrame( SalFrame* pFrame ) diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 94f7951d6dc1..5749ae787678 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -36,7 +36,7 @@ class SvpSalGraphics; class SvpSalFrame : public SalFrame { - SvpSalInstance* m_pInstance; + SvpSalInstance& m_rInstance; SvpSalFrame* m_pParent; // pointer to parent frame std::vector< SvpSalFrame* > m_aChildren; // Vector of child frames SalFrameStyleFlags m_nStyle; @@ -57,7 +57,7 @@ class SvpSalFrame : public SalFrame OUString m_sTitle; public: - SvpSalFrame( SvpSalInstance* pInstance, + SvpSalFrame( SvpSalInstance& rInstance, SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle ); virtual ~SvpSalFrame() override; diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index f9b6806812bc..ac64645c3ef4 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -70,10 +70,10 @@ SalSystem *IosSalInstance::CreateSalSystem() class IosSalFrame : public SvpSalFrame { public: - IosSalFrame( IosSalInstance *pInstance, + IosSalFrame(IosSalInstance& rInstance, SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle) - : SvpSalFrame( pInstance, pParent, nSalFrameStyle ) + : SvpSalFrame(rInstance, pParent, nSalFrameStyle) { if (pParent == NULL && viewWidth > 1 && viewHeight > 1) SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); @@ -121,12 +121,12 @@ public: SalFrame *IosSalInstance::CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) { (void)pParent; - return new IosSalFrame( this, NULL, nStyle ); + return new IosSalFrame(*this, NULL, nStyle); } SalFrame *IosSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) { - return new IosSalFrame( this, pParent, nStyle ); + return new IosSalFrame(*this, pParent, nStyle); } SalData::SalData() :