diff options
| author | Balazs Varga <balazs.varga.extern@allotropia.de> | 2024-08-08 10:18:24 +0200 |
|---|---|---|
| committer | Balazs Varga <balazs.varga.extern@allotropia.de> | 2024-08-12 13:24:48 +0200 |
| commit | ebf13e890766f4cadbba81444784cfe3c8e1bbc3 (patch) | |
| tree | 8b2813aad93bdb07b4b02d97acafe3499b11c07f /svx/source/table | |
| parent | 9d1f0f58c6e4e343736c8fae3dbcb70de64a7c9f (diff) | |
tdf#156857: sd ooxml import: fix shape size if spAutofit is set
and the size of the shape from ooxml file is different then the
inew calculated by TextAutoGrowHeight.
Furthermore, no need to check and resize the shape size during
the spell checking.
Change-Id: Iffd15e02579942d4f5f20db73f2194f8298c0838
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171621
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
Tested-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Diffstat (limited to 'svx/source/table')
| -rw-r--r-- | svx/source/table/svdotable.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index a2b4ee89cfcb..43a4d7be5a0a 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1869,7 +1869,7 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const } -void SdrTableObj::NbcSetOutlinerParaObject( std::optional<OutlinerParaObject> pTextObject) +void SdrTableObj::NbcSetOutlinerParaObject( std::optional<OutlinerParaObject> pTextObject, bool bAdjustTextFrameWidthAndHeight ) { CellRef xCell( getActiveCell() ); if( !xCell.is() ) @@ -1885,7 +1885,8 @@ void SdrTableObj::NbcSetOutlinerParaObject( std::optional<OutlinerParaObject> pT xCell->SetOutlinerParaObject( std::move(pTextObject) ); SetTextSizeDirty(); - NbcAdjustTextFrameWidthAndHeight(); + if (bAdjustTextFrameWidthAndHeight) + NbcAdjustTextFrameWidthAndHeight(); } |