diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-01-28 18:54:33 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-29 07:31:29 +0100 |
| commit | 9eece764a75020623f9723b61fff75faa446b098 (patch) | |
| tree | 12b8dd932b6351f95093f7cbcc8fb6ecd785282b /vcl | |
| parent | 623a87a3c338a9b4cdc5d9753388b5956006b8b4 (diff) | |
remove redundant initialization
Change-Id: I6b6021b8b89c6fdac570432386bdb11b752c66aa
Reviewed-on: https://gerrit.libreoffice.org/48798
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/settings.cxx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 883bde42e80a..1284abaf79a7 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2642,14 +2642,10 @@ HelpSettings::operator !=( const HelpSettings& rSet ) const ImplAllSettingsData::ImplAllSettingsData() : maLocale( LANGUAGE_SYSTEM ), + mnWindowUpdate( AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE | + AllSettingsFlags::MISC | AllSettingsFlags::LOCALE ), maUILocale( LANGUAGE_SYSTEM ) { - mnWindowUpdate = AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE | - AllSettingsFlags::MISC | AllSettingsFlags::LOCALE; - mpLocaleDataWrapper = nullptr; - mpUILocaleDataWrapper = nullptr; - mpI18nHelper = nullptr; - mpUII18nHelper = nullptr; if (!utl::ConfigManager::IsFuzzing()) maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() ); } @@ -2660,16 +2656,10 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) : maMiscSettings( rData.maMiscSettings ), maHelpSettings( rData.maHelpSettings ), maLocale( rData.maLocale ), + mnWindowUpdate( rData.mnWindowUpdate ), maUILocale( rData.maUILocale ) { - mnWindowUpdate = rData.mnWindowUpdate; - // Pointer couldn't shared and objects haven't a copy ctor - // So we create the cache objects new, if the GetFunction is - // called - mpLocaleDataWrapper = nullptr; - mpUILocaleDataWrapper = nullptr; - mpI18nHelper = nullptr; - mpUII18nHelper = nullptr; + // Create the cache objects new when their getter is called. } ImplAllSettingsData::~ImplAllSettingsData() |