diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-10-30 22:17:55 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-31 08:39:24 +0100 |
| commit | a55b149a1822e71d20cc28cece827231300337b8 (patch) | |
| tree | 863d5a5426657103d0e53e21c9e0db50b5a69182 /sw/source/core/objectpositioning | |
| parent | f3916075d7c454abfe93e8b487b2f518f80d526c (diff) | |
sw layout: remove checks for IsLayoutInCell
IsLayoutCell was only set by the DOCX import via an UNO API which is
already gone, so this is effectively dead code.
Change-Id: Ic2aab85f42a6a6f5c762d7986425b1f7206c9198
Reviewed-on: https://gerrit.libreoffice.org/81808
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/core/objectpositioning')
3 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index f60e097a01bb..ad3f7cd8ee46 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -113,7 +113,6 @@ 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 e84917477a2b..8e00bf3c592e 100644 --- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx +++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx @@ -25,10 +25,8 @@ using namespace objectpositioning; SwEnvironmentOfAnchoredObject::SwEnvironmentOfAnchoredObject( - const bool _bFollowTextFlow, - const bool _bLayoutInCell ) + const bool _bFollowTextFlow ) : mbFollowTextFlow( _bFollowTextFlow ) - , mbLayoutInCell( _bLayoutInCell ) {} SwEnvironmentOfAnchoredObject::~SwEnvironmentOfAnchoredObject() @@ -70,7 +68,7 @@ const SwLayoutFrame& SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFram { const SwFrame* pVertEnvironmentLayFrame = &_rVertOrientFrame; - if ( !mbFollowTextFlow && !mbLayoutInCell) + if ( !mbFollowTextFlow ) { // 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 1e7f36f7b0e8..89fe27e30558 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -169,7 +169,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition() const bool bWrapThrough = rSurround.GetSurround() == css::text::WrapTextMode_THROUGH; // new class <SwEnvironmentOfAnchoredObject> - SwEnvironmentOfAnchoredObject aEnvOfObj( DoesObjFollowsTextFlow(), DoesObjLayoutInCell() ); + SwEnvironmentOfAnchoredObject aEnvOfObj( DoesObjFollowsTextFlow() ); // #i18732# - grow only, if object has to follow the text flow const bool bGrow = DoesObjFollowsTextFlow() && |