diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-27 11:01:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-27 18:30:58 +0200 |
| commit | c275184ae37d145f428a459a07917e127bd67577 (patch) | |
| tree | 098dcd677a263e26252443ed79a5c4b85ea640ca /vcl/source/app/settings.cxx | |
| parent | 129f55097f926661f00919329fb28c6a85ecebbb (diff) | |
loplugin:makeshared in vcl
Change-Id: I990fafa8b01e94aef58d6cad30bc13de539ea496
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92968
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index f54f05814258..8db54992b80f 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -596,7 +596,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : mnUseFlatBorders(rData.mnUseFlatBorders), mbPreferredUseImagesInMenus(rData.mbPreferredUseImagesInMenus), mnMinThumbSize(rData.mnMinThumbSize), - mIconThemeScanner(rData.mIconThemeScanner?new vcl::IconThemeScanner(*rData.mIconThemeScanner):nullptr), mIconThemeSelector(std::make_shared<vcl::IconThemeSelector>(*rData.mIconThemeSelector)), mIconTheme(rData.mIconTheme), mbSkipDisabledInMenus(rData.mbSkipDisabledInMenus), @@ -618,6 +617,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : maPersonaFooterBitmap( rData.maPersonaFooterBitmap ), maPersonaMenuBarTextColor( rData.maPersonaMenuBarTextColor ) { + if (rData.mIconThemeScanner) + mIconThemeScanner = std::make_shared<vcl::IconThemeScanner>(*rData.mIconThemeScanner); } void ImplStyleData::SetStandardStyles() |