1 files changed, 109 insertions, 313 deletions

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index dd8d638dedaa..7d1cd2259d1c 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <thesdlg.hxx>
-#include "thesdlg_impl.hxx"
 #include <strings.hrc>
 #include <dialmgr.hxx>
 
@@ -52,222 +51,28 @@
 
 using namespace ::com::sun::star;
 
-// class LookUpComboBox --------------------------------------------------
-
-LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
-    : ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP)
-    , m_aModifyIdle("cui LookUpComboBox Modify")
-    , m_pDialog(nullptr)
-{
-    EnableAutoSize(true);
-
-    m_aModifyIdle.SetInvokeHandler( LINK( this, LookUpComboBox, ModifyTimer_Hdl ) );
-    m_aModifyIdle.SetPriority( TaskPriority::LOWEST );
-
-    EnableAutocomplete( false );
-}
-
-LookUpComboBox::~LookUpComboBox()
-{
-    disposeOnce();
-}
-
-void LookUpComboBox::dispose()
-{
-    m_pDialog.clear();
-    ComboBox::dispose();
-}
-
-VCL_BUILDER_FACTORY(LookUpComboBox)
-
-void LookUpComboBox::init(SvxThesaurusDialog *pDialog)
+IMPL_LINK_NOARG( SvxThesaurusDialog, ModifyTimer_Hdl, Timer *, void )
 {
-    m_pDialog = pDialog;
-}
-
-void LookUpComboBox::Modify()
-{
-    m_aModifyIdle.Start();
-}
-
-IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Timer *, void )
-{
-    m_pDialog->LookUp( GetText() );
+    LookUp(m_xWordCB->get_active_text());
     m_aModifyIdle.Stop();
 }
 
-// class ReplaceEdit --------------------------------------------------
-
-ReplaceEdit::ReplaceEdit(vcl::Window *pParent)
-    : Edit(pParent, WB_BORDER | WB_TABSTOP)
-    , m_pBtn(nullptr)
-{
-}
-
-ReplaceEdit::~ReplaceEdit()
-{
-    disposeOnce();
-}
-
-void ReplaceEdit::dispose()
-{
-    m_pBtn.clear();
-    Edit::dispose();
-}
-
-VCL_BUILDER_FACTORY(ReplaceEdit)
-
-void ReplaceEdit::Modify()
-{
-    if (m_pBtn)
-        m_pBtn->Enable( !GetText().isEmpty() );
-}
-
-void ReplaceEdit::SetText( const OUString& rStr )
-{
-    Edit::SetText( rStr );
-    Modify();
-}
-
-void ReplaceEdit::SetText( const OUString& rStr, const Selection& rNewSelection )
-{
-    Edit::SetText( rStr, rNewSelection );
-    Modify();
-}
-
-// class ThesaurusAlternativesCtrl ----------------------------------
-
-AlternativesString::AlternativesString( ThesaurusAlternativesCtrl &rControl, const OUString& rStr ) :
-    SvLBoxString( rStr ),
-    m_rControlImpl( rControl )
-{
-}
-
-void AlternativesString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext,
-                               const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry)
-{
-    AlternativesExtraData* pData = m_rControlImpl.GetExtraData(&rEntry);
-    Point aPos(rPos);
-    rRenderContext.Push(PushFlags::FONT);
-    if (pData && pData->IsHeader())
-    {
-        vcl::Font aFont(rRenderContext.GetFont());
-        aFont.SetWeight(WEIGHT_BOLD);
-        rRenderContext.SetFont(aFont);
-        aPos.setX( 0 );
-    }
-    else
-        aPos.AdjustX(5 );
-    rRenderContext.DrawText(aPos, GetText());
-    rRenderContext.Pop();
-}
-
-ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent)
-    : SvxCheckListBox(pParent)
-    , m_pDialog(nullptr)
-{
-    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL );
-    SetForceMakeVisible(true);
-    SetHighlightRange();
-}
-
-VCL_BUILDER_FACTORY(ThesaurusAlternativesCtrl)
-
-void ThesaurusAlternativesCtrl::init(SvxThesaurusDialog *pDialog)
-{
-    m_pDialog = pDialog;
-}
-
-ThesaurusAlternativesCtrl::~ThesaurusAlternativesCtrl()
-{
-    disposeOnce();
-}
-
-void ThesaurusAlternativesCtrl::dispose()
-{
-    ClearExtraData();
-    m_pDialog.clear();
-    SvxCheckListBox::dispose();
-}
-
-void ThesaurusAlternativesCtrl::ClearExtraData()
+IMPL_LINK_NOARG(SvxThesaurusDialog, ReplaceEditHdl_Impl, weld::Entry&, void)
 {
-    UserDataMap_t   aEmpty;
-    m_aUserData.swap( aEmpty );
+    m_xReplaceBtn->set_sensitive(!m_xReplaceEdit->get_text().isEmpty());
 }
 
-void ThesaurusAlternativesCtrl::SetExtraData(
-    const SvTreeListEntry *pEntry,
-    const AlternativesExtraData &rData )
-{
-    if (!pEntry)
-        return;
-
-    UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
-    if (aIt != m_aUserData.end())
-        aIt->second = rData;
-    else
-        m_aUserData[ pEntry ] = rData;
-}
-
-AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData(
-    const SvTreeListEntry *pEntry )
-{
-    AlternativesExtraData *pRes = nullptr;
-    UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
-    if (aIt != m_aUserData.end())
-        pRes = &aIt->second;
-    return pRes;
-}
-
-SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const OUString &rText, bool bIsHeader )
-{
-    SvTreeListEntry* pEntry = new SvTreeListEntry;
-    OUString aText;
-    if (bIsHeader && nVal >= 0)
-    {
-        aText = OUString::number( nVal ) + ". ";
-    }
-    pEntry->AddItem(std::make_unique<SvLBoxString>(OUString())); // add empty column
-    aText += rText;
-    pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise crash
-    pEntry->AddItem(std::make_unique<AlternativesString>(*this, aText));
-
-    SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) );
-    GetModel()->Insert( pEntry );
-
-    if (bIsHeader)
-        GetViewDataEntry( pEntry )->SetSelectable( false );
-
-    return pEntry;
-}
-
-void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt )
+IMPL_LINK(SvxThesaurusDialog, KeyInputHdl, const KeyEvent&, rKEvt, bool)
 {
     const vcl::KeyCode& rKey = rKEvt.GetKeyCode();
 
-    if (rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_ESCAPE)
-        GetParent()->KeyInput( rKEvt ); // parent will close dialog...
-    else if (rKey.GetCode() == KEY_SPACE)
-        m_pDialog->AlternativesDoubleClickHdl_Impl( this ); // look up current selected entry
-    else if (GetEntryCount())
-        SvxCheckListBox::KeyInput( rKEvt );
-}
-
-void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
-{
-    if (!m_pDialog->WordFound())
+    if (rKey.GetCode() == KEY_RETURN)
     {
-        Size aTextSize(rRenderContext.GetTextWidth(m_pDialog->getErrStr()), rRenderContext.GetTextHeight());
-        aTextSize  = rRenderContext.LogicToPixel(aTextSize);
-        Point aPos;
-        aPos.AdjustX(GetSizePixel().Width() / 2  - aTextSize.Width() / 2 );
-        aPos.AdjustY(GetSizePixel().Height() / 2 );
-        aPos = rRenderContext.PixelToLogic(aPos);
-        rRenderContext.DrawText(aPos, m_pDialog->getErrStr());
+        m_xDialog->response(RET_OK);
+        return true;
     }
-    else
-        SvxCheckListBox::Paint(rRenderContext, rRect);
+
+    return false;
 }
 
 uno::Sequence< uno::Reference< linguistic2::XMeaning > > SvxThesaurusDialog::queryMeanings_Impl(
@@ -302,12 +107,10 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl()
     const sal_Int32 nMeanings = aMeanings.getLength();
     const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray();
 
-    m_pAlternativesCT->SetUpdateMode( false );
-
-    // clear old user data of control before creating new ones via AddEntry below
-    m_pAlternativesCT->ClearExtraData();
+    m_xAlternativesCT->freeze();
 
-    m_pAlternativesCT->Clear();
+    m_xAlternativesCT->clear();
+    int nRow = 0;
     for (sal_Int32 i = 0;  i < nMeanings;  ++i)
     {
         OUString rMeaningTxt = pMeanings[i]->getMeaning();
@@ -317,37 +120,45 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl()
         DBG_ASSERT( !rMeaningTxt.isEmpty(), "meaning with empty text" );
         DBG_ASSERT( nSynonyms > 0, "meaning without synonym" );
 
-        m_pAlternativesCT->AddEntry( i + 1, rMeaningTxt, true );
-        for (sal_Int32 k = 0;  k < nSynonyms;  ++k)
-            m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false );
+        OUString sHeading = OUString::number(i + 1) + ". " + rMeaningTxt;
+        m_xAlternativesCT->append_text(sHeading);
+        m_xAlternativesCT->set_text_emphasis(nRow, true, 0);
+
+        ++nRow;
+        for (sal_Int32 k = 0;  k < nSynonyms; ++k)
+        {
+            // GetThesaurusReplaceText will strip the leading spaces
+            m_xAlternativesCT->append_text("   " + pSynonyms[k]);
+            ++nRow;
+        }
     }
 
-    m_pAlternativesCT->SetUpdateMode( true );
+    m_xAlternativesCT->thaw();
 
     return nMeanings > 0;
 }
 
 void SvxThesaurusDialog::LookUp( const OUString &rText )
 {
-    if (rText != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same
-        m_pWordCB->SetText( rText );
+    if (rText != m_xWordCB->get_active_text()) // avoid moving of the cursor if the text is the same
+        m_xWordCB->set_entry_text(rText);
     LookUp_Impl();
 }
 
-IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void )
+IMPL_LINK_NOARG(SvxThesaurusDialog, LeftBtnHdl_Impl, weld::Button&, void)
 {
-    if (pBtn && aLookUpHistory.size() >= 2)
+    if (aLookUpHistory.size() >= 2)
     {
         aLookUpHistory.pop();                       // remove current look up word from stack
-        m_pWordCB->SetText( aLookUpHistory.top() );    // retrieve previous look up word
+        m_xWordCB->set_entry_text(aLookUpHistory.top()); // retrieve previous look up word
         aLookUpHistory.pop();
         LookUp_Impl();
     }
 }
 
-IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void )
+IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, weld::ComboBox&, rLB, void )
 {
-    OUString aLangText( rLB.GetSelectedEntry() );
+    OUString aLangText(rLB.get_active_text());
     LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText );
     DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" );
     if (xThesaurus->hasLocale( LanguageTag::convertToLocale( nLang ) ))
@@ -358,7 +169,7 @@ IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void )
 
 void SvxThesaurusDialog::LookUp_Impl()
 {
-    OUString aText( m_pWordCB->GetText() );
+    OUString aText(m_xWordCB->get_active_text());
 
     aLookUpText = aText;
     if (!aLookUpText.isEmpty() &&
@@ -366,107 +177,105 @@ void SvxThesaurusDialog::LookUp_Impl()
         aLookUpHistory.push( aLookUpText );
 
     m_bWordFound = UpdateAlternativesBox_Impl();
-    m_pAlternativesCT->Enable( m_bWordFound );
+    m_xAlternativesCT->set_visible(m_bWordFound);
+    m_xNotFound->set_visible(!m_bWordFound);
+
+    if (m_bWordFound)
+        Application::PostUserEvent(LINK(this, SvxThesaurusDialog, SelectFirstHdl_Impl));
 
-    if ( m_pWordCB->GetEntryPos( aText ) == LISTBOX_ENTRY_NOTFOUND )
-        m_pWordCB->InsertEntry( aText );
+    if (m_xWordCB->find_text(aText) == -1)
+        m_xWordCB->append_text(aText);
 
-    m_pReplaceEdit->SetText( OUString() );
-    m_pLeftBtn->Enable( aLookUpHistory.size() > 1 );
+    m_xReplaceEdit->set_text( OUString() );
+    ReplaceEditHdl_Impl(*m_xReplaceEdit);
+    m_xLeftBtn->set_sensitive( aLookUpHistory.size() > 1 );
 }
 
-IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void )
+IMPL_LINK_NOARG(SvxThesaurusDialog, WordSelectHdl_Impl, weld::ComboBox&, void)
 {
-    if (!m_pWordCB->IsTravelSelect())  // act only upon return key and not when traveling with cursor keys
-    {
-        const sal_Int32 nPos = rBox.GetSelectedEntryPos();
-        OUString aStr( rBox.GetEntry( nPos ) );
-        aStr = linguistic::GetThesaurusReplaceText( aStr );
-        m_pWordCB->SetText( aStr );
-        LookUp_Impl();
-    }
+    m_aModifyIdle.Start();
 }
 
-IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void )
+IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, weld::TreeView&, rBox, void )
 {
-    SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr;
-    if (pEntry)
+    int nEntry = rBox.get_selected_index();
+    if (nEntry != -1)
     {
-        AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
-        OUString aStr;
-        if (pData && !pData->IsHeader())
+        bool bIsHeader = rBox.get_text_emphasis(nEntry, 0);
+        if (bIsHeader)
         {
-            aStr = pData->GetText();
-            aStr = linguistic::GetThesaurusReplaceText( aStr );
+            ++nEntry;
+            rBox.select(nEntry);
         }
-        m_pReplaceEdit->SetText( aStr );
+        OUString aStr = linguistic::GetThesaurusReplaceText(rBox.get_text(nEntry));
+        m_xReplaceEdit->set_text(aStr);
+        ReplaceEditHdl_Impl(*m_xReplaceEdit);
     }
 }
 
-IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool )
+IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, weld::TreeView&, rBox, void )
 {
-    SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr;
-    if (pEntry)
+    int nEntry = rBox.get_selected_index();
+    if (nEntry != -1)
     {
-        AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
-        OUString aStr;
-        if (pData && !pData->IsHeader())
+        bool bIsHeader = rBox.get_text_emphasis(nEntry, 0);
+        if (bIsHeader)
         {
-            aStr = pData->GetText();
-            aStr = linguistic::GetThesaurusReplaceText( aStr );
+            ++nEntry;
+            rBox.select(nEntry);
         }
-
-        m_pWordCB->SetText( aStr );
+        OUString aStr = linguistic::GetThesaurusReplaceText(rBox.get_text(nEntry));
+        m_xWordCB->set_entry_text(aStr);
         if (!aStr.isEmpty())
             LookUp_Impl();
     }
 
     //! workaround to set the selection since calling SelectEntryPos within
     //! the double click handler does not work
-    Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox, true );
-    return false;
+    Application::PostUserEvent(LINK(this, SvxThesaurusDialog, SelectFirstHdl_Impl));
 }
 
-IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void )
+IMPL_LINK_NOARG(SvxThesaurusDialog, SelectFirstHdl_Impl, void *, void)
 {
-    SvxCheckListBox* pBox = static_cast<SvxCheckListBox*>(p);
-    if (pBox && pBox->GetEntryCount() >= 2)
-        pBox->SelectEntryPos( 1 );  // pos 0 is a 'header' that is not selectable
+    if (m_xAlternativesCT->n_children() >= 2)
+    {
+        m_xAlternativesCT->select(1);  // pos 0 is a 'header' that is not selectable
+        AlternativesSelectHdl_Impl(*m_xAlternativesCT);
+    }
 }
 
 // class SvxThesaurusDialog ----------------------------------------------
 
 SvxThesaurusDialog::SvxThesaurusDialog(
-    vcl::Window* pParent,
+    weld::Window* pParent,
     uno::Reference< linguistic2::XThesaurus > const & xThes,
     const OUString &rWord,
     LanguageType nLanguage)
-    : SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
-    , m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND))
+    : SfxDialogController(pParent, "cui/ui/thesaurus.ui", "ThesaurusDialog")
+    , m_aModifyIdle("cui SvxThesaurusDialog LookUp Modify")
     , aLookUpText()
     , nLookUpLanguage(LANGUAGE_NONE)
     , m_bWordFound(false)
-{
-    get(m_pLeftBtn, "left");
-
-    get(m_pWordCB, "wordcb");
-    m_pWordCB->init(this);
-
-    get(m_pAlternativesCT, "alternatives");
-    m_pAlternativesCT->init(this);
-
-    get(m_pReplaceEdit, "replaceed");
-    PushButton *pReplaceBtn = get<PushButton>("replace");
-    m_pReplaceEdit->init(pReplaceBtn);
-
-    get(m_pLangLB, "langcb");
+    , m_xLeftBtn(m_xBuilder->weld_button("left"))
+    , m_xWordCB(m_xBuilder->weld_combo_box("wordcb"))
+    , m_xAlternativesCT(m_xBuilder->weld_tree_view("alternatives"))
+    , m_xNotFound(m_xBuilder->weld_label("notfound"))
+    , m_xReplaceEdit(m_xBuilder->weld_entry("replaceed"))
+    , m_xLangLB(m_xBuilder->weld_combo_box("langcb"))
+    , m_xReplaceBtn(m_xBuilder->weld_button("ok"))
+{
+    m_aModifyIdle.SetInvokeHandler( LINK( this, SvxThesaurusDialog, ModifyTimer_Hdl ) );
+    m_aModifyIdle.SetPriority( TaskPriority::LOWEST );
 
-    pReplaceBtn->SetClickHdl( LINK( this, SvxThesaurusDialog, ReplaceBtnHdl_Impl ) );
-    m_pLeftBtn->SetClickHdl( LINK( this, SvxThesaurusDialog, LeftBtnHdl_Impl ) );
-    m_pWordCB->SetSelectHdl( LINK( this, SvxThesaurusDialog, WordSelectHdl_Impl ) );
-    m_pLangLB->SetSelectHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) );
-    m_pAlternativesCT->SetSelectHdl( LINK( this, SvxThesaurusDialog, AlternativesSelectHdl_Impl ));
-    m_pAlternativesCT->SetDoubleClickHdl( LINK( this, SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl ));
+    m_xReplaceEdit->connect_changed( LINK( this, SvxThesaurusDialog, ReplaceEditHdl_Impl ) );
+    m_xReplaceBtn->connect_clicked( LINK( this, SvxThesaurusDialog, ReplaceBtnHdl_Impl ) );
+    m_xLeftBtn->connect_clicked( LINK( this, SvxThesaurusDialog, LeftBtnHdl_Impl ) );
+    m_xWordCB->set_entry_completion(false);
+    m_xWordCB->connect_changed( LINK( this, SvxThesaurusDialog, WordSelectHdl_Impl ) );
+    m_xLangLB->connect_changed( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) );
+    m_xAlternativesCT->connect_changed( LINK( this, SvxThesaurusDialog, AlternativesSelectHdl_Impl ));
+    m_xAlternativesCT->connect_row_activated( LINK( this, SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl ));
+    m_xAlternativesCT->connect_key_press(LINK(this, SvxThesaurusDialog, KeyInputHdl));
 
     xThesaurus = xThes;
     aLookUpText = rWord;
@@ -477,12 +286,13 @@ SvxThesaurusDialog::SvxThesaurusDialog(
     OUString aTmp( rWord );
     (void)linguistic::RemoveHyphens( aTmp );
     (void)linguistic::ReplaceControlChars( aTmp );
-    m_pReplaceEdit->SetText( aTmp );
-    m_pWordCB->InsertEntry( aTmp );
+    m_xReplaceEdit->set_text( aTmp );
+    ReplaceEditHdl_Impl(*m_xReplaceEdit);
+    m_xWordCB->append_text( aTmp );
 
     LookUp( aTmp );
-    m_pAlternativesCT->GrabFocus();
-    m_pLeftBtn->Enable( false );
+    m_xAlternativesCT->grab_focus();
+    m_xLeftBtn->set_sensitive(false);
 
     // fill language menu button list
     uno::Sequence< lang::Locale > aLocales;
@@ -490,7 +300,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
         aLocales = xThesaurus->getLocales();
     const sal_Int32 nLocales = aLocales.getLength();
     const lang::Locale *pLocales = aLocales.getConstArray();
-    m_pLangLB->Clear();
+    m_xLangLB->clear();
     std::vector< OUString > aLangVec;
     for (sal_Int32 i = 0;  i < nLocales; ++i)
     {
@@ -499,62 +309,48 @@ SvxThesaurusDialog::SvxThesaurusDialog(
         aLangVec.push_back( SvtLanguageTable::GetLanguageString( nLang ) );
     }
     std::sort( aLangVec.begin(), aLangVec.end() );
+    m_xLangLB->freeze();
     for (OUString & i : aLangVec)
-        m_pLangLB->InsertEntry( i );
+        m_xLangLB->append_text(i);
+    m_xLangLB->thaw();
 
     std::vector< OUString >::iterator aI = std::find(aLangVec.begin(), aLangVec.end(),
             SvtLanguageTable::GetLanguageString(nLanguage));
     if (aI != aLangVec.end())
     {
-        m_pLangLB->SelectEntry(*aI);
+        m_xLangLB->set_active_text(*aI);
     }
 
     SetWindowTitle(nLanguage);
 
     // disable controls if service is missing
     if (!xThesaurus.is())
-        Enable( false );
+        m_xDialog->set_sensitive(false);
 }
 
 SvxThesaurusDialog::~SvxThesaurusDialog()
 {
-    disposeOnce();
 }
 
-void SvxThesaurusDialog::dispose()
+IMPL_LINK_NOARG(SvxThesaurusDialog, ReplaceBtnHdl_Impl, weld::Button&, void)
 {
-    m_pLeftBtn.clear();
-    m_pWordCB.clear();
-    m_pAlternativesCT.clear();
-    m_pReplaceEdit.clear();
-    m_pLangLB.clear();
-    SvxStandardDialog::dispose();
-}
-
-IMPL_LINK_NOARG( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void )
-{
-    EndDialog(RET_OK);
+    m_xDialog->response(RET_OK);
 }
 
 void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
 {
     // adjust language
-    OUString aStr( GetText() );
+    OUString aStr(m_xDialog->get_title());
     sal_Int32 nIndex = aStr.indexOf( '(' );
     if( nIndex != -1 )
         aStr = aStr.copy( 0, nIndex - 1 );
     aStr += " (" + SvtLanguageTable::GetLanguageString( nLanguage ) + ")";
-    SetText( aStr );    // set window title
+    m_xDialog->set_title(aStr);    // set window title
 }
 
 OUString SvxThesaurusDialog::GetWord()
 {
-    return m_pReplaceEdit->GetText();
-}
-
-
-void SvxThesaurusDialog::Apply()
-{
+    return m_xReplaceEdit->get_text();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */