CWS swlayoutrefactoring: resync to m96, no conflict resolution

1 files changed, 14 insertions, 0 deletions

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index c25d7728e08a..a252969a3106 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -29,6 +29,11 @@
 
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <cppuhelper/weakref.hxx>
+<<<<<<< local
+=======
+#include <tools/gen.hxx>
+
+>>>>>>> other
 #include <format.hxx>
 #include "swdllapi.h"
 
@@ -149,6 +154,12 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
 {
     friend class SwDoc;
 
+    // #i972:
+    // it stores the previous position of Prt rectangle from RequestObjectResize
+    // so it can be used to move frames of non-resizable objects to align them correctly
+    // when they get borders (this is done in SwWrtShell::CalcAndGetScale)
+    Point   m_aLastFlyFrmPrtRectPos;
+
     //Beide nicht vorhanden.
     SwFlyFrmFmt( const SwFlyFrmFmt &rCpy );
     SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy );
@@ -215,6 +226,9 @@ public:
     */
     sal_Bool IsBackgroundBrushInherited() const;
 
+    const Point & GetLastFlyFrmPrtRectPos() const       { return m_aLastFlyFrmPrtRectPos; }
+    void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
+
     DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt)
 };