[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/anchoredobjectposition.hxx                      |    5 -----
 sw/source/core/inc/environmentofanchoredobject.hxx                 |    4 +---
 sw/source/core/objectpositioning/anchoredobjectposition.cxx        |    1 -
 sw/source/core/objectpositioning/environmentofanchoredobject.cxx   |    6 ++----
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |    2 +-
 5 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit a55b149a1822e71d20cc28cece827231300337b8
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Oct 30 22:17:55 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Oct 31 08:39:24 2019 +0100

    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 at collabora.com>

diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 924e6b63bc5b..b2afe2c47f10 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -55,7 +55,6 @@ namespace objectpositioning
         const SwFrameFormat* mpFrameFormat;
         // #i62875#
         bool mbFollowTextFlow;
-        bool mbLayoutInCell = false;
         // #i62875#
         // for compatibility option <DoNotCaptureDrawObjsOnPage>
         bool mbDoNotCaptureAnchoredObj;
@@ -109,10 +108,6 @@ namespace objectpositioning
         {
             return mbFollowTextFlow;
         }
-        bool DoesObjLayoutInCell() const
-        {
-            return mbLayoutInCell;
-        }
 
         // virtual methods providing data for to character anchored objects.
         virtual bool IsAnchoredToChar() const;
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 9a4f277115c6..f7c604e5da4c 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -29,7 +29,6 @@ namespace objectpositioning
     {
     private:
         const bool mbFollowTextFlow;
-        const bool mbLayoutInCell = false;
 
     public:
         /** constructor
@@ -41,8 +40,7 @@ namespace objectpositioning
             input parameter - indicates, if the anchored object should be
             laid out within a (table) cell
         */
-        SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow,
-                                       const bool _bLayoutInCell = false );
+        SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
 
         /** destructor
         */
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() &&