fdo#64302: Writer’s Special Character dialog could be simpler

Change-Id: Ia321a9df77a8741245378e5b995b3bc6922266e8
Reviewed-on: https://gerrit.libreoffice.org/11621Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>

cui/source/dialogs/cuicharmap.cxx

@@ -53,8 +53,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte
     m_pShowChar->SetCentered(true);
     get(m_pShowText, "showtext");
     get(m_pOKBtn, "ok");
-    get(m_pDeleteBtn, "delete");
-    get(m_pDeleteLastBtn, "deletelast");
     get(m_pFontText, "fontft");
     get(m_pFontLB, "fontlb");
     m_pFontLB->SetStyle(m_pFontLB->GetStyle() | WB_SORT);
@@ -67,8 +65,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte
     //lock the size request of this widget to the width of the original .ui string
     m_pCharCodeText->set_width_request(m_pCharCodeText->get_preferred_size().Width());
     get(m_pSymbolText, "symboltext");
-    //lock the size request of this widget to double the height of the label
-    m_pShowText->set_height_request(m_pSymbolText->get_preferred_size().Height() * 3);
 
     SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, false );
     if ( pItem )
@@ -318,8 +314,6 @@ void SvxCharacterMap::init()
     {
         m_pSymbolText->Hide();
         m_pShowText->Hide();
-        m_pDeleteBtn->Hide();
-        m_pDeleteLastBtn->Hide();
     }
 
     OUString aDefStr( aFont.GetName() );
@@ -368,8 +362,6 @@ void SvxCharacterMap::init()
     m_pShowSet->SetSelectHdl( LINK( this, SvxCharacterMap, CharSelectHdl ) );
     m_pShowSet->SetHighlightHdl( LINK( this, SvxCharacterMap, CharHighlightHdl ) );
     m_pShowSet->SetPreSelectHdl( LINK( this, SvxCharacterMap, CharPreSelectHdl ) );
-    m_pDeleteLastBtn->SetClickHdl( LINK( this, SvxCharacterMap, DeleteLastHdl ) );
-    m_pDeleteBtn->SetClickHdl( LINK( this, SvxCharacterMap, DeleteHdl ) );
 
     if( SvxShowCharSet::getSelectedChar() == ' ')
         m_pOKBtn->Disable();
@@ -526,7 +518,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
 
     }
     m_pOKBtn->Enable();
-    m_pDeleteLastBtn->Enable();
     return 0;
 }
 
@@ -586,26 +577,4 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
     return 0;
 }
 
-
-
-IMPL_LINK_NOARG(SvxCharacterMap, DeleteLastHdl)
-{
-    OUString aCurrentText = m_pShowText->GetText();
-    m_pShowText->SetText( aCurrentText.copy( 0, aCurrentText.getLength() - 1 ) );
-    if ( m_pShowText->GetText() == "" )
-    {
-        m_pOKBtn->Disable();
-        m_pDeleteLastBtn->Disable();
-    }
-    return 0;
-}
-
-IMPL_LINK_NOARG(SvxCharacterMap, DeleteHdl)
-{
-    m_pShowText->SetText( OUString() );
-    m_pOKBtn->Disable();
-    m_pDeleteLastBtn->Disable();
-    return 0;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/cuicharmap.hxx

@@ -69,10 +69,8 @@ private:
     void            init();
 
     SvxShowCharSet* m_pShowSet;
-    SvxShowText*    m_pShowText;
+    Edit*           m_pShowText;
     OKButton*       m_pOKBtn;
-    PushButton*     m_pDeleteLastBtn;
-    PushButton*     m_pDeleteBtn;
     FixedText*      m_pFontText;
     ListBox*        m_pFontLB;
     FixedText*      m_pSubsetText;
@@ -91,8 +89,6 @@ private:
     DECL_LINK(CharSelectHdl, void *);
     DECL_LINK(CharHighlightHdl, void *);
     DECL_LINK(CharPreSelectHdl, void *);
-    DECL_LINK(DeleteLastHdl, void *);
-    DECL_LINK(DeleteHdl, void *);
 
     void fillAllSubsets(ListBox &rListBox);