diff options
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/multipat.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/srchxtra.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/certpath.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 6 | ||||
-rw-r--r-- | include/vcl/weld.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/protectiondlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 |
10 files changed, 13 insertions, 11 deletions
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index d6ab5d30e4ac..6813a96904c4 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -231,7 +231,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::s m_xLanguageLB->set_size_request(-1, m_xLanguageLB->get_height_rows(10)); m_xCheckLangLB->set_size_request(-1, m_xCheckLangLB->get_height_rows(10)); std::vector<int> aWidths; - aWidths.push_back(m_xCheckLangLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xCheckLangLB->get_checkbox_column_width()); m_xCheckLangLB->set_column_fixed_widths(aWidths); if (m_xLocalizationMgr->isLibraryLocalized()) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 35ea7c80d489..b6e409e5d011 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -199,7 +199,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(weld::Window* pParent) m_xRadioLB->get_text_height() * 10); std::vector<int> aWidths; - aWidths.push_back(m_xRadioLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xRadioLB->get_checkbox_column_width()); m_xRadioLB->set_column_fixed_widths(aWidths); std::vector<int> aRadioColumns; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 94ae52d9e0b4..39161e40765a 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -113,7 +113,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(weld::Window* pParent, m_xAttrLB->get_height_rows(12)); std::vector<int> aWidths; - aWidths.push_back(m_xAttrLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xAttrLB->get_checkbox_column_width()); m_xAttrLB->set_column_fixed_widths(aWidths); m_xOKBtn->connect_clicked(LINK( this, SvxSearchAttributeDialog, OKHdl)); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 4a83dad29b94..37eeadc07641 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -38,7 +38,7 @@ CertPathDialog::CertPathDialog(weld::Window* pParent) m_xCertPathList->get_height_rows(6)); std::vector<int> aWidths; - aWidths.push_back(m_xCertPathList->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xCertPathList->get_checkbox_column_width()); aWidths.push_back(m_xCertPathList->get_approximate_digit_width() * 20); m_xCertPathList->set_column_fixed_widths(aWidths); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 03494f6d17f0..5e915f8ba31b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -189,7 +189,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(TabPageParent pParent, const SfxI , m_xCheckLB(m_xBuilder->weld_tree_view("checklist")) { std::vector<int> aWidths; - aWidths.push_back(m_xCheckLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xCheckLB->get_checkbox_column_width()); m_xCheckLB->set_column_fixed_widths(aWidths); m_xCheckLB->set_size_request(-1, m_xCheckLB->get_height_rows(10)); } @@ -1584,7 +1584,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet) else { std::vector<int> aWidths; - aWidths.push_back(m_xSwCheckLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xSwCheckLB->get_checkbox_column_width()); m_xCheckLB->set_column_fixed_widths(aWidths); m_xSwCheckLB->hide(); } @@ -2131,7 +2131,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage(TabPageParent pParent, m_xSmartTagTypesLB->get_height_rows(6)); std::vector<int> aWidths; - aWidths.push_back(m_xSmartTagTypesLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xSmartTagTypesLB->get_checkbox_column_width()); m_xSmartTagTypesLB->set_column_fixed_widths(aWidths); // set the handlers: diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 311136279c37..bdd80ac3c635 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -618,6 +618,8 @@ public: virtual OUString get_column_title(int nColumn) const = 0; virtual void set_column_title(int nColumn, const OUString& rTitle) = 0; + int get_checkbox_column_width() const { return get_approximate_digit_width() * 3 + 6; } + virtual void set_selection_mode(SelectionMode eMode) = 0; virtual int count_selected_rows() const = 0; diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 0f3e1384ae3c..f363f412a423 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -62,7 +62,7 @@ ScTableProtectionDlg::ScTableProtectionDlg(weld::Window* pParent) m_aDeleteRows = m_xDeleteRows->get_label(); std::vector<int> aWidths; - aWidths.push_back(m_xOptionsListBox->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xOptionsListBox->get_checkbox_column_width()); m_xOptionsListBox->set_column_fixed_widths(aWidths); Init(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index eaedf2ab296f..77ad31bc86e9 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -71,7 +71,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window* pParent, m_xLbSettings->get_height_rows(6)); std::vector<int> aWidths; - aWidths.push_back(m_xLbSettings->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xLbSettings->get_checkbox_column_width()); m_xLbSettings->set_column_fixed_widths(aWidths); m_xLbEngine->connect_changed( LINK( this, ScSolverOptionsDialog, EngineSelectHdl ) ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 1584ea6d50ec..ee185cbeac53 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -490,7 +490,7 @@ SwCaptionOptPage::SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet m_xCategoryBox->connect_entry_insert_text(LINK(this, SwCaptionOptPage, TextFilterHdl)); std::vector<int> aWidths; - aWidths.push_back(m_xCheckLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xCheckLB->get_checkbox_column_width()); m_xCheckLB->set_column_fixed_widths(aWidths); SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_ABB, m_sIllustration); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a521961dc243..ce4ca2867a05 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -781,7 +781,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& sAddStyleContent = m_xAddStylesCB->get_label(); std::vector<int> aWidths; - aWidths.push_back(m_xFromObjCLB->get_approximate_digit_width() * 3 + 6); + aWidths.push_back(m_xFromObjCLB->get_checkbox_column_width()); m_xFromObjCLB->set_column_fixed_widths(aWidths); for (size_t i = 0; i < SAL_N_ELEMENTS(RES_SRCTYPES); ++i) |