Kaydet (Commit) 9eece764 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

remove redundant initialization

Change-Id: I6b6021b8b89c6fdac570432386bdb11b752c66aa
Reviewed-on: https://gerrit.libreoffice.org/48798Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 623a87a3
...@@ -2642,14 +2642,10 @@ HelpSettings::operator !=( const HelpSettings& rSet ) const ...@@ -2642,14 +2642,10 @@ HelpSettings::operator !=( const HelpSettings& rSet ) const
ImplAllSettingsData::ImplAllSettingsData() ImplAllSettingsData::ImplAllSettingsData()
: :
maLocale( LANGUAGE_SYSTEM ), maLocale( LANGUAGE_SYSTEM ),
mnWindowUpdate( AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE |
AllSettingsFlags::MISC | AllSettingsFlags::LOCALE ),
maUILocale( LANGUAGE_SYSTEM ) maUILocale( LANGUAGE_SYSTEM )
{ {
mnWindowUpdate = AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE |
AllSettingsFlags::MISC | AllSettingsFlags::LOCALE;
mpLocaleDataWrapper = nullptr;
mpUILocaleDataWrapper = nullptr;
mpI18nHelper = nullptr;
mpUII18nHelper = nullptr;
if (!utl::ConfigManager::IsFuzzing()) if (!utl::ConfigManager::IsFuzzing())
maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() ); maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() );
} }
...@@ -2660,16 +2656,10 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) : ...@@ -2660,16 +2656,10 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
maMiscSettings( rData.maMiscSettings ), maMiscSettings( rData.maMiscSettings ),
maHelpSettings( rData.maHelpSettings ), maHelpSettings( rData.maHelpSettings ),
maLocale( rData.maLocale ), maLocale( rData.maLocale ),
mnWindowUpdate( rData.mnWindowUpdate ),
maUILocale( rData.maUILocale ) maUILocale( rData.maUILocale )
{ {
mnWindowUpdate = rData.mnWindowUpdate; // Create the cache objects new when their getter is called.
// 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;
} }
ImplAllSettingsData::~ImplAllSettingsData() ImplAllSettingsData::~ImplAllSettingsData()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment