diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-24 13:39:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-25 08:39:03 +0200 |
| commit | 219b50a284a9fab6e5eb72efee54a72e15ac1bec (patch) | |
| tree | a40f8c6bb599f2746a3a250bfb74c4b315eb33c5 /sd | |
| parent | a9ea1295a668feca4bfb9b2a53a92890177b5371 (diff) | |
make pWindow private in SfxChildWindow
Change-Id: I585d4e8f0a53f46b6fbcef9e4d26f88b57569684
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/AnimationChildWindow.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/PaneChildWindows.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index 1fd341642b7e..8a7b7948dffb 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -40,7 +40,7 @@ AnimationChildWindow::AnimationChildWindow( : SfxChildWindow( _pParent, nId ) { VclPtr<AnimationWindow> pAnimWin = VclPtr<AnimationWindow>::Create(pBindings, this, _pParent); - pWindow = pAnimWin; + SetWindow(pAnimWin); pAnimWin->Initialize( pInfo ); diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index a52d00df7c3a..a8f6306a8865 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -56,14 +56,13 @@ PaneChildWindow::PaneChildWindow ( SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { - pWindow = VclPtr<PaneDockingWindow>::Create( - + SetWindow( VclPtr<PaneDockingWindow>::Create( pBindings, this, pParentWindow, - SD_RESSTR(nTitleBarResId)); + SD_RESSTR(nTitleBarResId))); SetAlignment(eAlignment); - static_cast<SfxDockingWindow*>(pWindow.get())->Initialize(pInfo); + static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo); SetHideNotDelete(true); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); @@ -76,7 +75,7 @@ PaneChildWindow::PaneChildWindow ( PaneChildWindow::~PaneChildWindow() { ViewShellBase* pBase = NULL; - PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow.get()); + PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(GetWindow()); if (pDockingWindow != NULL) pBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame()); |