diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-27 16:31:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-29 15:33:51 +0200 |
| commit | 288b9a3e22c2495c24d6fd195bd8f33a990a9b81 (patch) | |
| tree | e04f783784bbb2f44712161ab983d74781fdee49 /sw/source/ui/envelp | |
| parent | 71fa42a61f98e57f433f6ab5bb98ec8aa50dacfa (diff) | |
weld SwEndNoteOptionPage
Change-Id: I2313352a66b088a4198ac8a96d2fd218bb2176fd
Reviewed-on: https://gerrit.libreoffice.org/53608
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envlop1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index e7ae5d3a4ea1..9d25bf201544 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -292,7 +292,7 @@ void SwEnvPage::InitDatabaseBox() OUString sDBName = m_sActDBName.getToken( 0, DB_DELIM ); OUString sTableName = m_sActDBName.getToken( 1, DB_DELIM ); - m_xDatabaseLB->set_active(sDBName); + m_xDatabaseLB->set_active_text(sDBName); if (m_pSh->GetDBManager()->GetTableNames(*m_xTableLB, sDBName)) { m_xTableLB->append_text(sTableName); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index c8768e85b995..58be1b68c62c 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -378,7 +378,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, weld::ComboBoxText&, void) m_xTypeBox->append_text(m_xHiddenSortTypeBox->get_text(nEntry)); } if (nLstType) - m_xTypeBox->set_active(aItem.m_aLstType); + m_xTypeBox->set_active_text(aItem.m_aLstType); else m_xTypeBox->set_active(0); TypeHdl(*m_xTypeBox); @@ -433,10 +433,10 @@ void SwLabPage::InitDatabaseBox() m_xDatabaseLB->append_text(pDataNames[i]); OUString sDBName = sActDBName.getToken( 0, DB_DELIM ); OUString sTableName = sActDBName.getToken( 1, DB_DELIM ); - m_xDatabaseLB->set_active(sDBName); + m_xDatabaseLB->set_active_text(sDBName); if( !sDBName.isEmpty() && GetDBManager()->GetTableNames(*m_xTableLB, sDBName)) { - m_xTableLB->set_active(sTableName); + m_xTableLB->set_active_text(sTableName); GetDBManager()->GetColumnNames(*m_xDBFieldLB, sActDBName, sTableName); } else @@ -519,7 +519,7 @@ void SwLabPage::Reset(const SfxItemSet* rSet) m_xMakeBox->append_text(*i); } - m_xMakeBox->set_active(aItem.m_aMake); + m_xMakeBox->set_active_text(aItem.m_aMake); //save the current type OUString sType(aItem.m_aType); MakeHdl(*m_xMakeBox); @@ -529,12 +529,12 @@ void SwLabPage::Reset(const SfxItemSet* rSet) GetParentSwLabDlg()->UpdateGroup( aItem.m_aMake ); if (m_xTypeBox->find_text(aItem.m_aType) != -1) { - m_xTypeBox->set_active(aItem.m_aType); + m_xTypeBox->set_active_text(aItem.m_aType); TypeHdl(*m_xTypeBox); } if (m_xDatabaseLB->find_text(sDBName) != -1) { - m_xDatabaseLB->set_active(sDBName); + m_xDatabaseLB->set_active_text(sDBName); DatabaseHdl(*m_xDatabaseLB); } |