diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-09 10:04:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-09 10:06:17 +0200 |
| commit | 901e5c3a21a1299d10c44bc844246fe8c329bb82 (patch) | |
| tree | 358ff817974d0eb5c047aa28fe83a2c1871f756b /sw/source/ui/index | |
| parent | cd9e2ecba38c31eb30e05d3ee2c9f4629dd89d40 (diff) | |
fdo#84938: convert FRMTYPE_ #defines to 'enum class'
and consequently fix bug in SwPageFrm::PreparePage where it was
comparing against the wrong #define's
Change-Id: I681f7e9f3f9bbe1ddf2613814ed36cfe0955825f
Diffstat (limited to 'sw/source/ui/index')
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6e76ef318c5f..f1b4407b58ac 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -267,12 +267,12 @@ void SwIndexMarkPane::InitControls() //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists - const sal_uInt16 nFrmType = pSh->GetFrmType(0,true); + const FrmTypeFlags nFrmType = pSh->GetFrmType(0,true); m_pApplyToAllCB->Show(); m_pSearchCaseSensitiveCB->Show(); m_pSearchCaseWordOnlyCB->Show(); m_pApplyToAllCB->Enable(!aOrgStr.isEmpty() && - 0 == (nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FLY_ANY ))); + !(nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER | FrmTypeFlags::FLY_ANY ))); SearchTypeHdl(m_pApplyToAllCB); } @@ -355,12 +355,12 @@ void SwIndexMarkPane::Activate() //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists - const sal_uInt16 nFrmType = pSh->GetFrmType(0,true); + const FrmTypeFlags nFrmType = pSh->GetFrmType(0,true); m_pApplyToAllCB->Show(); m_pSearchCaseSensitiveCB->Show(); m_pSearchCaseWordOnlyCB->Show(); m_pApplyToAllCB->Enable(!aOrgStr.isEmpty() && - 0 == (nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER | FRMTYPE_FLY_ANY ))); + !(nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER | FrmTypeFlags::FLY_ANY ))); SearchTypeHdl(m_pApplyToAllCB); } ModifyHdl(m_pTypeDCB); |