diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 17:21:42 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:22:58 +0100 |
| commit | b129ee5021b7f56dfd936d53a46d274880edc0a9 (patch) | |
| tree | 6a4ba9d0c514c7bad71be91c9e60ca7512b46885 /basctl | |
| parent | 23d833dd3fba1c05a7d7552de6037cf3723bbfcc (diff) | |
Move OutputDevice members to VclPtr: dbaccess, canvas.
Change-Id: Iae01ddcb6a0cde3be1bd79200e9177983be2f924
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basdoc.cxx | 3 | ||||
| -rw-r--r-- | basctl/source/basicide/basdoc.hxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index bb58c0943230..ee96c23795e0 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -66,7 +66,10 @@ SfxPrinter* DocShell::GetPrinter( bool bCreate ) void DocShell::SetPrinter( SfxPrinter* pPr ) { if (pPr != pPrinter.get()) + { + pPrinter.disposeAndClear(); pPrinter.reset(pPr); + } } void DocShell::FillClass( SvGlobalName*, SotClipboardFormatId*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 5b6210d5dcab..65bfb8961d51 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -33,7 +33,7 @@ namespace basctl class DocShell: public SfxObjectShell { - boost::scoped_ptr<SfxPrinter> pPrinter; + ScopedVclPtr<SfxPrinter> pPrinter; protected: virtual void Draw( OutputDevice *, const JobSetup & rSetup, |