diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-13 12:16:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-13 12:21:19 +0200 |
| commit | 4eb16dab21e3e6f47e899060e28ccc515e47316f (patch) | |
| tree | 03b32dbf733f560fccab646ba971be22de4c824c /sw/source/uibase | |
| parent | 6850e9b855d3d367ae51111e48cbdb2c28000424 (diff) | |
wrap some static fields in VclPtr
Change-Id: I2df0929d1b34b9ebf2d5d4c27321abdea072007a
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/view.hxx | 16 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 7 |
2 files changed, 12 insertions, 11 deletions
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 6f0cec290327..c89d3306c52b 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -153,14 +153,14 @@ class SW_DLLPUBLIC SwView: public SfxViewShell friend class SwClipboardChangeListener; // search & replace - static SvxSearchDialog *m_pSrchDlg; - static SvxSearchItem *m_pSrchItem; - - static sal_uInt16 m_nInsertCtrlState; - static sal_uInt16 m_nWebInsertCtrlState; - static sal_uInt16 m_nInsertObjectCtrlState; - static sal_uInt16 m_nInsertFieldCtrlState; - static sal_uInt16 m_nMoveType; // for buttons below the scrollbar (viewmdi) + static VclPtr<SvxSearchDialog> m_pSrchDlg; + static SvxSearchItem *m_pSrchItem; + + static sal_uInt16 m_nInsertCtrlState; + static sal_uInt16 m_nWebInsertCtrlState; + static sal_uInt16 m_nInsertObjectCtrlState; + static sal_uInt16 m_nInsertFieldCtrlState; + static sal_uInt16 m_nMoveType; // for buttons below the scrollbar (viewmdi) static sal_Int32 m_nActMark; // current jump mark for unknown mark static bool m_bExtra; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 5a158033a097..02c00d766132 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -36,6 +36,7 @@ #include <sfx2/printer.hxx> #include <sfx2/app.hxx> #include <svx/ruler.hxx> +#include <svx/srchdlg.hxx> #include <editeng/protitem.hxx> #include <svx/fmshell.hxx> #include <svx/extrusionbar.hxx> @@ -135,9 +136,9 @@ bool SwView::m_bExtra = false; bool SwView::m_bFound = false; bool SwView::m_bJustOpened = false; -SvxSearchDialog* SwView::m_pSrchDlg = 0; -SearchAttrItemList* SwView::m_pSrchList = 0; -SearchAttrItemList* SwView::m_pReplList = 0; +VclPtr<SvxSearchDialog> SwView::m_pSrchDlg = nullptr; +SearchAttrItemList* SwView::m_pSrchList = 0; +SearchAttrItemList* SwView::m_pReplList = 0; inline SfxDispatcher &SwView::GetDispatcher() { |