diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-12-24 20:46:53 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-26 07:17:38 +0100 |
| commit | c2ae5bc29b7064a599871358e6a4bb7b1dec2b85 (patch) | |
| tree | aab5fddf878f40fae52802878bb9e3acc2ef7f9d /include/svtools | |
| parent | loplugin:passstuffbyref improved return in canvas and svtools (diff) | |
| download | core-c2ae5bc29b7064a599871358e6a4bb7b1dec2b85.tar.gz core-c2ae5bc29b7064a599871358e6a4bb7b1dec2b85.zip | |
svtools: Use std::unique_ptr for LineListBox
This also inlines LineListBox::ImplInit(). Note that m_vLineList
never contains nullptr.
Change-Id: Ia4798943fbb53e1720d51faff7643e46d2cd2585
Reviewed-on: https://gerrit.libreoffice.org/47046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/ctrlbox.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 6e0358721885..b446b7a0503d 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -31,12 +31,12 @@ #include <com/sun/star/table/BorderLineStyle.hpp> #include <o3tl/typed_flags_set.hxx> +#include <memory> class FontList; class ImpLineListData; enum class SvxBorderLineStyle : sal_Int16; -typedef ::std::vector< ImpLineListData* > ImpLineList; typedef ::std::vector< FontMetric > ImplFontList; /************************************************************************* @@ -232,7 +232,6 @@ private: Color nColor1, Color nColor2, Color nColorDist, SvxBorderLineStyle nStyle, Bitmap& rBmp ); using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -247,7 +246,7 @@ private: LineListBox( const LineListBox& ) = delete; LineListBox& operator =( const LineListBox& ) = delete; - ImpLineList* pLineList; + std::vector<std::unique_ptr<ImpLineListData>> m_vLineList; long m_nWidth; OUString m_sNone; ScopedVclPtr<VirtualDevice> aVirDev; |