diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-19 10:14:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-20 07:29:33 +0100 |
| commit | 45f0c58c615e1caf2bc8630924e2e4c89ac7bc4d (patch) | |
| tree | 98392a0266dafaceccbd14b962f59badf8bf68df /include | |
| parent | 41ed5c2e61a040b674444088b15c8bdea30a45b0 (diff) | |
use unique_ptr in SdrPaintView
Change-Id: If4ae6eb38351a9d7dec547d02bbb5a700af5ec64
Reviewed-on: https://gerrit.libreoffice.org/65397
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdrpaintwindow.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svdpntv.hxx | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index c99c578f0da3..8c833d85926c 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -138,9 +138,6 @@ public: OutputDevice& GetTargetOutputDevice() { if(mpPreRenderDevice) return mpPreRenderDevice->GetPreRenderDevice(); else return *mpOutputDevice.get(); } }; -// typedefs for a list of SdrPaintWindows -typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; - #endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 8af3d7710d04..2913850ed04b 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -87,10 +87,7 @@ public: explicit SvxViewChangedHint(); }; -/// Typedefs for a list of SdrPaintWindows class SdrPaintWindow; -typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; - /** * Helper to convert any GDIMetaFile to a good quality BitmapEx, @@ -150,7 +147,7 @@ protected: // Container aPagV; // List of SdrPageViews // All windows this view is displayed on - SdrPaintWindowVector maPaintWindows; + std::vector< std::unique_ptr<SdrPaintWindow> > maPaintWindows; Size maGridBig; // FIXME: We need to get rid of this eventually Size maGridFin; // FIXME: We need to get rid of this eventually @@ -228,7 +225,7 @@ protected: Color maGridColor; // Interface to SdrPaintWindow - void RemovePaintWindow(SdrPaintWindow& rOld); + void DeletePaintWindow(SdrPaintWindow& rOld); void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, ConfigurationHints ) override; public: |