diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-29 13:03:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-30 06:22:16 +0000 |
| commit | 3c1b1fb937c261987a430593ed525df78fa5ce07 (patch) | |
| tree | d3ca5c69f17c8769124dc98edee23d44ab3faf12 /sw/source/ui/index/cnttab.cxx | |
| parent | 4307a850a310c0371bee1f79a8eb41fa8ff7fed2 (diff) | |
convert SwTOOElements to o3tl::typed_flags
Change-Id: Ic0636c8f641cf70e0372b31f8a8d111b45ba6070
Reviewed-on: https://gerrit.libreoffice.org/31357
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui/index/cnttab.cxx')
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 6e7de7dcc844..b565df9db20c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1107,11 +1107,11 @@ void SwTOXSelectTabPage::ApplyTOXDescription() } else if(TOX_OBJECTS == aCurType.eType) { - long nOLEData = rDesc.GetOLEOptions(); + SwTOOElements nOLEData = rDesc.GetOLEOptions(); for(sal_uLong nFromObj = 0; nFromObj < m_pFromObjCLB->GetEntryCount(); nFromObj++) { - sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(nFromObj)); - m_pFromObjCLB->CheckEntryPos(nFromObj, 0 != (nData & nOLEData)); + SwTOOElements nData = static_cast<SwTOOElements>(reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(nFromObj))); + m_pFromObjCLB->CheckEntryPos(nFromObj, bool(nData & nOLEData)); } } else if(TOX_AUTHORITIES == aCurType.eType) @@ -1204,16 +1204,16 @@ void SwTOXSelectTabPage::FillTOXDescription() break; case TOX_OBJECTS: { - long nOLEData = 0; + SwTOOElements nOLEData = SwTOOElements::NONE; for(sal_uLong i = 0; i < m_pFromObjCLB->GetEntryCount(); i++) { if(m_pFromObjCLB->IsChecked(i)) { - sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(i)); + SwTOOElements nData = static_cast<SwTOOElements>(reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(i))); nOLEData |= nData; } } - rDesc.SetOLEOptions((sal_uInt16)nOLEData); + rDesc.SetOLEOptions(nOLEData); } break; case TOX_AUTHORITIES: |