diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-01 14:34:23 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-02 00:49:58 +0200 |
| commit | 9d17e1250acb7c5c60cdf8d71476c5873b8b4a9b (patch) | |
| tree | 12275c42a88e9299398fe9b465660212ac91cdbe /dbaccess | |
| parent | c6f0b726e605df49074e2ddc668fa4c6f070c170 (diff) | |
Audit LoseFocus - basctl, cui, dbaccess.
Change-Id: If61b45f28f30e3ab00dbf071198233d59899d719
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index a6fb6d753efe..3cce5975a3a1 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1594,7 +1594,6 @@ void OFieldDescControl::implFocusLost(vcl::Window* _pWhich) void OFieldDescControl::LoseFocus() { - implFocusLost(NULL); TabPage::LoseFocus(); diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index a0fba532d142..f1f3149862f0 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -68,11 +68,16 @@ void OTableWindowTitle::GetFocus() { if(m_pTabWin) m_pTabWin->GetFocus(); + else + FixedText::GetFocus(); } void OTableWindowTitle::LoseFocus() { - m_pTabWin->LoseFocus(); + if (m_pTabWin) + m_pTabWin->LoseFocus(); + else + FixedText::LoseFocus(); } void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt ) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 3252a5dd510a..7931fee33ba8 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -106,7 +106,8 @@ void OFieldDescGenWin::GetFocus() void OFieldDescGenWin::LoseFocus() { - m_pFieldControl->LoseFocus(); + if (m_pFieldControl) + m_pFieldControl->LoseFocus(); TabPage::LoseFocus(); } |