svx/source/svdraw/svdotext.cxx | 1 -
svx/source/svdraw/svdotxat.cxx | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 530c42d42984e29fe7356ad446437dd9e0084b00
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Mar 25 21:58:49 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Wed Mar 26 15:12:03 2025 +0100
delay calls to SetUpdateLayout(true) some more
until just before we actually need layout info, which removes some
unnecessary layout computation
Change-Id: Ia97a50ea0e611cf2238223b17e3a9576d893c57d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183312
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0736ec75267b..50f283cfb944 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -787,7 +787,6 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner,
tools::Rectangle& rTextRe
rOutliner.SetTextObj( this );
}
- rOutliner.SetUpdateLayout(true);
rOutliner.SetText(*pPara);
}
}
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 7f4e321cf62a..358933ae9706 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -144,7 +144,6 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(
tools::Rectangle& rR, bool bHgt,
{
Outliner& rOutliner = ImpGetDrawOutliner();
rOutliner.SetPaperSize(aNewSize);
- rOutliner.SetUpdateLayout(true);
// TODO: add the optimization with bPortionInfoChecked etc. here
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if (pOutlinerParaObject)
@@ -152,6 +151,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(
tools::Rectangle& rR, bool bHgt,
rOutliner.SetFixedCellHeight(GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT).GetValue());
rOutliner.SetText(*pOutlinerParaObject);
}
+ rOutliner.SetUpdateLayout(true);
if (bWdtGrow)
{
