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 /starmath | |
| parent | a9ea1295a668feca4bfb9b2a53a92890177b5371 (diff) | |
make pWindow private in SfxChildWindow
Change-Id: I585d4e8f0a53f46b6fbcef9e4d26f88b57569684
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/view.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 72f98570e276..2cb968eddff7 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -226,7 +226,7 @@ public: SmEditWindow& GetEditWindow() { - return static_cast<SmCmdBoxWindow *>(pWindow.get())->GetEditWindow(); + return static_cast<SmCmdBoxWindow *>(GetWindow())->GetEditWindow(); } }; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 3ca87b2a5a4e..3c29f5e7c0c4 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -764,7 +764,7 @@ SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper( SfxChildWindow(pParentWindow, nId) { VclPtrInstance<SmElementsDockingWindow> pDialog(pBindings, this, pParentWindow); - pWindow.reset(pDialog); + SetWindow(pDialog); pDialog->setDeferredProperties(); pDialog->SetPosSizePixel(Point(0, 0), Size(300, 0)); pDialog->Show(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 3c21930fd898..93c49dc73935 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -889,11 +889,11 @@ SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) { - pWindow.reset(VclPtr<SmCmdBoxWindow>::Create(pBindings, this, pParentWindow)); + SetWindow(VclPtr<SmCmdBoxWindow>::Create(pBindings, this, pParentWindow)); // make window docked to the bottom initially (after first start) SetAlignment(SfxChildAlignment::BOTTOM); - static_cast<SfxDockingWindow *>(pWindow.get())->Initialize(pInfo); + static_cast<SfxDockingWindow *>(GetWindow())->Initialize(pInfo); } #if OSL_DEBUG_LEVEL > 1 |