sw/source/ui/misc/bookmark.cxx | 2 --
vcl/source/treelist/svtabbx.cxx | 6 +++++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2828191c2370895a074741f946f6132fa05c2be8
Author: Jan Rheinländer <jrheinlaen...@users.sourceforge.net>
AuthorDate: Sun Mar 16 09:30:58 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Mar 17 01:44:58 2025 +0100
Revert extra changes merged with gerrit 181017
Merge 181017 included changes that were not required for the patch, only
for reproducing the bug
Change-Id: If7284ed822b39d47a64eac751a31699f48ea504e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182999
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index aa2387140bb5..2ff680e033ff 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -548,8 +548,6 @@ void BookmarkTable::InsertBookmark(SwWrtShell& rSh,
sw::mark::MarkBase* const pM
m_xControl->set_text(nRow, sBookmarkNodeText, 2);
m_xControl->set_text(nRow, sHidden, 3);
m_xControl->set_text(nRow, sHideCondition, 4);
-
- m_xControl->columns_autosize();
}
std::unique_ptr<weld::TreeIter> BookmarkTable::GetRowByBookmarkName(const
OUString& sName)
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 51be79fec92b..c0b545a57f84 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -47,6 +47,8 @@
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)
{
@@ -287,8 +289,10 @@ 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();
