summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-07-19 12:05:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-07-20 08:58:56 +0200
commit8caf5129d46d1ebfdd66ebe4dd3d8463ad1aa035 (patch)
tree38551b0cdcebe56c0b50bc0f6468e34d9b9298ec
parentc6acb048e6f40ead4110750a79eeb3d6d6d5865d (diff)
loplugin:useuniqueptr in ScImportOptionsDlg
Change-Id: I7d3a7a72c5de2915822ebb4cc73a504e65ce04a6 Reviewed-on: https://gerrit.libreoffice.org/57750 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx12
-rw-r--r--sc/source/ui/inc/scuiimoptdlg.hxx4
2 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index b67b692de098..ab8371865a6b 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -139,8 +139,8 @@ ScImportOptionsDlg::ScImportOptionsDlg(
sFieldSep = sFieldSep.replaceFirst( "%SPACE", ScResId(SCSTR_FIELDSEP_SPACE) );
// not possible in the Ctor initializer (MSC cannot do that):
- pFieldSepTab = new ScDelimiterTable(sFieldSep);
- pTextSepTab = new ScDelimiterTable(SCSTR_TEXTSEP);
+ pFieldSepTab.reset( new ScDelimiterTable(sFieldSep) );
+ pTextSepTab.reset( new ScDelimiterTable(SCSTR_TEXTSEP) );
OUString aStr = pFieldSepTab->FirstDel();
sal_Unicode nCode;
@@ -265,8 +265,8 @@ ScImportOptionsDlg::~ScImportOptionsDlg()
void ScImportOptionsDlg::dispose()
{
- delete pFieldSepTab;
- delete pTextSepTab;
+ pFieldSepTab.reset();
+ pTextSepTab.reset();
m_pEncGrid.clear();
m_pFieldFrame.clear();
m_pFtCharset.clear();
@@ -305,9 +305,9 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
sal_uInt16 nCode;
if ( &rEd == m_pEdTextSep )
- pTab = pTextSepTab;
+ pTab = pTextSepTab.get();
else
- pTab = pFieldSepTab;
+ pTab = pFieldSepTab.get();
if ( aStr.isEmpty() )
{
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index 7b0ec78987a1..fdc70bc026ab 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -59,8 +59,8 @@ private:
VclPtr<OKButton> m_pBtnOk;
- ScDelimiterTable* pFieldSepTab;
- ScDelimiterTable* pTextSepTab;
+ std::unique_ptr<ScDelimiterTable> pFieldSepTab;
+ std::unique_ptr<ScDelimiterTable> pTextSepTab;
bool m_bIsAsciiImport;