summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2016-08-28 00:17:08 -0700
committerMark Hung <marklh9@gmail.com>2016-09-18 08:50:13 +0000
commit17d7ac5c1a06d29cbeeb3efd245ebf2e6725da12 (patch)
tree8472ca7d961baad8afb4aa1600e6ec5df7e551c7 /sw/source/uibase/uiview
parenteb8217e17e09613ab1af43a89b52f04e7cb781e8 (diff)
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 <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx11
1 files changed, 0 insertions, 11 deletions
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index a030f90b496e..799a6d8ce1a8 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: */