make pWindow private in SfxChildWindow

Change-Id: I585d4e8f0a53f46b6fbcef9e4d26f88b57569684

8 files changed, 27 insertions, 27 deletions

diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index 1a76bbb016a8..ebd2343199cd 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -43,7 +43,7 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent,
                                 SfxChildWinInfo* pInfo ) :
                                 SfxChildWindow( _pParent, nId )
 {
-    pWindow = VclPtr<SwMailMergeChildWin>::Create( pBindings, this, _pParent);
+    SetWindow( VclPtr<SwMailMergeChildWin>::Create( pBindings, this, _pParent) );
 
     if (!pInfo->aSize.Width() || !pInfo->aSize.Height())
     {
@@ -51,16 +51,16 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent,
         if(pActiveView)
         {
             const SwEditWin &rEditWin = pActiveView->GetEditWin();
-            pWindow->SetPosPixel(rEditWin.OutputToScreenPixel(Point(0, 0)));
+            GetWindow()->SetPosPixel(rEditWin.OutputToScreenPixel(Point(0, 0)));
         }
         else
-            pWindow->SetPosPixel(_pParent->OutputToScreenPixel(Point(0, 0)));
-        pInfo->aPos = pWindow->GetPosPixel();
-        pInfo->aSize = pWindow->GetSizePixel();
+            GetWindow()->SetPosPixel(_pParent->OutputToScreenPixel(Point(0, 0)));
+        pInfo->aPos = GetWindow()->GetPosPixel();
+        pInfo->aSize = GetWindow()->GetSizePixel();
     }
 
-    static_cast<SwMailMergeChildWin *>(pWindow.get())->Initialize(pInfo);
-    pWindow->Show();
+    static_cast<SwMailMergeChildWin *>(GetWindow())->Initialize(pInfo);
+    GetWindow()->Show();
 }
 
 SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,
diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx
index 3dfa2a7fca67..2b5e963484f7 100644
--- a/sw/source/uibase/dialog/wordcountwrapper.cxx
+++ b/sw/source/uibase/dialog/wordcountwrapper.cxx
@@ -25,7 +25,7 @@ SwWordCountWrapper::SwWordCountWrapper(   vcl::Window *pParentWindow,
     assert(pFact && "SwAbstractDialogFactory fail!");
     xAbstDlg.reset(pFact->CreateSwWordCountDialog(pBindings, this, pParentWindow, pInfo));
     assert(xAbstDlg && "Dialog construction failed!");
-    pWindow = xAbstDlg->GetWindow();
+    SetWindow(xAbstDlg->GetWindow());
 }
 
 SfxChildWinInfo SwWordCountWrapper::GetInfo() const
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index fd1b66ec0b6c..fe5984f65bce 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -37,7 +37,7 @@ SwSyncChildWin::SwSyncChildWin( vcl::Window* _pParent,
                                 SfxChildWinInfo* pInfo ) :
                                 SfxChildWindow( _pParent, nId )
 {
-    pWindow = VclPtr<SwSyncBtnDlg>::Create( pBindings, this, _pParent);
+    SetWindow(VclPtr<SwSyncBtnDlg>::Create( pBindings, this, _pParent));
 
     if (!pInfo->aSize.Width() || !pInfo->aSize.Height())
     {
@@ -45,17 +45,17 @@ SwSyncChildWin::SwSyncChildWin( vcl::Window* _pParent,
         if(pActiveView)
         {
             const SwEditWin &rEditWin = pActiveView->GetEditWin();
-            pWindow->SetPosPixel(rEditWin.OutputToScreenPixel(Point(0, 0)));
+            GetWindow()->SetPosPixel(rEditWin.OutputToScreenPixel(Point(0, 0)));
         }
         else
-            pWindow->SetPosPixel(_pParent->OutputToScreenPixel(Point(0, 0)));
-        pInfo->aPos = pWindow->GetPosPixel();
-        pInfo->aSize = pWindow->GetSizePixel();
+            GetWindow()->SetPosPixel(_pParent->OutputToScreenPixel(Point(0, 0)));
+        pInfo->aPos = GetWindow()->GetPosPixel();
+        pInfo->aSize = GetWindow()->GetSizePixel();
     }
 
-    static_cast<SwSyncBtnDlg *>(pWindow.get())->Initialize(pInfo);
+    static_cast<SwSyncBtnDlg *>(GetWindow())->Initialize(pInfo);
 
-    pWindow->Show();
+    GetWindow()->Show();
 }
 
 SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings,
diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx
index a241e66fe571..bf189929abdb 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -84,7 +84,7 @@ SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
     AbstractSwFieldDlg* pDlg = pFact->CreateSwFieldDlg(pB, this, _pParent);
     assert(pDlg && "Dialog creation failed!");
     pDlgInterface = pDlg;
-    pWindow = pDlg->GetWindow();
+    SetWindow( pDlg->GetWindow() );
     pDlg->Start();
 }
 
@@ -129,7 +129,7 @@ SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper( vcl::Window* _pParent, sal
     OSL_ENSURE(pDlg, "Dialog creation failed!");
     pDlgInterface = pDlg;
 
-    pWindow = pDlg->GetWindow();
+    SetWindow( pDlg->GetWindow() );
     pDlg->ActivateDatabasePage();
     pDlg->Start();
     pDlg->Initialize( pInfo );
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 13154efc3c5a..25730b5cae3c 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -104,9 +104,9 @@ public:
     virtual ~SwInputChild();
     SFX_DECL_CHILDWINDOW_WITHID( SwInputChild );
     void            SetFormula( const OUString& rFormula, bool bDelSel = true )
-                        { static_cast<SwInputWindow*>(pWindow.get())->SetFormula(
-                                    rFormula, bDelSel ); }
-    const SwView*   GetView() const{return static_cast<SwInputWindow*>(pWindow.get())->GetView();}
+                    { static_cast<SwInputWindow*>(GetWindow())->SetFormula( rFormula, bDelSel ); }
+    const SwView*   GetView() const
+                    { return static_cast<SwInputWindow*>(GetWindow())->GetView();}
 
 };
 
diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx
index 6fe389b6f8de..7994686be969 100644
--- a/sw/source/uibase/index/idxmrk.cxx
+++ b/sw/source/uibase/index/idxmrk.cxx
@@ -64,8 +64,8 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( vcl::Window *pParentWindow,
     assert(pFact && "SwAbstractDialogFactory fail!");
     pAbstDlg = pFact->CreateIndexMarkFloatDlg(pBindings, this, pParentWindow, pInfo);
     assert(pAbstDlg && "Dialog creation failed!");
-    pWindow = pAbstDlg->GetWindow();
-    pWindow->Show();    // at this point,because before pSh has to be initialized in ReInitDlg()
+    SetWindow( pAbstDlg->GetWindow() );
+    GetWindow()->Show();    // at this point,because before pSh has to be initialized in ReInitDlg()
                         // -> Show() will invoke StateChanged() and save pos
 }
 
@@ -93,7 +93,7 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper(   vcl::Window *pParentWindow,
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
     pAbstDlg = pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow, pInfo);
     OSL_ENSURE(pAbstDlg, "Dialog creation failed!");
-    pWindow = pAbstDlg->GetWindow();
+    SetWindow( pAbstDlg->GetWindow() );
 }
 
 SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 3c574200454b..9e9728878017 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -67,9 +67,9 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( vcl::Window* _pParent,
                                             SfxChildWinInfo* pInfo ) :
     SwChildWinWrapper( _pParent, nId )
 {
-    pWindow = VclPtr<SwModelessRedlineAcceptDlg>::Create( pBindings, this, _pParent);
+    SetWindow( VclPtr<SwModelessRedlineAcceptDlg>::Create( pBindings, this, _pParent) );
 
-    static_cast<SwModelessRedlineAcceptDlg *>(pWindow.get())->Initialize(pInfo);
+    static_cast<SwModelessRedlineAcceptDlg *>(GetWindow())->Initialize(pInfo);
 }
 
 // newly initialise dialog after document switch
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 8bd5a5c37870..7569757d59c8 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -622,8 +622,8 @@ SwInputChild::SwInputChild(vcl::Window* _pParent,
                                 SfxChildWindow( _pParent, nId )
 {
     pDispatch = pBindings->GetDispatcher();
-    pWindow = VclPtr<SwInputWindow>::Create( _pParent );
-    static_cast<SwInputWindow*>(pWindow.get())->ShowWin();
+    SetWindow( VclPtr<SwInputWindow>::Create( _pParent ) );
+    static_cast<SwInputWindow*>(GetWindow())->ShowWin();
     SetAlignment(SfxChildAlignment::LOWESTTOP);
 }