diff options
author | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:03:10 -0500 |
---|---|---|
committer | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:07:38 -0500 |
commit | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch) | |
tree | 045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/source/ui/chrdlg/pardlg.cxx | |
parent | 5470a365f25e5052b4dd74f76aa2196f0d70934b (diff) |
bin/rename-sw-abbreviations.shlibreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/source/ui/chrdlg/pardlg.cxx')
-rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index d3b72a0222aa..0775a2bedbc9 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -208,8 +208,8 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) else if( m_nParaExt == nId ) { // pagebreak only when the cursor is in the body-area and not in a table - const FrmTypeFlags eType = rSh.GetFrmType(nullptr,true); - if( !(FrmTypeFlags::BODY & eType) || + const FrameTypeFlags eType = rSh.GetFrameType(nullptr,true); + if( !(FrameTypeFlags::BODY & eType) || rSh.GetSelectionType() & nsSelectionType::SEL_TBL ) { aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true)); @@ -226,8 +226,8 @@ void SwParaDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) nHtmlMode & HTMLMODE_SOME_STYLES) { // pagebreak only when the cursor is in the body-area and not in a table - const FrmTypeFlags eType = rSh.GetFrmType(nullptr,true); - if(!(FrmTypeFlags::BODY & eType) || + const FrameTypeFlags eType = rSh.GetFrameType(nullptr,true); + if(!(FrameTypeFlags::BODY & eType) || rSh.GetSelectionType() & nsSelectionType::SEL_TBL) { aSet.Put(SfxBoolItem(SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,true)); |