diff options
| author | Justin Luth <justin.luth@collabora.com> | 2023-03-13 10:44:16 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-03-15 12:38:17 +0000 |
| commit | 4237db7f43c08efbf166a2bfa8a0c99d1c5f04a4 (patch) | |
| tree | b44ad1a71f1801377e34aa1851709183f9805fd7 /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | 33ce22f080bbedfde78fdc907b0d4d5bd0f68f14 (diff) | |
NFC tdf#154129 writerfilter framePr: deduplicate lcl.. call
Change-Id: Iedaea9d6d6f344ebd66bf83d1a9ee243cae5875b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148812
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index c10703ba2bee..538409dae704 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1819,10 +1819,6 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) { "ParaFrameProperties", uno::Any(rAppendContext.pLastParagraphProperties->IsFrameMode()) } })); aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag", aGrabBag)); - - lcl_MoveBorderPropertiesToFrame(aFrameProperties, - rAppendContext.pLastParagraphProperties->GetStartingRange(), - rAppendContext.pLastParagraphProperties->GetEndingRange()); } else { @@ -1837,12 +1833,12 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) nHoriDist = 0; aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_TOP_MARGIN), nHoriOrient == text::HoriOrientation::LEFT ? 0 : nHoriDist)); aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_BOTTOM_MARGIN), nHoriOrient == text::HoriOrientation::RIGHT ? 0 : nHoriDist)); - - lcl_MoveBorderPropertiesToFrame(aFrameProperties, - rAppendContext.pLastParagraphProperties->GetStartingRange(), - rAppendContext.pLastParagraphProperties->GetEndingRange()); } + lcl_MoveBorderPropertiesToFrame(aFrameProperties, + rAppendContext.pLastParagraphProperties->GetStartingRange(), + rAppendContext.pLastParagraphProperties->GetEndingRange()); + //frame conversion has to be executed after table conversion RegisterFrameConversion( rAppendContext.pLastParagraphProperties->GetStartingRange(), |