diff options
| author | Henry Castro <hcastro@collabora.com> | 2022-07-01 12:07:23 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2022-07-04 14:29:02 +0200 |
| commit | d22d86e266826543e9e7ca406bedcddae04074cb (patch) | |
| tree | 25d4bb65f37a9b60187dd6dbd6b946ed0dc5d0b8 /sfx2 | |
| parent | bf731dedfad5f498e4eebdc9fbf776c6e10eafce (diff) | |
sfx2: replace pWindow m_pWindow
SfxFrame class members
Signed-off-by: Henry Castro <hcastro@collabora.com>
Change-Id: I1fd272a113763f6330f15ee34095e9e34ce5dd34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136753
Tested-by: Jenkins
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 0abc76bc3271..ee9ed9a4bd3e 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -73,7 +73,7 @@ void SfxFrame::Construct_Impl() SfxFrame::~SfxFrame() { RemoveTopFrame_Impl( this ); - pWindow.disposeAndClear(); + m_pWindow.disposeAndClear(); auto it = std::find( gaFramesArr_Impl.begin(), gaFramesArr_Impl.end(), this ); if ( it != gaFramesArr_Impl.end() ) diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 01b29366ad1b..015414e3ad3e 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -290,7 +290,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow ) :SvCompatWeakBase<SfxFrame>( this ) - ,pWindow( nullptr ) + ,m_pWindow( nullptr ) { Construct_Impl(); @@ -298,13 +298,13 @@ SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow ) InsertTopFrame_Impl( this ); m_pImpl->pExternalContainerWindow = &i_rContainerWindow; - pWindow = VclPtr<SfxFrameWindow_Impl>::Create( this, i_rContainerWindow ); + m_pWindow = VclPtr<SfxFrameWindow_Impl>::Create( this, i_rContainerWindow ); // always show pWindow, which is the ComponentWindow of the XFrame we live in // nowadays, since SfxFrames can be created with an XFrame only, hiding or showing the complete XFrame // is not done at level of the container window, not at SFX level. Thus, the component window can // always be visible. - pWindow->Show(); + m_pWindow->Show(); } void SfxFrame::SetPresentationMode( bool bSet ) |