Merge with main repo.

1 files changed, 3 insertions, 1 deletions

diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh
index 75bc596e..b23ba072 100644
--- a/dw/ooffloatsmgr.hh
+++ b/dw/ooffloatsmgr.hh
@@ -191,6 +191,7 @@ private:
       // down) for usage.
       bool wasAllocated;
       core::Allocation allocation;
+      int clearPosition;
 
       // These two lists store all floats generated by this textblock,
       // as long as this textblock is not allocates.
@@ -314,7 +315,8 @@ private:
    int getFloatHeight (OOFAwareWidget *textblock, Side side, int y, int h,
                        OOFAwareWidget *lastGB, int lastExtIndex);
 
-   int getClearPosition (OOFAwareWidget *textblock, Side side);
+   int calcClearPosition (OOFAwareWidget *textblock);
+   int calcClearPosition (OOFAwareWidget *textblock, Side side);
 
    void ensureFloatSize (Float *vloat);