diff options
Diffstat (limited to 'vcl/source/app/salvtables.cxx')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index cca696e6245d..8eb8721cd910 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -3849,7 +3849,7 @@ bool SalInstanceTreeView::get_text_emphasis(SvTreeListEntry* pEntry, int col) co void SalInstanceTreeView::set_header_item_width(const std::vector<int>& rWidths) { - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr) { for (size_t i = 0; i < rWidths.size(); ++i) @@ -3875,9 +3875,9 @@ SalInstanceTreeView::SalInstanceTreeView(SvTabListBox* pTreeView, SalInstanceBui m_xTreeView->SetPopupMenuHdl(LINK(this, SalInstanceTreeView, PopupMenuHdl)); m_xTreeView->SetCustomRenderHdl(LINK(this, SalInstanceTreeView, CustomRenderHdl)); m_xTreeView->SetCustomMeasureHdl(LINK(this, SalInstanceTreeView, CustomMeasureHdl)); - const tools::Long aTabPositions[] = { 0 }; - m_xTreeView->SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions); - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + const std::vector<tools::Long> aTabPositions{ 0 }; + m_xTreeView->SetTabs(aTabPositions); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (pHeaderBox) { @@ -3956,7 +3956,7 @@ void SalInstanceTreeView::set_column_fixed_widths(const std::vector<int>& rWidth std::vector<tools::Long> aTabPositions{ 0 }; for (size_t i = 0; i < rWidths.size(); ++i) aTabPositions.push_back(aTabPositions[i] + rWidths[i]); - m_xTreeView->SetTabs(aTabPositions.size(), aTabPositions.data(), MapUnit::MapPixel); + m_xTreeView->SetTabs(aTabPositions, MapUnit::MapPixel); set_header_item_width(rWidths); // call Resize to recalculate based on the new tabs m_xTreeView->Resize(); @@ -3976,7 +3976,7 @@ void SalInstanceTreeView::set_centered_column(int nCol) int SalInstanceTreeView::get_column_width(int nColumn) const { - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr) return pHeaderBar->GetItemSize(pHeaderBar->GetItemId(nColumn)); // GetTab(0) gives the position of the bitmap which is automatically inserted by the TabListBox. @@ -3989,7 +3989,7 @@ int SalInstanceTreeView::get_column_width(int nColumn) const OUString SalInstanceTreeView::get_column_title(int nColumn) const { - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr) { return pHeaderBar->GetItemText(pHeaderBar->GetItemId(nColumn)); @@ -3999,7 +3999,7 @@ OUString SalInstanceTreeView::get_column_title(int nColumn) const void SalInstanceTreeView::set_column_title(int nColumn, const OUString& rTitle) { - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr) { return pHeaderBar->SetItemText(pHeaderBar->GetItemId(nColumn), rTitle); @@ -4025,14 +4025,14 @@ void SalInstanceTreeView::queue_draw() void SalInstanceTreeView::show() { - if (LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get())) + if (SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get())) pHeaderBox->GetParent()->Show(); SalInstanceWidget::show(); } void SalInstanceTreeView::hide() { - if (LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get())) + if (SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get())) pHeaderBox->GetParent()->Hide(); SalInstanceWidget::hide(); } @@ -5040,7 +5040,7 @@ void SalInstanceTreeView::set_sort_indicator(TriState eState, int col) { assert(col >= 0 && "cannot sort on expander column"); - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr; if (!pHeaderBar) return; @@ -5063,7 +5063,7 @@ TriState SalInstanceTreeView::get_sort_indicator(int col) const { assert(col >= 0 && "cannot sort on expander column"); - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : nullptr) { sal_uInt16 nTextId = pHeaderBar->GetItemId(col); @@ -5153,7 +5153,7 @@ bool SalInstanceTreeView::changed_by_hover() const { return m_xTreeView->IsSelec SalInstanceTreeView::~SalInstanceTreeView() { - LclHeaderTabListBox* pHeaderBox = dynamic_cast<LclHeaderTabListBox*>(m_xTreeView.get()); + SvHeaderTabListBox* pHeaderBox = dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get()); if (pHeaderBox) { if (HeaderBar* pHeaderBar = pHeaderBox->GetHeaderBar()) @@ -5341,7 +5341,7 @@ IMPL_LINK(SalInstanceTreeView, EndDragHdl, HeaderBar*, pHeaderBar, void) for (int i = 0; i < pHeaderBar->GetItemCount() - 1; ++i) aTabPositions.push_back(aTabPositions[i] + pHeaderBar->GetItemSize(pHeaderBar->GetItemId(i))); - m_xTreeView->SetTabs(aTabPositions.size(), aTabPositions.data(), MapUnit::MapPixel); + m_xTreeView->SetTabs(aTabPositions, MapUnit::MapPixel); } IMPL_LINK(SalInstanceTreeView, HeaderBarClickedHdl, HeaderBar*, pHeaderBar, void) |