From 0833143c271ae444ca83ec16923db9f403f98b86 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 8 Apr 2015 14:45:50 +0200 Subject: convert RT_ACCESS fields to scoped enum Change-Id: Ifef0aaae6208f18c1352fef7c471deb60a97820d --- registry/source/reflread.cxx | 8 ++++---- registry/source/reflwrit.cxx | 8 ++++---- registry/source/regimpl.cxx | 36 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'registry/source') diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 15a9d0f4c25c..5b1c58c8dbef 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -681,7 +681,7 @@ const sal_Char* FieldList::getFieldType(sal_uInt16 index) RTFieldAccess FieldList::getFieldAccess(sal_uInt16 index) { - RTFieldAccess aAccess = RT_ACCESS_INVALID; + RTFieldAccess aAccess = RTFieldAccess::INVALID; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -878,7 +878,7 @@ const sal_Char* ReferenceList::getReferenceDoku(sal_uInt16 index) RTFieldAccess ReferenceList::getReferenceAccess(sal_uInt16 index) { - RTFieldAccess aAccess = RT_ACCESS_INVALID; + RTFieldAccess aAccess = RTFieldAccess::INVALID; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -1519,7 +1519,7 @@ RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getFieldFlags(void * hEntry, sal_u { TypeRegistryEntry* pEntry = static_cast(hEntry); - if (pEntry == NULL) return RT_ACCESS_INVALID; + if (pEntry == NULL) return RTFieldAccess::INVALID; return pEntry->m_pFields->getFieldAccess(index); } @@ -1815,7 +1815,7 @@ RTFieldAccess TYPEREG_CALLTYPE typereg_reader_getReferenceFlags(void * hEntry, s { TypeRegistryEntry* pEntry = static_cast(hEntry); - if (pEntry == NULL) return RT_ACCESS_INVALID; + if (pEntry == NULL) return RTFieldAccess::INVALID; return pEntry->m_pReferences->getReferenceAccess(index); } diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 49beeb0d325c..426911bce518 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -351,7 +351,7 @@ public: }; FieldEntry::FieldEntry() - : m_access(RT_ACCESS_INVALID) + : m_access(RTFieldAccess::INVALID) , m_constValueType(RT_TYPE_NONE) { } @@ -481,7 +481,7 @@ public: ReferenceEntry::ReferenceEntry() : m_type(RT_REF_INVALID) - , m_access(RT_ACCESS_INVALID) + , m_access(RTFieldAccess::INVALID) { } @@ -856,7 +856,7 @@ void TypeWriter::createBlop() cpIndexDoku2 = 0; cpIndexFileName2 = 0; - pBuffer += writeUINT16(pBuffer, m_fields[i].m_access); + pBuffer += writeUINT16(pBuffer, static_cast(m_fields[i].m_access)); if (!m_fields[i].m_name.isEmpty()) { @@ -1060,7 +1060,7 @@ void TypeWriter::createBlop() } pBuffer += writeUINT16(pBuffer, cpIndexDoku2); - pBuffer += writeUINT16(pBuffer, m_references[i].m_access); + pBuffer += writeUINT16(pBuffer, static_cast(m_references[i].m_access)); } } diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index a1ed1ffba133..09afcc0c5cb7 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -73,7 +73,7 @@ void printString(OUString const & s) { void printFieldOrReferenceFlag( RTFieldAccess * flags, RTFieldAccess flag, char const * name, bool * first) { - if ((*flags & flag) != 0) { + if ((*flags & flag) != RTFieldAccess::NONE) { if (!*first) { printf("|"); } @@ -84,39 +84,39 @@ void printFieldOrReferenceFlag( } void printFieldOrReferenceFlags(RTFieldAccess flags) { - if (flags == 0) { + if (flags == RTFieldAccess::NONE) { printf("none"); } else { bool first = true; printFieldOrReferenceFlag( - &flags, RT_ACCESS_READONLY, "readonly", &first); + &flags, RTFieldAccess::READONLY, "readonly", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_OPTIONAL, "optional", &first); + &flags, RTFieldAccess::OPTIONAL, "optional", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_MAYBEVOID, "maybevoid", &first); - printFieldOrReferenceFlag(&flags, RT_ACCESS_BOUND, "bound", &first); + &flags, RTFieldAccess::MAYBEVOID, "maybevoid", &first); + printFieldOrReferenceFlag(&flags, RTFieldAccess::BOUND, "bound", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_CONSTRAINED, "constrained", &first); + &flags, RTFieldAccess::CONSTRAINED, "constrained", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_TRANSIENT, "transient", &first); + &flags, RTFieldAccess::TRANSIENT, "transient", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_MAYBEAMBIGUOUS, "maybeambiguous", &first); + &flags, RTFieldAccess::MAYBEAMBIGUOUS, "maybeambiguous", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_MAYBEDEFAULT, "maybedefault", &first); + &flags, RTFieldAccess::MAYBEDEFAULT, "maybedefault", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_REMOVABLE, "removable", &first); + &flags, RTFieldAccess::REMOVABLE, "removable", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_ATTRIBUTE, "attribute", &first); + &flags, RTFieldAccess::ATTRIBUTE, "attribute", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_PROPERTY, "property", &first); - printFieldOrReferenceFlag(&flags, RT_ACCESS_CONST, "const", &first); + &flags, RTFieldAccess::PROPERTY, "property", &first); + printFieldOrReferenceFlag(&flags, RTFieldAccess::CONST, "const", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_READWRITE, "readwrite", &first); + &flags, RTFieldAccess::READWRITE, "readwrite", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_PARAMETERIZED_TYPE, "parameterized type", &first); + &flags, RTFieldAccess::PARAMETERIZED_TYPE, "parameterized type", &first); printFieldOrReferenceFlag( - &flags, RT_ACCESS_PUBLISHED, "published", &first); - if (flags != 0) { + &flags, RTFieldAccess::PUBLISHED, "published", &first); + if (flags != RTFieldAccess::NONE) { if (!first) { printf("|"); } -- cgit