core.git: vcl/source

[Jan Rheinländer (via logerrit)]

 vcl/source/app/salvtables.cxx   |    3 +++
 vcl/source/treelist/svtabbx.cxx |    5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d9eac4f95649f04e1ddbe5026d8bb323c1fc58d8
Author:     Jan Rheinländer <jrheinlaen...@users.sourceforge.net>
AuthorDate: Sat Jan 18 10:42:57 2025 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Mar 22 23:39:34 2025 +0100

    tdf#164850 Avoid resetting edit flags when resetting column widths
    
    Change-Id: Id679068be1ff175676b9a79c1c847ba86d43a050
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180450
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 3dc6c0f38bb5..c018a367a73f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3880,6 +3880,9 @@ SalInstanceTreeView::SalInstanceTreeView(SvTabListBox* 
pTreeView, SalInstanceBui
     m_xTreeView->SetCustomMeasureHdl(LINK(this, SalInstanceTreeView, 
CustomMeasureHdl));
     const std::vector<tools::Long> aTabPositions{ 0 };
     m_xTreeView->SetTabs(aTabPositions);
+    // by default, 1st one is editable, others not; override with 
set_column_editables
+    m_xTreeView->SetTabEditable(0, true);
+
     SvHeaderTabListBox* pHeaderBox = 
dynamic_cast<SvHeaderTabListBox*>(m_xTreeView.get());
 
     if (pHeaderBox)
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index c0b545a57f84..0b99201b6702 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -47,8 +47,6 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
-constexpr SvLBoxTabFlags MYTABMASK = SvLBoxTabFlags::ADJUST_FLAGS | 
SvLBoxTabFlags::FORCE;
-
 namespace {
     OString lcl_extractPngString(const BitmapEx& rImage)
     {
@@ -289,10 +287,7 @@ void SvTabListBox::SetTabs(const std::vector<tools::Long>& 
rTabPositions, MapUni
         aSize = LogicToLogic( aSize, &aMMSource, &aMMDest );
         tools::Long nNewTab = aSize.Width();
         mvTabList[nIdx].SetPos( nNewTab );
-        mvTabList[nIdx].nFlags &= MYTABMASK;
     }
-    // by default, 1st one is editable, others not; override with 
set_column_editables
-    mvTabList[0].nFlags |= SvLBoxTabFlags::EDITABLE;
     SvTreeListBox::nTreeFlags |= SvTreeFlags::RECALCTABS;
     if( IsUpdateMode() )
         Invalidate();