diff options
| author | Patrick Jaap <patrick.jaap@tu-dresden.de> | 2018-11-14 16:25:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-10 14:20:43 +0100 |
| commit | c3c80b6b63e998fd3117b5039e65a2ee9df90954 (patch) | |
| tree | d6d47fc936601315dc517401fd6b7818057d10d5 /sw/source/core/objectpositioning | |
| parent | 00b49f9ff9777cb1c1e971feec55b2448fba8be2 (diff) | |
tdf#115094 Part II: OOXML Feature: Add layoutInCell to Doc model
Change-Id: I50dcc2363982f8e6b68f10b0b724b59e9430d6c5
Reviewed-on: https://gerrit.libreoffice.org/63380
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/core/objectpositioning')
3 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 2ddd1a61efb5..5cd671c934ce 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -112,6 +112,7 @@ void SwAnchoredObjectPosition::GetInfoAboutObj() // #i62875# - determine attribute value of <Follow-Text-Flow> { mbFollowTextFlow = mpFrameFormat->GetFollowTextFlow().GetValue(); + mbLayoutInCell = mpFrameFormat->GetFollowTextFlow().GetLayoutInCell(); } // determine, if anchored object has not to be captured on the page. diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx index 8e00bf3c592e..e84917477a2b 100644 --- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx +++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx @@ -25,8 +25,10 @@ using namespace objectpositioning; SwEnvironmentOfAnchoredObject::SwEnvironmentOfAnchoredObject( - const bool _bFollowTextFlow ) + const bool _bFollowTextFlow, + const bool _bLayoutInCell ) : mbFollowTextFlow( _bFollowTextFlow ) + , mbLayoutInCell( _bLayoutInCell ) {} SwEnvironmentOfAnchoredObject::~SwEnvironmentOfAnchoredObject() @@ -68,7 +70,7 @@ const SwLayoutFrame& SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFram { const SwFrame* pVertEnvironmentLayFrame = &_rVertOrientFrame; - if ( !mbFollowTextFlow ) + if ( !mbFollowTextFlow && !mbLayoutInCell) { // No exception any more for page alignment. // the page frame determines the vertical layout environment. diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index b065c3068607..4347c125ee90 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -165,7 +165,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() const bool bWrapThrough = rSurround.GetSurround() == css::text::WrapTextMode_THROUGH; // new class <SwEnvironmentOfAnchoredObject> - SwEnvironmentOfAnchoredObject aEnvOfObj( DoesObjFollowsTextFlow() ); + SwEnvironmentOfAnchoredObject aEnvOfObj( DoesObjFollowsTextFlow(), DoesObjLayoutInCell() ); // #i18732# - grow only, if object has to follow the text flow const bool bGrow = DoesObjFollowsTextFlow() && |