make pWindow private in SfxChildWindow

Change-Id: I585d4e8f0a53f46b6fbcef9e4d26f88b57569684

15 files changed, 23 insertions, 23 deletions

diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index e8ed7dd52580..dc586803f592 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -38,7 +38,7 @@ SpellDialogChildWindow::SpellDialogChildWindow (
     m_xAbstractSpellDialog.reset(pFact->CreateSvxSpellDialog(_pParent,
                                             pBindings,
                                             this ));
-    pWindow = m_xAbstractSpellDialog->GetWindow();
+    SetWindow( m_xAbstractSpellDialog->GetWindow() );
     SetHideNotDelete(true);
 }
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 9bf464489e77..fdae3db5d702 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -354,7 +354,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow(vcl::Window* pParent_, sal_uInt16 n
 {
     VclPtr<SvxBmpMask> pDlg = VclPtr<SvxBmpMask>::Create(pBindings, this, pParent_);
 
-    pWindow = pDlg;
+    SetWindow( pDlg );
 
     pDlg->Initialize( pInfo );
 }
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 205980bce9eb..4078e6e41193 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -68,7 +68,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_u
             SfxChildWindow( _pParent, nId )
 {
     VclPtr<SvxSuperContourDlg> pDlg = VclPtr<SvxSuperContourDlg>::Create(pBindings, this, _pParent);
-    pWindow = pDlg;
+    SetWindow(pDlg);
 
     if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
         pDlg->RollUp();
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 8b072d2ec3d5..4c5ab0683bed 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -164,7 +164,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
     SfxChildWindow( _pParent, nId )
 {
     VclPtrInstance<SvxFontWorkDialog> pDlg(pBindings, this, _pParent);
-    pWindow = pDlg.get();
+    SetWindow(pDlg);
 
     pDlg->Initialize( pInfo );
 }
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index fa0da20eb54d..3667bd67f161 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -44,7 +44,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
     DBG_ASSERT(pFact, "Dialog creation failed!");
     mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
     DBG_ASSERT(mpDlg, "Dialog creation failed!");
-    pWindow = mpDlg->GetWindow();
+    SetWindow( mpDlg->GetWindow() );
     SetVisible_Impl(false);
 
     vcl::Window* pTopWindow = 0;
@@ -61,7 +61,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
             pInfo->aPos.setY( aParentSize.Height()-aDlgSize.Height() < long(0.1*aParentSize.Height()) ?
                               long(0.1*aParentSize.Height()) : aParentSize.Height()-aDlgSize.Height() );
 
-        pWindow->SetPosPixel( pInfo->aPos );
+        GetWindow()->SetPosPixel( pInfo->aPos );
     }
 
     SetHideNotDelete( true );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 69d395f5f13d..618acfdd5c45 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -96,8 +96,8 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16
                                               SfxChildWinInfo* pInfo ) :
             SfxChildWindow( _pParent, nId )
 {
-    pWindow = VclPtr<SvxIMapDlg>::Create( pBindings, this, _pParent );
-    SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(pWindow.get());
+    SetWindow(VclPtr<SvxIMapDlg>::Create( pBindings, this, _pParent ));
+    SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(GetWindow());
 
     if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
         pDlg->RollUp();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 19b5d2ab0f93..891dc33f077f 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -70,7 +70,7 @@ SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pParent, sal_uInt16 nId,Sfx
     : SfxChildWindow(_pParent, nId)
 {
     VclPtr<SvxRubyDialog> pDlg = VclPtr<SvxRubyDialog>::Create(pBindings, this, _pParent);
-    pWindow = pDlg;
+    SetWindow(pDlg);
 
     if (pInfo->nFlags & SfxChildWindowFlags::ZOOMIN)
         pDlg->RollUp();
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 1b435645441d..ba27a6a3a870 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2267,7 +2267,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt1
     : SfxChildWindow( _pParent, nId )
     , dialog (VclPtr<SvxSearchDialog>::Create(_pParent, this, *pBindings))
 {
-    pWindow = dialog.get();
+    SetWindow(dialog);
     dialog->Initialize( pInfo );
 
     pBindings->Update( SID_SEARCH_ITEM );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 9a0982d95112..069e7a3e34e6 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2908,7 +2908,7 @@ Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent,
     SfxChildWindow( _pParent, nId )
 {
     VclPtr<Svx3DWin> pWin = VclPtr<Svx3DWin>::Create( pBindings, this, _pParent );
-    pWindow = pWin;
+    SetWindow(pWin);
 
     pWin->Initialize( pInfo );
 }
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index f88668294b22..f1cdfbb47f53 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2252,10 +2252,10 @@ namespace svxform
         SfxChildWindow( _pParent, _nId )
 
     {
-        pWindow = VclPtr<DataNavigator>::Create( _pBindings, this, _pParent );
+        SetWindow( VclPtr<DataNavigator>::Create( _pBindings, this, _pParent ) );
         SetAlignment(SfxChildAlignment::RIGHT);
-        pWindow->SetSizePixel( Size( 250, 400 ) );
-        static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo );
+        GetWindow()->SetSizePixel( Size( 250, 400 ) );
+        static_cast<SfxDockingWindow*>(GetWindow())->Initialize( _pInfo );
     }
 
     AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* _pNode,
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 17451ae11872..7a00bad224db 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1996,8 +1996,8 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uIn
                                     SfxBindings *_pBindings, SfxChildWinInfo* _pInfo )
                  :SfxChildWindow( _pParent, _nId )
 {
-    pWindow = VclPtr<FmFilterNavigatorWin>::Create( _pBindings, this, _pParent );
-    static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo );
+    SetWindow( VclPtr<FmFilterNavigatorWin>::Create( _pBindings, this, _pParent ) );
+    static_cast<SfxDockingWindow*>(GetWindow())->Initialize( _pInfo );
 }
 
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 86d05a29b159..4b0b6691ac38 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -83,8 +83,8 @@ FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId,
                             SfxBindings* _pBindings, SfxChildWinInfo* _pInfo)
               :SfxChildWindow(_pParent, _nId)
 {
-    pWindow = VclPtr<FmPropBrw>::Create( ::comphelper::getProcessComponentContext(), _pBindings, this, _pParent, _pInfo );
-    static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( _pInfo );
+    SetWindow( VclPtr<FmPropBrw>::Create( ::comphelper::getProcessComponentContext(), _pBindings, this, _pParent, _pInfo ) );
+    static_cast<SfxFloatingWindow*>(GetWindow())->Initialize( _pInfo );
 }
 
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index faabd491a0e2..e237963b1af7 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -614,8 +614,8 @@ namespace svxform
                                         SfxBindings* _pBindings, SfxChildWinInfo* _pInfo )
                      :SfxChildWindow( _pParent, _nId )
     {
-        pWindow = VclPtr<NavigatorFrame>::Create( _pBindings, this, _pParent );
-        static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo );
+        SetWindow( VclPtr<NavigatorFrame>::Create( _pBindings, this, _pParent ) );
+        static_cast<SfxDockingWindow*>(GetWindow())->Initialize( _pInfo );
     }
 
 
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 83d28cdebd74..778cfe444fc2 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -424,9 +424,9 @@ FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId,
                SfxBindings* _pBindings, SfxChildWinInfo* _pInfo)
               :SfxChildWindow(_pParent, _nId)
 {
-    pWindow = VclPtr<FmFieldWin>::Create(_pBindings, this, _pParent);
+    SetWindow( VclPtr<FmFieldWin>::Create(_pBindings, this, _pParent) );
     SetHideNotDelete(true);
-    static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( _pInfo );
+    static_cast<SfxFloatingWindow*>(GetWindow())->Initialize( _pInfo );
 }
 
 
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx
index eb34587863e1..5b5c399c8ddd 100644
--- a/svx/source/tbxctrls/SvxColorChildWindow.cxx
+++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx
@@ -36,7 +36,7 @@ SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent,
     VclPtr<SvxColorDockingWindow> pWin = VclPtr<SvxColorDockingWindow>::Create( pBindings, this,
                                         _pParent );
 
-    pWindow = pWin;
+    SetWindow(pWin);
 
     SetAlignment(SfxChildAlignment::BOTTOM);