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/uibase/app | |
| 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/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index dcd14a2341e7..1d5a1b507633 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -169,15 +169,15 @@ void SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh) nMask = SWSTYLEBIT_HTML; else { - const int nSelection = pShell->GetFrmType(0,true); + const FrmTypeFlags nSelection = pShell->GetFrmType(0,true); if(pShell->GetCurTOX()) nMask = SWSTYLEBIT_IDX ; - else if(nSelection & FRMTYPE_HEADER || - nSelection & FRMTYPE_FOOTER || - nSelection & FRMTYPE_TABLE || - nSelection & FRMTYPE_FLY_ANY || - nSelection & FRMTYPE_FOOTNOTE || - nSelection & FRMTYPE_FTNPAGE) + else if(nSelection & FrmTypeFlags::HEADER || + nSelection & FrmTypeFlags::FOOTER || + nSelection & FrmTypeFlags::TABLE || + nSelection & FrmTypeFlags::FLY_ANY || + nSelection & FrmTypeFlags::FOOTNOTE || + nSelection & FrmTypeFlags::FTNPAGE) nMask = SWSTYLEBIT_EXTRA; else nMask = SWSTYLEBIT_TEXT; |