Audit LoseFocus - basctl, cui, dbaccess.

Change-Id: If61b45f28f30e3ab00dbf071198233d59899d719
This commit is contained in:
Michael Meeks
2015-05-01 14:34:23 +01:00
parent c6f0b726e6
commit 9d17e1250a
6 changed files with 23 additions and 6 deletions

View File

@@ -420,6 +420,11 @@ namespace svx
implUpdateDisplay(); implUpdateDisplay();
} }
bool SuggestionDisplay::hasCurrentControl()
{
return m_bDisplayListBox || m_aValueSet;
}
Control& SuggestionDisplay::implGetCurrentControl() Control& SuggestionDisplay::implGetCurrentControl()
{ {
if( m_bDisplayListBox ) if( m_bDisplayListBox )
@@ -445,11 +450,17 @@ namespace svx
} }
void SuggestionDisplay::GetFocus() void SuggestionDisplay::GetFocus()
{ {
implGetCurrentControl().GetFocus(); if (hasCurrentControl())
implGetCurrentControl().GetFocus();
else
Control::LoseFocus();
} }
void SuggestionDisplay::LoseFocus() void SuggestionDisplay::LoseFocus()
{ {
implGetCurrentControl().LoseFocus(); if (hasCurrentControl())
implGetCurrentControl().LoseFocus();
else
Control::LoseFocus();
} }
void SuggestionDisplay::Command( const CommandEvent& rCEvt ) void SuggestionDisplay::Command( const CommandEvent& rCEvt )
{ {

View File

@@ -85,6 +85,7 @@ namespace svx
private: private:
void implUpdateDisplay(); void implUpdateDisplay();
bool hasCurrentControl();
Control& implGetCurrentControl(); Control& implGetCurrentControl();
private: private:

View File

@@ -1594,7 +1594,6 @@ void OFieldDescControl::implFocusLost(vcl::Window* _pWhich)
void OFieldDescControl::LoseFocus() void OFieldDescControl::LoseFocus()
{ {
implFocusLost(NULL); implFocusLost(NULL);
TabPage::LoseFocus(); TabPage::LoseFocus();

View File

@@ -68,11 +68,16 @@ void OTableWindowTitle::GetFocus()
{ {
if(m_pTabWin) if(m_pTabWin)
m_pTabWin->GetFocus(); m_pTabWin->GetFocus();
else
FixedText::GetFocus();
} }
void OTableWindowTitle::LoseFocus() void OTableWindowTitle::LoseFocus()
{ {
m_pTabWin->LoseFocus(); if (m_pTabWin)
m_pTabWin->LoseFocus();
else
FixedText::LoseFocus();
} }
void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt ) void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt )

View File

@@ -106,7 +106,8 @@ void OFieldDescGenWin::GetFocus()
void OFieldDescGenWin::LoseFocus() void OFieldDescGenWin::LoseFocus()
{ {
m_pFieldControl->LoseFocus(); if (m_pFieldControl)
m_pFieldControl->LoseFocus();
TabPage::LoseFocus(); TabPage::LoseFocus();
} }

View File

@@ -2832,7 +2832,7 @@ SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, bool bHit ) const
SvTreeListEntry* SvTreeListBox::GetCurEntry() const SvTreeListEntry* SvTreeListBox::GetCurEntry() const
{ {
return pImp->GetCurEntry(); return pImp ? pImp->GetCurEntry() : NULL;
} }
void SvTreeListBox::ImplInitStyle() void SvTreeListBox::ImplInitStyle()