Kaydet (Commit) f287292d authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in OfaViewTabPage

Change-Id: I0a9f7fd5738a06ac60762b3242721df1634b4264
Reviewed-on: https://gerrit.libreoffice.org/56326
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst aac20c5b
......@@ -705,12 +705,9 @@ OfaViewTabPage::~OfaViewTabPage()
void OfaViewTabPage::dispose()
{
delete mpDrawinglayerOpt;
mpDrawinglayerOpt = nullptr;
delete pCanvasSettings;
pCanvasSettings = nullptr;
delete pAppearanceCfg;
pAppearanceCfg = nullptr;
mpDrawinglayerOpt.reset();
pCanvasSettings.reset();
pAppearanceCfg.reset();
m_pIconSizeLB.clear();
m_pSidebarIconSizeLB.clear();
m_pNotebookbarIconSizeLB.clear();
......@@ -1290,8 +1287,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
void OfaLanguagesTabPage::dispose()
{
delete pLangConfig;
pLangConfig = nullptr;
pLangConfig.reset();
m_pUserInterfaceLB.clear();
m_pLocaleSettingFT.clear();
m_pLocaleSettingLB.clear();
......
......@@ -112,9 +112,9 @@ private:
sal_Int32 nNotebookbarSizeLB_InitialSelection;
sal_Int32 nStyleLB_InitialSelection;
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
std::unique_ptr<SvtTabAppearanceCfg> pAppearanceCfg;
std::unique_ptr<CanvasSettings> pCanvasSettings;
std::unique_ptr<SvtOptionsDrawinglayer> mpDrawinglayerOpt;
std::unique_ptr<svt::OpenGLCfg> mpOpenGLConfig;
std::vector<vcl::IconThemeInfo> mInstalledIconThemes;
......@@ -160,7 +160,7 @@ class OfaLanguagesTabPage : public SfxTabPage
bool m_bOldAsian;
bool m_bOldCtl;
LanguageConfig_Impl* pLangConfig;
std::unique_ptr<LanguageConfig_Impl> pLangConfig;
OUString m_sUserLocaleValue;
OUString m_sSystemDefaultString;
......
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