diff options
Diffstat (limited to 'sw/source/uibase/inc/view.hxx')
| -rw-r--r-- | sw/source/uibase/inc/view.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 8cd1d5cf01ca..1e76ee5a3398 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -187,7 +187,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell Size m_aDocSz; // current document size Rectangle m_aVisArea; // visible region - SwEditWin *m_pEditWin; + VclPtr<SwEditWin> m_pEditWin; SwWrtShell *m_pWrtShell; SfxShell *m_pShell; // current SubShell at the dispatcher @@ -195,21 +195,21 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwView_Impl *m_pViewImpl; // Impl-data for UNO + Basic - SwScrollbar *m_pHScrollbar, // MDI control elements - *m_pVScrollbar; + VclPtr<SwScrollbar> m_pHScrollbar, // MDI control elements + m_pVScrollbar; bool m_bHScrollbarEnabled; bool m_bVScrollbarEnabled; - ::vcl::Window *m_pScrollFill; // dummy window for filling the lower right edge + VclPtr<::vcl::Window> m_pScrollFill; // dummy window for filling the lower right edge // when both scrollbars are active - SvxRuler *m_pHRuler, - *m_pVRuler; - ImageButton *m_pTogglePageBtn; + VclPtr<SvxRuler> m_pHRuler, + m_pVRuler; + VclPtr<ImageButton> m_pTogglePageBtn; - SwHlpImageButton *m_pPageUpBtn, - *m_pPageDownBtn; + VclPtr<SwHlpImageButton> m_pPageUpBtn, + m_pPageDownBtn; SwGlossaryHdl *m_pGlosHdl; // handle text block SwDrawBase *m_pDrawActual; @@ -221,7 +221,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwPostItMgr *m_pPostItMgr; int m_nSelectionType; - FloatingWindow *m_pFieldPopup; + VclPtr<FloatingWindow> m_pFieldPopup; static const int m_nMASTERENUMCOMMANDS = 6; @@ -663,7 +663,7 @@ public: // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window* pParent, + SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -682,9 +682,9 @@ inline const SwDocShell *SwView::GetDocShell() const return const_cast<SwView*>(this)->GetDocShell(); } -SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, - const SfxItemSet &rOptions, - bool bPreview); +VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, + const SfxItemSet &rOptions, + bool bPreview); #endif |