summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-07-29 13:48:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-07-29 18:42:51 +0200
commit78ff4793f9ad45d84f923686095acb670e7a3ea0 (patch)
tree37f16c151a5cc252ae9ce517171d1fd22a6e134a /svx/source
parent129e69f005d4752bb5ec10a8c12d842037394822 (diff)
tdf#161846 remove one layout operation (i)
of the 6 we perform per caption object Change-Id: I8af5a0a4c859241fa350fcd3c45cfdfe1cfb6475 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171170 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdotext.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 563e7ef02a2f..09fd8c945af3 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1335,7 +1335,7 @@ namespace
}
}
-void SdrTextObj::NbcSetOutlinerParaObjectForText( std::optional<OutlinerParaObject> pTextObject, SdrText* pText )
+void SdrTextObj::NbcSetOutlinerParaObjectForText( std::optional<OutlinerParaObject> pTextObject, SdrText* pText, bool bAdjustTextFrameWidthAndHeight )
{
if( pText )
pText->SetOutlinerParaObject( std::move(pTextObject) );
@@ -1350,7 +1350,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( std::optional<OutlinerParaObje
}
SetTextSizeDirty();
- if (IsTextFrame() && IsAutoGrow(*this))
+ if (IsTextFrame() && IsAutoGrow(*this) && bAdjustTextFrameWidthAndHeight)
{ // adapt text frame!
NbcAdjustTextFrameWidthAndHeight();
}