summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sfx2/charmapcontrol.hxx1
-rw-r--r--sfx2/source/control/charmapcontrol.cxx5
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 5b0dbcca811e..a0b74430d9ea 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -50,6 +50,7 @@ private:
std::deque<OUString> maFavCharList;
std::deque<OUString> maFavCharFontList;
VclPtr<Button> maDlgBtn;
+ bool mbNeedsInit = true;
DECL_LINK(CharClickHdl, SvxCharViewControl*, void);
DECL_STATIC_LINK(SfxCharmapCtrl, FocusHdl, Control&, void);
diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index 7f757a7eb4df..6534a9b1efc6 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -184,7 +184,6 @@ void SfxCharmapCtrl::updateRecentCharControl()
bool SfxCharmapCtrl::EventNotify( NotifyEvent& rNEvt )
{
- static bool bNeedsInit = true;
if ( maDlgBtn->HasFocus() && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode();
@@ -193,14 +192,14 @@ bool SfxCharmapCtrl::EventNotify( NotifyEvent& rNEvt )
{
return true;
}
- if ( bNeedsInit && nCode == KEY_TAB )
+ if ( mbNeedsInit && nCode == KEY_TAB )
{
for(int i = 0; i < 16; i++)
{
m_pRecentCharView[i]->set_property( "can-focus", "true" );
m_pFavCharView[i]->set_property( "can-focus", "true" );
}
- bNeedsInit = false;
+ mbNeedsInit = false;
}
}
return SfxPopupWindow::EventNotify( rNEvt );