summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-04 20:29:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-05 10:43:00 +0100
commit3d3cb7808b4ca2ce10b16644846e6709d98e593c (patch)
tree039b434801de5ab90f3bca0855fac39ee06e6564
parent0c47fc7c0520b1a012443283c2662391090b8e95 (diff)
turn DateFormatter::ImplInit into initializer list
Change-Id: If58b8f5c65f7d920dd3a186cf648db605799b790 Reviewed-on: https://gerrit.libreoffice.org/84464 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/vcl/field.hxx4
-rw-r--r--vcl/source/control/field2.cxx34
2 files changed, 15 insertions, 23 deletions
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index e7c193dad617..01256da135a5 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -267,7 +267,7 @@ public:
class VCL_DLLPUBLIC DateFormatter : public FormatterBase
{
private:
- std::unique_ptr<CalendarWrapper> mpCalendarWrapper;
+ std::unique_ptr<CalendarWrapper> mxCalendarWrapper;
Date maFieldDate;
Date maLastDate;
Date maMin;
@@ -277,8 +277,6 @@ private:
ExtDateFieldFormat mnExtDateFormat;
bool mbEnforceValidValue;
- SAL_DLLPRIVATE void ImplInit();
-
protected:
DateFormatter(Edit* pEdit);
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 7652af9dd165..3b4c51ce0832 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1397,23 +1397,17 @@ void DateField::ImplDateSpinArea( bool bUp )
}
}
-void DateFormatter::ImplInit()
-{
- mbLongFormat = false;
- mbShowDateCentury = true;
- mpCalendarWrapper = nullptr;
- mnExtDateFormat = ExtDateFieldFormat::SystemShort;
-}
-
-DateFormatter::DateFormatter(Edit* pEdit) :
- FormatterBase(pEdit),
- maFieldDate( 0 ),
- maLastDate( 0 ),
- maMin( 1, 1, 1900 ),
- maMax( 31, 12, 2200 ),
- mbEnforceValidValue( true )
+DateFormatter::DateFormatter(Edit* pEdit)
+ : FormatterBase(pEdit)
+ , maFieldDate(0)
+ , maLastDate(0)
+ , maMin(1, 1, 1900)
+ , maMax(31, 12, 2200)
+ , mbLongFormat(false)
+ , mbShowDateCentury(true)
+ , mnExtDateFormat(ExtDateFieldFormat::SystemShort)
+ , mbEnforceValidValue(true)
{
- ImplInit();
}
DateFormatter::~DateFormatter()
@@ -1422,13 +1416,13 @@ DateFormatter::~DateFormatter()
CalendarWrapper& DateFormatter::GetCalendarWrapper() const
{
- if ( !mpCalendarWrapper )
+ if (!mxCalendarWrapper)
{
- const_cast<DateFormatter*>(this)->mpCalendarWrapper.reset( new CalendarWrapper( comphelper::getProcessComponentContext() ) );
- mpCalendarWrapper->loadDefaultCalendar( GetLocale() );
+ const_cast<DateFormatter*>(this)->mxCalendarWrapper.reset( new CalendarWrapper( comphelper::getProcessComponentContext() ) );
+ mxCalendarWrapper->loadDefaultCalendar( GetLocale() );
}
- return *mpCalendarWrapper;
+ return *mxCalendarWrapper;
}
void DateFormatter::SetExtDateFormat( ExtDateFieldFormat eFormat )