svx/source/dialog/svxruler.cxx      |    3 +--
 sw/source/uibase/uiview/viewtab.cxx |   11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 17d7ac5c1a06d29cbeeb3efd245ebf2e6725da12
Author: Mark Hung <mark...@gmail.com>
Date:   Sun Aug 28 00:17:08 2016 -0700

    tdf#54860 make indention handles on the ruler movable inside the table.
    
    Handle of the ruler is disabled when the last row of the table is split
    across pages. ( i.e. SwTabCols.bLastRowAllowedToChange is true,
    which is implied by SwTabFrame.m_bHasFollowFlowLine. )
    
    m_bHasFollowFlowLine may restrict frame to grow its height in
    SwRowFrame::GrowFrame(), but SvxProtectItem affects horizontal ruler,
    so I removed it and it seems not harmful.
    
    Change-Id: I519dead13c7124449bc39ed5eb9af38d235eec25
    Reviewed-on: https://gerrit.libreoffice.org/28431
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Mark Hung <mark...@gmail.com>

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 1d3e1a0..a46c459 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2621,7 +2621,6 @@ void SvxRuler::CalcMinMax()
             {
                 //top border is not moveable when table rows are displayed
                 // protection of content means the margin is not moveable
-                // - it's just a page break inside of a cell
                 if(bHorz && !mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = mpBorders[0].nMinPos + lNullPix;
@@ -2712,7 +2711,7 @@ void SvxRuler::CalcMinMax()
             else if(mxRulerImpl->bIsTableRows)
             {
                 // get the bottom move range from the last border position - 
only available for rows!
-                // protection of content means the margin is not moveable - 
it's just a page break inside of a cell
+                // protection of content means the margin is not moveable
                 if(bHorz || mxRulerImpl->aProtectItem.IsContentProtected())
                 {
                     nMaxLeft = nMaxRight = mpBorders[mxColumnItem->Count() - 
1].nMaxPos + lNullPix;
diff --git a/sw/source/uibase/uiview/viewtab.cxx 
b/sw/source/uibase/uiview/viewtab.cxx
index a030f90..799a6d8 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1211,7 +1211,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 
     SfxWhichIter aIter( rSet );
     sal_uInt16 nWhich = aIter.FirstWhich();
-    bool bPutContentProtection = false;
 
     while ( nWhich )
     {
@@ -1941,10 +1940,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                     nEnd = aTabCols.GetRight();
                 else
                     nEnd = aTabCols.GetLeft();
-                // put a position protection when the last row cannot be moved
-                // due to a page break inside of a row
-                if(!aTabCols.IsLastRowAllowedToChange())
-                    bPutContentProtection = true;
 
                 SvxColumnDescription aColDesc( nStart, nEnd,
                                             aTabCols.GetRight(),
@@ -2329,12 +2324,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
         }
         nWhich = aIter.NextWhich();
     }
-    if(bPutContentProtection)
-    {
-        SvxProtectItem aProtect(SID_RULER_PROTECT);
-        aProtect.SetContentProtect(true);
-        rSet.Put(aProtect);
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to