[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Henry Castro (via logerrit)]

 include/sfx2/frame.hxx      |    4 ++--
 sfx2/source/view/frame.cxx  |    2 +-
 sfx2/source/view/frame2.cxx |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d22d86e266826543e9e7ca406bedcddae04074cb
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Jul 1 12:07:23 2022 -0400
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Mon Jul 4 14:29:02 2022 +0200

    sfx2: replace pWindow m_pWindow
    
    SfxFrame class members
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I1fd272a113763f6330f15ee34095e9e34ce5dd34
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136753
    Tested-by: Jenkins

diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7956fdd36d57..b9004bdb8b36 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -70,7 +70,7 @@ class SFX2_DLLPUBLIC SfxFrame final : public 
SvCompatWeakBase<SfxFrame>
 
 private:
     std::unique_ptr< SfxFrame_Impl >     m_pImpl;
-    VclPtr<vcl::Window> pWindow;
+    VclPtr<vcl::Window> m_pWindow;
 
     virtual             ~SfxFrame();
 
@@ -82,7 +82,7 @@ public:
                         CreateBlankFrame();
     static SfxFrame*    CreateHidden( SfxObjectShell const & rDoc, 
vcl::Window& rWindow, SfxInterfaceId nViewId );
 
-    vcl::Window&        GetWindow() const { return *pWindow;}
+    vcl::Window&        GetWindow() const { return *m_pWindow;}
     void                CancelTransfers();
     bool                DoClose();
 
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 )