summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/AnnotationWin.hxx3
-rw-r--r--sw/inc/PostItMgr.hxx5
-rw-r--r--sw/inc/SidebarWin.hxx13
-rw-r--r--sw/inc/colwd.hxx6
-rw-r--r--sw/inc/docsh.hxx2
-rw-r--r--sw/inc/hhcwrp.hxx2
-rw-r--r--sw/inc/hints.hxx5
-rw-r--r--sw/inc/postithelper.hxx6
-rw-r--r--sw/inc/printdata.hxx2
-rw-r--r--sw/inc/swmodule.hxx2
-rw-r--r--sw/inc/viewsh.hxx14
11 files changed, 33 insertions, 27 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 97eaa42cf668..e18e91e99d94 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -37,6 +37,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
SwSidebarItem& rSidebarItem,
SwFmtFld* aField );
virtual ~SwAnnotationWin();
+ virtual void dispose() SAL_OVERRIDE;
virtual void UpdateData() SAL_OVERRIDE;
virtual void SetPostItText() SAL_OVERRIDE;
@@ -55,7 +56,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
virtual bool IsProtected() SAL_OVERRIDE;
protected:
- virtual MenuButton* CreateMenuButton() SAL_OVERRIDE;
+ virtual VclPtr<MenuButton> CreateMenuButton() SAL_OVERRIDE;
private:
virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE;
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 345151076569..81251741bea4 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <SidebarWindowsTypes.hxx>
#include <svl/lstner.hxx>
+#include <vcl/vclptr.hxx>
class OutputDevice;
class SwWrtShell;
@@ -140,12 +141,12 @@ class SwPostItMgr: public SfxListener
private:
SwView* mpView;
SwWrtShell* mpWrtShell;
- SwEditWin* mpEditWin;
+ VclPtr<SwEditWin> mpEditWin;
std::list< SwSidebarItem*> mvPostItFlds;
std::vector<SwPostItPageItem*> mPages;
ImplSVEvent * mnEventId;
bool mbWaitingForCalcRects;
- sw::sidebarwindows::SwSidebarWin* mpActivePostIt;
+ VclPtr<sw::sidebarwindows::SwSidebarWin> mpActivePostIt;
bool mbLayout;
long mbLayoutHeight;
bool mbLayouting;
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 03ac80de5bd4..e660b9bcc7c4 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -66,6 +66,7 @@ class SwSidebarWin : public vcl::Window
SwPostItBits aBits,
SwSidebarItem& rSidebarItem );
virtual ~SwSidebarWin();
+ virtual void dispose() SAL_OVERRIDE;
void SetSize( const Size& rNewSize );
void SetPosSizePixelRect( long nX,
@@ -183,7 +184,7 @@ class SwSidebarWin : public vcl::Window
virtual void LoseFocus() SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
- virtual MenuButton* CreateMenuButton() = 0;
+ virtual VclPtr<MenuButton> CreateMenuButton() = 0;
void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
SfxItemSet DefaultItem();
@@ -210,11 +211,11 @@ class SwSidebarWin : public vcl::Window
OutlinerView* mpOutlinerView;
Outliner* mpOutliner;
- sw::sidebarwindows::SidebarTxtControl* mpSidebarTxtControl;
- ScrollBar* mpVScrollbar;
- Edit* mpMetadataAuthor;
- Edit* mpMetadataDate;
- MenuButton* mpMenuButton;
+ VclPtr<sw::sidebarwindows::SidebarTxtControl> mpSidebarTxtControl;
+ VclPtr<ScrollBar> mpVScrollbar;
+ VclPtr<Edit> mpMetadataAuthor;
+ VclPtr<Edit> mpMetadataDate;
+ VclPtr<MenuButton> mpMenuButton;
sw::sidebarwindows::AnchorOverlayObject* mpAnchor;
sw::sidebarwindows::ShadowOverlayObject* mpShadow;
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 448e07efaca6..1e466c477f4f 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -28,8 +28,8 @@ class SwTableFUNC;
class SwTableWidthDlg : public SvxStandardDialog
{
- NumericField* m_pColNF;
- MetricField* m_pWidthMF;
+ VclPtr<NumericField> m_pColNF;
+ VclPtr<MetricField> m_pWidthMF;
SwTableFUNC &rFnc;
protected:
@@ -38,6 +38,8 @@ protected:
public:
SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc );
+ virtual ~SwTableWidthDlg();
+ virtual void dispose() SAL_OVERRIDE;
};
#endif
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 50bfdf3e7e40..facd5d020eb6 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -110,7 +110,7 @@ class SW_DLLPUBLIC SwDocShell
SAL_OVERRIDE;
/// Make DocInfo known to the Doc.
- SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
+ SAL_DLLPRIVATE virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(
vcl::Window *pParent, const SfxItemSet &) SAL_OVERRIDE;
/// OLE-stuff
SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE;
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 138c72c25427..43c1e326f53c 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -30,7 +30,7 @@ class SwPaM;
class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
{
SwView * m_pView;
- vcl::Window* m_pWin;
+ VclPtr<vcl::Window> m_pWin;
SwWrtShell &m_rWrtShell;
SwConversionArgs *m_pConvArgs; /**< object for arguments (and results) needed
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 3e659452fe7c..92a5744bbb7f 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_INC_HINTS_HXX
#include <swatrset.hxx>
+#include <vcl/vclptr.hxx>
#include <vector>
class SwFmt;
@@ -132,13 +133,13 @@ public:
class SwRefMarkFldUpdate : public SwMsgPoolItem
{
public:
- const OutputDevice* pOut; ///< pointer to the current output device
+ VclPtr<OutputDevice> pOut; ///< pointer to the current output device
/** Is sent if reference marks should be updated.
To get the page/chapter number, the frame has to be asked. For that we need
the current OutputDevice.
*/
- SwRefMarkFldUpdate( const OutputDevice* );
+ SwRefMarkFldUpdate( OutputDevice* );
};
/** SwDocPosUpdate is sent to signal that only the frames from or to a specified document-global position
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 80b26ac520e6..e8fa575ae36c 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -89,7 +89,7 @@ namespace SwPostItHelper
class SwSidebarItem
{
public:
- sw::sidebarwindows::SwSidebarWin* pPostIt;
+ VclPtr<sw::sidebarwindows::SwSidebarWin> pPostIt;
bool bShow;
bool bFocus;
@@ -114,7 +114,7 @@ public:
virtual bool UseElement() = 0;
virtual const SwFmtFld& GetFmtFld() const = 0;
virtual const SfxBroadcaster* GetBroadCaster() const = 0;
- virtual sw::sidebarwindows::SwSidebarWin* GetSidebarWindow( SwEditWin& rEditWin,
+ virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
SwPostItBits aBits) = 0;
@@ -146,7 +146,7 @@ public:
{
return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld);
}
- virtual sw::sidebarwindows::SwSidebarWin* GetSidebarWindow(
+ virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow(
SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 11e1945d77dd..6c5e6f3efae7 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -172,7 +172,7 @@ public:
class SwPrintUIOptions : public vcl::PrinterOptionsHelper
{
- OutputDevice* m_pLast;
+ VclPtr< OutputDevice > m_pLast;
const SwPrintData & m_rDefaultPrintData;
public:
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index dfcc4b189a30..f016ac3cdfca 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -219,7 +219,7 @@ public:
// Virtual methods for options dialog.
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
// Pool is created here and set at SfxShell.
void InitAttrPool();
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 01b308311287..610d9633f4d7 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -125,12 +125,12 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
SwRect maInvalidRect;
SfxViewShell *mpSfxViewShell;
- SwViewShellImp *mpImp; // Core-internals of SwViewShell.
- // The pointer is never 0.
+ SwViewShellImp *mpImp; // Core-internals of SwViewShell.
+ // The pointer is never 0.
- ::vcl::Window *mpWin; ///< = 0 during printing or pdf export
- OutputDevice *mpOut; ///< Window, Printer, VirtDev, ...
- OutputDevice* mpTmpRef; // Temporariy reference device. Is used
+ VclPtr<::vcl::Window> mpWin; ///< = 0 during printing or pdf export
+ VclPtr<OutputDevice> mpOut; ///< Window, Printer, VirtDev, ...
+ VclPtr<OutputDevice> mpTmpRef; // Temporariy reference device. Is used
// during (printer depending) prospect
// and page preview printing
// (because a scaling has to be set at
@@ -161,7 +161,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
bool mbInConstructor:1;
SdrPaintWindow* mpTargetPaintWindow;
- OutputDevice* mpBufferedOut;
+ VclPtr<OutputDevice> mpBufferedOut;
SwRootFrmPtr mpLayout;
@@ -236,7 +236,7 @@ public:
// #i72754# set of Pre/PostPaints with lock counter and initial target OutDev
protected:
std::stack<vcl::Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked)
- OutputDevice* mpPrePostOutDev;
+ VclPtr<OutputDevice> mpPrePostOutDev;
MapMode maPrePostMapMode;
public:
void PrePaint();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 11:50:40 +0000