diff options
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 14 | ||||
-rw-r--r-- | include/vcl/weld.hxx | 3 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/prnsetup.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/compressgraphicdialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/envlop1.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/label1.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 222 | ||||
-rw-r--r-- | sw/source/ui/misc/impfnote.hxx | 57 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/endnotepage.ui | 68 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/footnotepage.ui | 98 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 2 |
17 files changed, 182 insertions, 316 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index c579c55059c7..ac0fffe42bdf 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -432,7 +432,7 @@ void SvxCharacterMap::init() } if (bFound) - m_xFontLB->set_active(aDefStr); + m_xFontLB->set_active_text(aDefStr); else if (m_xFontLB->get_count() ) m_xFontLB->set_active(0); FontSelectHdl(*m_xFontLB); @@ -559,7 +559,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) if (m_xFontLB->find_text(aTmp.GetFamilyName()) == -1) return; - m_xFontLB->set_active(aTmp.GetFamilyName()); + m_xFontLB->set_active_text(aTmp.GetFamilyName()); aFont = aTmp; FontSelectHdl(*m_xFontLB); } @@ -708,7 +708,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, weld::ComboBoxText&, void) if( pSubsetMap ) curSubset = pSubsetMap->GetSubsetByUnicode( m_xSearchSet->GetSelectCharacter() ); if( curSubset ) - m_xSubsetLB->set_active(curSubset->GetName()); + m_xSubsetLB->set_active_text(curSubset->GetName()); else m_xSubsetLB->set_active(-1); @@ -947,7 +947,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) if( pSubsetMap ) pSubset = pSubsetMap->GetSubsetByUnicode( cChar ); if( pSubset ) - m_xSubsetLB->set_active(pSubset->GetName()); + m_xSubsetLB->set_active_text(pSubset->GetName()); else m_xSubsetLB->set_active(-1); } @@ -1006,7 +1006,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchCharHighlightHdl, SvxShowCharSet*, void) if( pSubsetMap ) pSubset = pSubsetMap->GetSubsetByUnicode( cChar ); if( pSubset ) - m_xSubsetLB->set_active(pSubset->GetName()); + m_xSubsetLB->set_active_text(pSubset->GetName()); else m_xSubsetLB->set_active(-1); } @@ -1063,7 +1063,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) setFavButtonState(OUString(&cChar, 1), aFont.GetFamilyName()); const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar ); if( pSubset ) - m_xSubsetLB->set_active(pSubset->GetName()); + m_xSubsetLB->set_active_text(pSubset->GetName()); } m_xOKBtn->set_sensitive(true); @@ -1079,7 +1079,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchCharPreSelectHdl, SvxShowCharSet*, void) setFavButtonState(OUString(&cChar, 1), aFont.GetFamilyName()); const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar ); if( pSubset ) - m_xSubsetLB->set_active(pSubset->GetName()); + m_xSubsetLB->set_active_text(pSubset->GetName()); } m_xOKBtn->set_sensitive(true); diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index d15d593ecc7f..77f985965c90 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -231,6 +231,7 @@ public: virtual void insert(int pos, const OUString& rId, const OUString& rStr) = 0; void append(const OUString& rId, const OUString& rStr) { insert(-1, rId, rStr); } virtual void remove(int pos) = 0; + void remove_text(const OUString& rText) { remove(find_text(rText)); } virtual int find_text(const OUString& rStr) const = 0; virtual int find_id(const OUString& rId) const = 0; virtual int get_count() const = 0; @@ -241,7 +242,7 @@ public: void connect_changed(const Link<ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; } - void set_active(const OUString& rStr) { set_active(find_text(rStr)); } + void set_active_text(const OUString& rStr) { set_active(find_text(rStr)); } virtual void set_entry_text(const OUString& rStr) = 0; virtual void select_entry_region(int nStartPos, int nEndPos) = 0; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 267cdca90009..713f37f9b690 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1713,7 +1713,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void) { const Subset* pSubset = m_xSubsetMap->GetSubsetByUnicode(cChar); if (pSubset) - m_xFontsSubsetLB->set_active(pSubset->GetName()); + m_xFontsSubsetLB->set_active_text(pSubset->GetName()); else m_xFontsSubsetLB->set_active(-1); } diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 3d97febb7d30..aadae0d5bf04 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -34,7 +34,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, { for( unsigned int i = 0; i < nCount; i++ ) pBox->append_text( rPrinters[i] ); - pBox->set_active( pPrinter->GetName() ); + pBox->set_active_text(pPrinter->GetName()); } pBox->set_sensitive(nCount != 0); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 72ee8732f924..bfd9278767a5 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -89,7 +89,7 @@ void CompressGraphicsDialog::Initialize() m_xBtnCalculate.reset(m_xBuilder->weld_button("calculate")); m_xInterpolationCombo.reset(m_xBuilder->weld_combo_box_text("interpolation-method-combo")); - m_xInterpolationCombo->set_active("Lanczos"); + m_xInterpolationCombo->set_active_text("Lanczos"); m_xInterpolationCombo->connect_changed(LINK(this, CompressGraphicsDialog, NewInterpolationModifiedHdl)); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 6fcd3740d58f..b2f8cb2c3d7e 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -369,18 +369,18 @@ void SwMMResultPrintDialog::FillInPrinterSettings() if(!bMergePrinterExists) { SfxPrinter* pPrinter = pView->GetWrtShell().getIDocumentDeviceAccess().getPrinter( true ); - m_xPrinterLB->set_active(pPrinter->GetName()); + m_xPrinterLB->set_active_text(pPrinter->GetName()); } else { - m_xPrinterLB->set_active(xConfigItem->GetSelectedPrinter()); + m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter()); } sal_Int32 count = xConfigItem->GetMergedDocumentCount(); m_xToNF->set_value(count); m_xToNF->set_max(count); - m_xPrinterLB->set_active(xConfigItem->GetSelectedPrinter()); + m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter()); } void SwMMResultEmailDialog::FillInEmailSettings() diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index fb2a79760655..01a5f1139982 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -217,7 +217,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, aOpt.SetFontName(aTmpFont.GetFamilyName()); } - m_xFontLB->set_active(aOpt.GetFontName()); + m_xFontLB->set_active_text(aOpt.GetFontName()); if( bDelPrinter ) pPrt.disposeAndClear(); 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); } diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ea8d23ecde67..aa813f77fefd 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1642,7 +1642,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, weld::ComboBoxText&, rBox, v if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField) continue; if(AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField) - m_xTypeListBox->set_active( + m_xTypeListBox->set_active_text( pEntry->GetAuthorField(aCurInfo.nToxField)); else pEdits[i]->set_text( diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 79e9e6831fa9..afa467580c4f 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -64,50 +64,44 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) aOldOkHdl.Call( pBtn ); } -SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, +SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pParent, - bEN ? OString("EndnotePage") : OString("FootnotePage"), bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), + bEN ? OString("EndnotePage") : OString("FootnotePage"), &rSet) - , m_pNumCountBox(nullptr) - , m_pPosFT(nullptr) - , m_pPosPageBox(nullptr) - , m_pPosChapterBox(nullptr) - , m_pContEdit(nullptr) - , m_pContFromEdit(nullptr) , pSh(nullptr) , bPosDoc(false) , bEndNote(bEN) + , m_xNumViewBox(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("numberinglb"))) + , m_xOffsetLbl(m_xBuilder->weld_label("offset")) + , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf")) + , m_xNumCountBox(m_xBuilder->weld_combo_box_text("countinglb")) + , m_xPrefixED(m_xBuilder->weld_entry("prefix")) + , m_xSuffixED(m_xBuilder->weld_entry("suffix")) + , m_xPosFT(m_xBuilder->weld_label("pos")) + , m_xPosPageBox(m_xBuilder->weld_radio_button("pospagecb")) + , m_xPosChapterBox(m_xBuilder->weld_radio_button("posdoccb")) + , m_xStylesContainer(m_xBuilder->weld_combo_box_text("allstyles")) + , m_xParaTemplBox(m_xBuilder->weld_combo_box_text("parastylelb")) + , m_xPageTemplLbl(m_xBuilder->weld_label("pagestyleft")) + , m_xPageTemplBox(m_xBuilder->weld_combo_box_text("pagestylelb")) + , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box_text("charanchorstylelb")) + , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box_text("charstylelb")) + , m_xContEdit(m_xBuilder->weld_entry("conted")) + , m_xContFromEdit(m_xBuilder->weld_entry("contfromed")) { - get(m_pNumViewBox, "numberinglb"); - get(m_pOffsetLbl, "offset"); - get(m_pOffsetField, "offsetnf"); - get(m_pPrefixED, "prefix"); - get(m_pSuffixED, "suffix"); - + m_xNumViewBox->Reload(SwInsertNumTypes::Extended); if (!bEndNote) { - get(m_pNumCountBox, "countinglb"); - m_pNumCountBox->SetSelectHdl(LINK(this, SwEndNoteOptionPage, NumCountHdl)); - aNumDoc = m_pNumCountBox->GetEntry(FTNNUM_DOC); - aNumPage = m_pNumCountBox->GetEntry(FTNNUM_PAGE); - aNumChapter = m_pNumCountBox->GetEntry(FTNNUM_CHAPTER); - get(m_pPosPageBox, "pospagecb"); - m_pPosPageBox->SetClickHdl(LINK(this, SwEndNoteOptionPage, PosPageHdl)); - get(m_pPosChapterBox, "posdoccb"); - m_pPosChapterBox->SetClickHdl(LINK(this, SwEndNoteOptionPage, PosChapterHdl)); - get(m_pPosFT, "pos"); - get(m_pContEdit, "conted"); - get(m_pContFromEdit, "contfromed"); + m_xNumCountBox->connect_changed(LINK(this, SwEndNoteOptionPage, NumCountHdl)); + aNumDoc = m_xNumCountBox->get_text(FTNNUM_DOC); + aNumPage = m_xNumCountBox->get_text(FTNNUM_PAGE); + aNumChapter = m_xNumCountBox->get_text(FTNNUM_CHAPTER); + m_xPosPageBox->connect_clicked(LINK(this, SwEndNoteOptionPage, PosPageHdl)); + m_xPosChapterBox->connect_clicked(LINK(this, SwEndNoteOptionPage, PosChapterHdl)); } - get(m_pStylesContainer, "allstyles"); - get(m_pParaTemplBox, "parastylelb"); - get(m_pPageTemplLbl, "pagestyleft"); - get(m_pPageTemplBox, "pagestylelb"); - get(m_pFootnoteCharAnchorTemplBox, "charanchorstylelb"); - get(m_pFootnoteCharTextTemplBox, "charstylelb"); } SwEndNoteOptionPage::~SwEndNoteOptionPage() @@ -115,28 +109,6 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage() disposeOnce(); } -void SwEndNoteOptionPage::dispose() -{ - m_pNumViewBox.clear(); - m_pOffsetLbl.clear(); - m_pOffsetField.clear(); - m_pNumCountBox.clear(); - m_pPrefixED.clear(); - m_pSuffixED.clear(); - m_pPosFT.clear(); - m_pPosPageBox.clear(); - m_pPosChapterBox.clear(); - m_pStylesContainer.clear(); - m_pParaTemplBox.clear(); - m_pPageTemplLbl.clear(); - m_pPageTemplBox.clear(); - m_pFootnoteCharAnchorTemplBox.clear(); - m_pFootnoteCharTextTemplBox.clear(); - m_pContEdit.clear(); - m_pContFromEdit.clear(); - SfxTabPage::dispose(); -} - void SwEndNoteOptionPage::Reset( const SfxItemSet* ) { std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() ) @@ -144,7 +116,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) SfxObjectShell * pDocSh = SfxObjectShell::Current(); if (dynamic_cast<SwWebDocShell*>( pDocSh) ) - m_pStylesContainer->Hide(); + m_xStylesContainer->hide(); if ( bEndNote ) { @@ -156,20 +128,20 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) // set position (page, chapter) if ( rInf.ePos == FTNPOS_PAGE ) { - m_pPosPageBox->Check(); - m_pPageTemplLbl->Enable(false); - m_pPageTemplBox->Enable(false); + m_xPosPageBox->set_active(true); + m_xPageTemplLbl->set_sensitive(false); + m_xPageTemplBox->set_sensitive(false); } else { - m_pPosChapterBox->Check(); - m_pNumCountBox->RemoveEntry(aNumPage); - m_pNumCountBox->RemoveEntry(aNumChapter); + m_xPosChapterBox->set_active(true); + m_xNumCountBox->remove_text(aNumPage); + m_xNumCountBox->remove_text(aNumChapter); bPosDoc = true; } // reference tests - m_pContEdit->SetText(rInf.aQuoVadis); - m_pContFromEdit->SetText(rInf.aErgoSum); + m_xContEdit->set_text(rInf.aQuoVadis); + m_xContFromEdit->set_text(rInf.aErgoSum); // collected SelectNumbering(rInf.eNum); @@ -177,19 +149,19 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) // numbering // art - m_pNumViewBox->SelectNumberingType( pInf->aFormat.GetNumberingType()); - m_pOffsetField->SetValue(pInf->nFootnoteOffset + 1); - m_pPrefixED->SetText(pInf->GetPrefix().replaceAll("\t", "\\t")); // fdo#65666 - m_pSuffixED->SetText(pInf->GetSuffix().replaceAll("\t", "\\t")); + m_xNumViewBox->SelectNumberingType( pInf->aFormat.GetNumberingType()); + m_xOffsetField->set_value(pInf->nFootnoteOffset + 1); + m_xPrefixED->set_text(pInf->GetPrefix().replaceAll("\t", "\\t")); // fdo#65666 + m_xSuffixED->set_text(pInf->GetSuffix().replaceAll("\t", "\\t")); const SwCharFormat* pCharFormat = pInf->GetCharFormat( *pSh->GetView().GetDocShell()->GetDoc()); - m_pFootnoteCharTextTemplBox->SelectEntry(pCharFormat->GetName()); - m_pFootnoteCharTextTemplBox->SaveValue(); + m_xFootnoteCharTextTemplBox->set_active_text(pCharFormat->GetName()); + m_xFootnoteCharTextTemplBox->save_value(); pCharFormat = pInf->GetAnchorCharFormat( *pSh->GetDoc() ); - m_pFootnoteCharAnchorTemplBox->SelectEntry( pCharFormat->GetName() ); - m_pFootnoteCharAnchorTemplBox->SaveValue(); + m_xFootnoteCharAnchorTemplBox->set_active_text( pCharFormat->GetName() ); + m_xFootnoteCharAnchorTemplBox->save_value(); // styles special regions // paragraph @@ -198,50 +170,50 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); while(pStyle) { - m_pParaTemplBox->InsertEntry(pStyle->GetName()); + m_xParaTemplBox->append_text(pStyle->GetName()); pStyle = pStyleSheetPool->Next(); } OUString sStr; SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(bEndNote ? RES_POOLCOLL_ENDNOTE : RES_POOLCOLL_FOOTNOTE), sStr ); - if(LISTBOX_ENTRY_NOTFOUND == m_pParaTemplBox->GetEntryPos( sStr ) ) - m_pParaTemplBox->InsertEntry( sStr ); + if (m_xParaTemplBox->find_text(sStr) == -1) + m_xParaTemplBox->append_text(sStr); SwTextFormatColl* pColl = pInf->GetFootnoteTextColl(); if( !pColl ) - m_pParaTemplBox->SelectEntry( sStr ); // Default + m_xParaTemplBox->set_active_text(sStr); // Default else { OSL_ENSURE(!pColl->IsDefault(), "default style for footnotes is wrong"); - const sal_Int32 nPos = m_pParaTemplBox->GetEntryPos(pColl->GetName()); - if( LISTBOX_ENTRY_NOTFOUND != nPos ) - m_pParaTemplBox->SelectEntryPos( nPos ); + const int nPos = m_xParaTemplBox->find_text(pColl->GetName()); + if (nPos != -1) + m_xParaTemplBox->set_active( nPos ); else { - m_pParaTemplBox->InsertEntry(pColl->GetName()); - m_pParaTemplBox->SelectEntry(pColl->GetName()); + m_xParaTemplBox->append_text(pColl->GetName()); + m_xParaTemplBox->set_active_text(pColl->GetName()); } } // page - for( sal_uInt16 i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i ) - m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, OUString() )); + for (sal_uInt16 i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i) + m_xPageTemplBox->append_text(SwStyleNameMapper::GetUIName(i, OUString())); const size_t nCount = pSh->GetPageDescCnt(); for(size_t i = 0; i < nCount; ++i) { const SwPageDesc &rPageDesc = pSh->GetPageDesc(i); - if(LISTBOX_ENTRY_NOTFOUND == m_pPageTemplBox->GetEntryPos(rPageDesc.GetName())) - m_pPageTemplBox->InsertEntry(rPageDesc.GetName()); + if (m_xPageTemplBox->find_text(rPageDesc.GetName()) == -1) + m_xPageTemplBox->append_text(rPageDesc.GetName()); } - m_pPageTemplBox->SelectEntry( pInf->GetPageDesc( *pSh->GetDoc() )->GetName()); + m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName()); } VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr<SwEndNoteOptionPage>::Create( pParent.pParent, true, *rSet ); + return VclPtr<SwEndNoteOptionPage>::Create(pParent, true, *rSet); } // Different kinds of numbering; because the Listbox has varying numbers of @@ -263,13 +235,13 @@ void SwEndNoteOptionPage::SelectNumbering(SwFootnoteNum const eNum) default: assert(false); } - m_pNumCountBox->SelectEntry(sSelect); - NumCountHdl(*m_pNumCountBox); + m_xNumCountBox->set_active_text(sSelect); + NumCountHdl(*m_xNumCountBox); } SwFootnoteNum SwEndNoteOptionPage::GetNumbering() const { - const sal_Int32 nPos = m_pNumCountBox->GetSelectedEntryPos(); + const int nPos = m_xNumCountBox->get_active(); return static_cast<SwFootnoteNum>((bPosDoc) ? nPos + 2 : nPos); } @@ -277,55 +249,55 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) { pSh = &rShell; // collect character templates - m_pFootnoteCharTextTemplBox->Clear(); - m_pFootnoteCharAnchorTemplBox->Clear(); - ::FillCharStyleListBox(*m_pFootnoteCharTextTemplBox, + m_xFootnoteCharTextTemplBox->clear(); + m_xFootnoteCharAnchorTemplBox->clear(); + ::FillCharStyleListBox(*m_xFootnoteCharTextTemplBox, pSh->GetView().GetDocShell()); - ::FillCharStyleListBox(*m_pFootnoteCharAnchorTemplBox, + ::FillCharStyleListBox(*m_xFootnoteCharAnchorTemplBox, pSh->GetView().GetDocShell()); } // Handler behind the button to collect the footnote at the page. In this case // all kinds of numbering can be used. -IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, weld::Button&, void) { const SwFootnoteNum eNum = GetNumbering(); bPosDoc = false; - if(LISTBOX_ENTRY_NOTFOUND == m_pNumCountBox->GetEntryPos(aNumPage)) + if (m_xNumCountBox->find_text(aNumPage) == -1) { - m_pNumCountBox->InsertEntry(aNumPage, FTNNUM_PAGE); - m_pNumCountBox->InsertEntry(aNumChapter, FTNNUM_CHAPTER); + m_xNumCountBox->insert_text(FTNNUM_PAGE, aNumPage); + m_xNumCountBox->insert_text(FTNNUM_CHAPTER, aNumChapter); SelectNumbering(eNum); } - m_pPageTemplLbl->Enable(false); - m_pPageTemplBox->Enable(false); + m_xPageTemplLbl->set_sensitive(false); + m_xPageTemplBox->set_sensitive(false); } -IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, weld::ComboBoxText&, void) { bool bEnable = true; - if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectedEntryPos() ) + if (m_xNumCountBox->get_count() - 1 != m_xNumCountBox->get_active()) { bEnable = false; - m_pOffsetField->SetValue(1); + m_xOffsetField->set_value(1); } - m_pOffsetLbl->Enable(bEnable); - m_pOffsetField->Enable(bEnable); + m_xOffsetLbl->set_sensitive(bEnable); + m_xOffsetField->set_sensitive(bEnable); } // Handler behind the button to collect the footnote at the chapter or end of // the document. In this case no pagewise numbering can be used. -IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl, Button*, void) +IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl, weld::Button&, void) { if ( !bPosDoc ) SelectNumbering(FTNNUM_DOC); bPosDoc = true; - m_pNumCountBox->RemoveEntry(aNumPage); - m_pNumCountBox->RemoveEntry(aNumChapter); - m_pPageTemplLbl->Enable(); - m_pPageTemplBox->Enable(); + m_xNumCountBox->remove_text(aNumPage); + m_xNumCountBox->remove_text(aNumChapter); + m_xPageTemplLbl->set_sensitive(true); + m_xPageTemplBox->set_sensitive(true); } static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFormatName ) @@ -357,21 +329,21 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) { std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo()); - pInf->nFootnoteOffset = static_cast< sal_uInt16 >(m_pOffsetField->GetValue() -1); - pInf->aFormat.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() ); - pInf->SetPrefix(m_pPrefixED->GetText().replaceAll("\\t", "\t")); - pInf->SetSuffix(m_pSuffixED->GetText().replaceAll("\\t", "\t")); + pInf->nFootnoteOffset = m_xOffsetField->get_value() - 1; + pInf->aFormat.SetNumberingType(m_xNumViewBox->GetSelectedNumberingType() ); + pInf->SetPrefix(m_xPrefixED->get_text().replaceAll("\\t", "\t")); + pInf->SetSuffix(m_xSuffixED->get_text().replaceAll("\\t", "\t")); pInf->SetCharFormat( lcl_GetCharFormat( pSh, - m_pFootnoteCharTextTemplBox->GetSelectedEntry() ) ); + m_xFootnoteCharTextTemplBox->get_active_text() ) ); pInf->SetAnchorCharFormat( lcl_GetCharFormat( pSh, - m_pFootnoteCharAnchorTemplBox->GetSelectedEntry() ) ); + m_xFootnoteCharAnchorTemplBox->get_active_text() ) ); // paragraph template - sal_Int32 nPos = m_pParaTemplBox->GetSelectedEntryPos(); - if(LISTBOX_ENTRY_NOTFOUND != nPos) + int nPos = m_xParaTemplBox->get_active(); + if (nPos != -1) { - const OUString aFormatName( m_pParaTemplBox->GetSelectedEntry() ); + const OUString aFormatName( m_xParaTemplBox->get_active_text() ); SwTextFormatColl *pColl = pSh->GetParaStyle(aFormatName, SwWrtShell::GETSTYLE_CREATEANY); OSL_ENSURE(pColl, "paragraph style not found"); pInf->SetFootnoteTextColl(*pColl); @@ -379,7 +351,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) // page template pInf->ChgPageDesc( pSh->FindPageDescByName( - m_pPageTemplBox->GetSelectedEntry(), true ) ); + m_xPageTemplBox->get_active_text(), true ) ); if ( bEndNote ) { @@ -389,18 +361,18 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) else { SwFootnoteInfo *pI = static_cast<SwFootnoteInfo*>(pInf.get()); - pI->ePos = m_pPosPageBox->IsChecked() ? FTNPOS_PAGE : FTNPOS_CHAPTER; + pI->ePos = m_xPosPageBox->get_active() ? FTNPOS_PAGE : FTNPOS_CHAPTER; pI->eNum = GetNumbering(); - pI->aQuoVadis = m_pContEdit->GetText(); - pI->aErgoSum = m_pContFromEdit->GetText(); + pI->aQuoVadis = m_xContEdit->get_text(); + pI->aErgoSum = m_xContFromEdit->get_text(); if ( !(*pI == pSh->GetFootnoteInfo()) ) pSh->SetFootnoteInfo( *pI ); } return true; } -SwFootNoteOptionPage::SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ) : - SwEndNoteOptionPage( pParent, false, rSet ) +SwFootNoteOptionPage::SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet) + : SwEndNoteOptionPage(pParent, false, rSet) { } @@ -410,7 +382,7 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr<SwFootNoteOptionPage>::Create( pParent.pParent, *rSet ); + return VclPtr<SwFootNoteOptionPage>::Create(pParent, *rSet); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 386a345a1803..7bc3e9a20d8f 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -20,10 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_MISC_IMPFNOTE_HXX #include <sfx2/tabdlg.hxx> -#include <vcl/button.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/fixed.hxx> -#include <vcl/field.hxx> +#include <vcl/weld.hxx> #include <numberingtypelistbox.hxx> enum SwFootnoteNum : unsigned; @@ -31,28 +28,6 @@ class SwWrtShell; class SwEndNoteOptionPage : public SfxTabPage { - VclPtr<SwNumberingTypeListBox> m_pNumViewBox; - VclPtr<FixedText> m_pOffsetLbl; - VclPtr<NumericField> m_pOffsetField; - VclPtr<ListBox> m_pNumCountBox; - VclPtr<Edit> m_pPrefixED; - VclPtr<Edit> m_pSuffixED; - VclPtr<FixedText> m_pPosFT; - VclPtr<RadioButton> m_pPosPageBox; - VclPtr<RadioButton> m_pPosChapterBox; - - VclPtr<VclContainer> m_pStylesContainer; - - VclPtr<ListBox> m_pParaTemplBox; - VclPtr<FixedText> m_pPageTemplLbl; - VclPtr<ListBox> m_pPageTemplBox; - - VclPtr<ListBox> m_pFootnoteCharAnchorTemplBox; - VclPtr<ListBox> m_pFootnoteCharTextTemplBox; - - VclPtr<Edit> m_pContEdit; - VclPtr<Edit> m_pContFromEdit; - OUString aNumDoc; OUString aNumPage; OUString aNumChapter; @@ -60,18 +35,34 @@ class SwEndNoteOptionPage : public SfxTabPage bool bPosDoc; bool bEndNote; + std::unique_ptr<NumberingTypeListBox> m_xNumViewBox; + std::unique_ptr<weld::Label> m_xOffsetLbl; + std::unique_ptr<weld::SpinButton> m_xOffsetField; + std::unique_ptr<weld::ComboBoxText> m_xNumCountBox; + std::unique_ptr<weld::Entry> m_xPrefixED; + std::unique_ptr<weld::Entry> m_xSuffixED; + std::unique_ptr<weld::Label> m_xPosFT; + std::unique_ptr<weld::RadioButton> m_xPosPageBox; + std::unique_ptr<weld::RadioButton> m_xPosChapterBox; + std::unique_ptr<weld::Widget> m_xStylesContainer; + std::unique_ptr<weld::ComboBoxText> m_xParaTemplBox; + std::unique_ptr<weld::Label> m_xPageTemplLbl; + std::unique_ptr<weld::ComboBoxText> m_xPageTemplBox; + std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharAnchorTemplBox; + std::unique_ptr<weld::ComboBoxText> m_xFootnoteCharTextTemplBox; + std::unique_ptr<weld::Entry> m_xContEdit; + std::unique_ptr<weld::Entry> m_xContFromEdit; + inline void SelectNumbering(SwFootnoteNum eNum); SwFootnoteNum GetNumbering() const; - DECL_LINK(PosPageHdl, Button*, void); - DECL_LINK(PosChapterHdl, Button*, void); - DECL_LINK(NumCountHdl, ListBox&, void); + DECL_LINK(PosPageHdl, weld::Button&, void); + DECL_LINK(PosChapterHdl, weld::Button&, void); + DECL_LINK(NumCountHdl, weld::ComboBoxText&, void); public: - SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, - const SfxItemSet &rSet ); + SwEndNoteOptionPage(TabPageParent pParent, bool bEndNote, const SfxItemSet &rSet); virtual ~SwEndNoteOptionPage() override; - virtual void dispose() override; static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -83,7 +74,7 @@ public: class SwFootNoteOptionPage : public SwEndNoteOptionPage { friend class VclPtr<SwFootNoteOptionPage>; - SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); + SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet ); virtual ~SwFootNoteOptionPage() override; public: diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 537cc428e59a..046b1a21e20f 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -115,7 +115,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) if (!sStyleName.isEmpty()) { m_xCharStyleLB->append_text(sStyleName); - m_xCharStyleLB->set_active(sStyleName); + m_xCharStyleLB->set_active_text(sStyleName); } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index b8ad0a08c8c5..2083deff7b1f 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -787,7 +787,7 @@ bool SwDBManager::GetTableNames(weld::ComboBoxText& rBox, const OUString& rDBNam rBox.append("1", pQueries[i]); } if (!sOldTableName.isEmpty()) - rBox.set_active(sOldTableName); + rBox.set_active_text(sOldTableName); bRet = true; } return bRet; diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui index 3ae5c34d9a42..6f53059c3d8d 100644 --- a/sw/uiconfig/swriter/ui/endnotepage.ui +++ b/sw/uiconfig/swriter/ui/endnotepage.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.4 --> <interface domain="sw"> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">9999</property> @@ -36,56 +37,48 @@ <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label19">Numbering</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label22">Before</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="offset"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|offset">Start at</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label25">After</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -98,8 +91,6 @@ <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -107,12 +98,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -120,26 +110,22 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="swlo-SwNumberingTypeListBox" id="numberinglb"> + <object class="GtkComboBoxText" id="numberinglb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="type">16</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -191,52 +177,44 @@ <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label20">Paragraph</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="pagestyleft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|pagestyleft">Page</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="parastylelb"> + <object class="GtkComboBoxText" id="parastylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="pagestylelb"> + <object class="GtkComboBoxText" id="pagestylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -257,8 +235,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -283,52 +259,44 @@ <object class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label27">Text area</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="charanchorstylelb"> + <object class="GtkComboBoxText" id="charanchorstylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="charstylelb"> + <object class="GtkComboBoxText" id="charstylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -349,8 +317,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui index e6d24686d8e8..12de66949ca5 100644 --- a/sw/uiconfig/swriter/ui/footnotepage.ui +++ b/sw/uiconfig/swriter/ui/footnotepage.ui @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.20.4 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">9999</property> @@ -10,23 +9,6 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes" context="footnotepage|liststore1">Per page</col> - </row> - <row> - <col id="0" translatable="yes" context="footnotepage|liststore1">Per chapter</col> - </row> - <row> - <col id="0" translatable="yes" context="footnotepage|liststore1">Per document</col> - </row> - </data> - </object> <object class="GtkBox" id="FootnotePage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -61,8 +43,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -75,8 +55,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -89,8 +67,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -103,8 +79,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -117,8 +91,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -131,8 +103,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -152,8 +122,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -173,8 +141,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -182,26 +148,27 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="halign">start</property> + <property name="activates_default">True</property> <property name="adjustment">adjustment1</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="countinglb"> + <object class="GtkComboBoxText" id="countinglb"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">liststore1</property> + <items> + <item translatable="yes" context="footnotepage|liststore1">Per page</item> + <item translatable="yes" context="footnotepage|liststore1">Per chapter</item> + <item translatable="yes" context="footnotepage|liststore1">Per document</item> + </items> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -209,12 +176,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -222,26 +188,22 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">3</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="swlo-SwNumberingTypeListBox" id="numberinglb"> + <object class="GtkComboBoxText" id="numberinglb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="type">16</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -320,8 +282,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -334,32 +294,26 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="parastylelb"> + <object class="GtkComboBoxText" id="parastylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="pagestylelb"> + <object class="GtkComboBoxText" id="pagestylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -380,8 +334,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -412,8 +364,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -426,32 +376,26 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="charanchorstylelb"> + <object class="GtkComboBoxText" id="charanchorstylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="charstylelb"> + <object class="GtkComboBoxText" id="charstylelb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -472,8 +416,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -512,8 +454,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -526,8 +466,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -536,12 +474,11 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="max_length">30</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -550,12 +487,11 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="max_length">30</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 2762cba2a716..31d9b74d12ca 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -64,7 +64,7 @@ void RTSDialog::insertAllPPDValues(weld::ComboBoxText& rBox, const PPDParser* pP rBox.set_active(nPos); } else - rBox.set_active(m_aInvalidString); + rBox.set_active_text(m_aInvalidString); } /* |