ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

vcl: Switch SvpSalFrame::m_pInstance to reference

Browse Source 
... and rename accordingly.

This member is always non-null.

Make it a reference instead of a pointer which
makes that more clear and allows to drop some
superfluous null checks.

Change-Id: I11f7d1b13aac67a785e9b8d146546dce53fa0aee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201415
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-03-12 07:42:29 +01:00
parent 841947e202
commit 8ef60286fe
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/android/androidinst.cxx
+4 -4
View File
@@ -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:
vcl/headless/svpframe.cxx
+10 -12
View File
@@ -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<SvpSalFrame*>(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<SvpSalFrame*> 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<SvpSalFrame*>( 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<ImplSVEvent> 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
}
vcl/headless/svpinst.cxx
+2 -2
View File
@@ -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 )
vcl/inc/headless/svpframe.hxx
+2 -2
View File
@@ -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;
vcl/ios/iosinst.cxx
+4 -4
View File
@@ -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() :