summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-01 17:17:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-01 20:29:03 +0100
commit6d96902a3e25ebadc85666ddaf7c96e070ac99f5 (patch)
tree6bc02a8685fd641c161704a641e71ca0833c8ad2 /dbaccess
parent8dd1367a7a6cb30e773c1eff1d7e5dd487cf7766 (diff)
coverity#1242747 Uninitialized pointer field
Change-Id: I1530d071ad44afc114f1916bf234e0616b7dce90
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx9
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx3
2 files changed, 2 insertions, 10 deletions
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 0904d6d1967c..5018b582288d 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -63,10 +63,8 @@ namespace dbaui
:OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs)
,m_pOptionsLabel(NULL)
,m_pOptions(NULL)
- ,m_pDataConvertFixedLine(NULL)
,m_pCharsetLabel(NULL)
,m_pCharset(NULL)
- ,m_pAutoFixedLine(NULL)
,m_pAutoRetrievingEnabled(NULL)
,m_pAutoIncrementLabel(NULL)
,m_pAutoIncrement(NULL)
@@ -87,8 +85,8 @@ namespace dbaui
if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
{
- m_pDataConvertLabel = get<FixedText>("charsetheader");
- m_pDataConvertLabel->Show();
+ FixedText* pDataConvertLabel = get<FixedText>("charsetheader");
+ pDataConvertLabel->Show();
m_pCharsetLabel = get<FixedText>("charsetlabel");
m_pCharsetLabel->Show();
m_pCharset = get<CharSetListBox>("charset");
@@ -104,11 +102,9 @@ namespace dbaui
DELETEZ(m_pOptionsLabel);
DELETEZ(m_pOptions);
- DELETEZ(m_pDataConvertFixedLine);
DELETEZ(m_pCharsetLabel);
DELETEZ(m_pCharset);
- DELETEZ(m_pAutoFixedLine);
DELETEZ(m_pAutoIncrementLabel);
DELETEZ(m_pAutoIncrement);
@@ -128,7 +124,6 @@ namespace dbaui
if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
{
- //_rControlList.push_back(new ODisableWrapper<FixedLine>(m_pDataConvertFixedLine));
_rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharsetLabel));
}
}
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 6ffef01e1434..229b466384fa 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -53,12 +53,9 @@ namespace dbaui
FixedText* m_pOptionsLabel;
Edit* m_pOptions;
- FixedLine* m_pDataConvertFixedLine;
- FixedText* m_pDataConvertLabel;
FixedText* m_pCharsetLabel;
CharSetListBox* m_pCharset;
- FixedLine* m_pAutoFixedLine;
CheckBox* m_pAutoRetrievingEnabled;
FixedText* m_pAutoIncrementLabel;
Edit* m_pAutoIncrement;