Kaydet (Commit) 37c719d9 authored tarafından Mark Vecsernyes's avatar Mark Vecsernyes Kaydeden (comit) Tamás Zolnai

tdf#114122 - Double click in special character dialog inserts a character

Change-Id: I8f8db851363344091294e2af43aba289ac160d98
Reviewed-on: https://gerrit.libreoffice.org/45952Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 5bb95b3d
......@@ -519,10 +519,12 @@ void SvxCharacterMap::init()
for(int i = 0; i < 16; i++)
{
m_pRecentCharView[i]->SetHasInsert(m_bHasInsert);
m_pRecentCharView[i]->setMouseClickHdl(LINK(this,SvxCharacterMap, CharClickHdl));
m_pRecentCharView[i]->setClearClickHdl(LINK(this,SvxCharacterMap, RecentClearClickHdl));
m_pRecentCharView[i]->setClearAllClickHdl(LINK(this,SvxCharacterMap, RecentClearAllClickHdl));
m_pRecentCharView[i]->SetLoseFocusHdl(LINK(this,SvxCharacterMap, LoseFocusHdl));
m_pFavCharView[i]->SetHasInsert(m_bHasInsert);
m_pFavCharView[i]->setMouseClickHdl(LINK(this,SvxCharacterMap, CharClickHdl));
m_pFavCharView[i]->setClearClickHdl(LINK(this,SvxCharacterMap, FavClearClickHdl));
m_pFavCharView[i]->setClearAllClickHdl(LINK(this,SvxCharacterMap, FavClearAllClickHdl));
......
......@@ -30,6 +30,7 @@ public:
void SetFont( const vcl::Font& rFont );
void SetText( const OUString& rText ) override;
void SetHasInsert( bool bInsert );
void InsertCharToDoc();
void createContextMenu();
......@@ -55,6 +56,7 @@ private:
long mnY;
Point maPosition;
vcl::Font maFont;
bool maHasInsert;
Link<SvxCharView*, void> maMouseClickHdl;
Link<SvxCharView*, void> maClearClickHdl;
......
......@@ -34,6 +34,7 @@ SvxCharView::SvxCharView(vcl::Window* pParent)
: Control(pParent, WB_TABSTOP | WB_BORDER)
, mnY(0)
, maPosition(0,0)
, maHasInsert(true)
{
}
......@@ -45,7 +46,7 @@ void SvxCharView::MouseButtonDown( const MouseEvent& rMEvt )
if ( rMEvt.IsLeft() )
{
if ( !(rMEvt.GetClicks() % 2) )
if ( !(rMEvt.GetClicks() % 2) && maHasInsert )
{
InsertCharToDoc();
}
......@@ -260,3 +261,8 @@ void SvxCharView::SetText( const OUString& rText )
Control::SetText( rText );
Invalidate();
}
void SvxCharView::SetHasInsert( bool bInsert )
{
maHasInsert = bInsert;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment