diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 04ce8d9be68d..d7f1b6517b2f 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -99,7 +99,6 @@ namespace svt DECL_DLLPRIVATE_LINK(OnComboLoseFocus, weld::Widget&, void); DECL_DLLPRIVATE_LINK(OnComboSelect, weld::ComboBox&, void); DECL_DLLPRIVATE_LINK(OnOkClicked, weld::Button&, void); - DECL_DLLPRIVATE_LINK(OnDelayedInitialize, void*, void); // string to display for "no selection" const OUString m_sNoFieldSelection; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 150e79ac85c9..8877108e899d 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -606,10 +606,14 @@ void AssignmentPersistentData::ImplCommit() for (sal_Int32 i = 0; iaLogicalFieldNames.push_back(sLogicalFieldNames.getToken(0, ';', nIdx)); - Application::PostUserEvent(LINK(this, AddressBookSourceDialog, OnDelayedInitialize), nullptr, false); + // load the initial data from the configuration + loadConfiguration(); + resetTables(); + // will reset the tables/fields implicitly - // so the dialog will at least show up before we do the loading of the - // configuration data and the (maybe time consuming) analysis of the data source/table to select + if ( !m_pImpl->bWorkingPersistent ) + if ( m_pImpl->pFields[0] ) + m_pImpl->pFields[0]->grab_focus(); if (m_pImpl->bWorkingPersistent) return; @@ -998,18 +1002,6 @@ void AssignmentPersistentData::ImplCommit() pBox->set_active(0); } - IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize, void*, void) - { - // load the initial data from the configuration - loadConfiguration(); - resetTables(); - // will reset the tables/fields implicitly - - if ( !m_pImpl->bWorkingPersistent ) - if ( m_pImpl->pFields[0] ) - m_pImpl->pFields[0]->grab_focus(); - } - IMPL_LINK(AddressBookSourceDialog, OnComboSelect, weld::ComboBox&, rBox, void) { if (&rBox == m_xDatasource.get())