summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-08 09:00:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-02-08 10:41:06 +0000
commitd8baaf43b0a5f384c35ea4a7a8cac7ede7d0fb90 (patch)
tree0eac096aabb402e97d8b65edd897a659149410e5 /vcl
parent1428e9e0ab5a54f5f68c92748cfe29fee864b73a (diff)
coverity#1400144 Uninitialized pointer field
Change-Id: Ie7031679c60b70eb8a79062cdd0353c3da1550e4
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/i18n_cb.hxx33
1 files changed, 23 insertions, 10 deletions
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index a63905db5548..ceaf53eb3826 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -46,13 +46,22 @@ Bool IsControlCode(sal_Unicode nChar);
} /* extern "C" */
-typedef struct {
- sal_Unicode *pUnicodeBuffer;
- XIMFeedback *pCharStyle;
- unsigned int nCursorPos;
- unsigned int nLength;
- unsigned int nSize;
-} preedit_text_t;
+struct preedit_text_t
+{
+ sal_Unicode *pUnicodeBuffer;
+ XIMFeedback *pCharStyle;
+ unsigned int nCursorPos;
+ unsigned int nLength;
+ unsigned int nSize;
+ preedit_text_t()
+ : pUnicodeBuffer(nullptr)
+ , pCharStyle(nullptr)
+ , nCursorPos(0)
+ , nLength(0)
+ , nSize(0)
+ {
+ }
+};
class SalFrame;
@@ -63,14 +72,18 @@ enum class PreeditStatus {
StartPending
};
-struct preedit_data_t {
+struct preedit_data_t
+{
SalFrame* pFrame;
PreeditStatus eState;
preedit_text_t aText;
SalExtTextInputEvent aInputEv;
std::vector< ExtTextInputAttr > aInputFlags;
-
- preedit_data_t() : eState(PreeditStatus::DontKnow) {}
+ preedit_data_t()
+ : pFrame(nullptr)
+ , eState(PreeditStatus::DontKnow)
+ {
+ }
};
#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX