diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-24 13:35:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-29 17:03:32 +0200 |
| commit | 89f470752d0ecc2a389aa8f630800a195a341a6d (patch) | |
| tree | 01846e210a6decbcabf7b9d9b9a88ee5452f371a /include/svtools | |
| parent | a369e6bbd539caf59ccbb10d374c8aeab72054db (diff) | |
loplugin:useuniqueptr in Calendar
and remove some unused fields
Change-Id: I66a40bae01a5186185383b1ec827d7da5d0b483e
Reviewed-on: https://gerrit.libreoffice.org/53592
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/calendar.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index b140ca01a64f..753ecad1f606 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -27,6 +27,7 @@ #include <vcl/ctrl.hxx> #include <vcl/timer.hxx> #include <vcl/field.hxx> +#include <memory> #include <set> class MouseEvent; @@ -124,8 +125,8 @@ typedef std::set<sal_Int32> IntDateSet; class SVT_DLLPUBLIC Calendar final : public Control { - IntDateSet* mpSelectTable; - IntDateSet* mpOldSelectTable; + std::unique_ptr<IntDateSet> mpSelectTable; + std::unique_ptr<IntDateSet> mpOldSelectTable; OUString maDayTexts[31]; OUString maDayText; OUString maWeekText; @@ -144,9 +145,6 @@ class SVT_DLLPUBLIC Calendar final : public Control Date maDropDate; Color maSelColor; Color maOtherColor; - Color* mpStandardColor; - Color* mpSaturdayColor; - Color* mpSundayColor; sal_Int32 mnDayCount; long mnDaysOffX; long mnWeekDayOffY; @@ -188,7 +186,6 @@ class SVT_DLLPUBLIC Calendar final : public Control SVT_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear, - DayOfWeek eDayOfWeek, bool bOther, sal_Int32 nToday); SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); |