diff options
Diffstat (limited to 'extensions/source/propctrlr/formmetadata.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 103 |
1 files changed, 52 insertions, 51 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f9147cb4469a..c6e1e0d6020e 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -25,9 +25,10 @@ #include <strings.hrc> #include <stringarrays.hrc> #include <comphelper/extract.hxx> +#include <o3tl/safeint.hxx> #include <osl/diagnose.h> -#include <sal/macros.h> #include <algorithm> +#include <utility> namespace pcr { @@ -40,26 +41,26 @@ namespace pcr { OUString sName; OUString sTranslation; - OString sHelpId; + OUString sHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const OUString& rName, + OUString aName, sal_Int32 _nId, - const OUString& aTranslation, + OUString aTranslation, sal_uInt16 nPosId, - const OString&, + OUString , sal_uInt32 _nUIFlags); }; - OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, - const OUString& aString, sal_uInt16 nP, const OString& sHid, sal_uInt32 _nUIFlags) - :sName(_rName) - ,sTranslation(aString) - ,sHelpId(sHid) + OPropertyInfoImpl::OPropertyInfoImpl(OUString _aName, sal_Int32 _nId, + OUString aString, sal_uInt16 nP, OUString sHid, sal_uInt32 _nUIFlags) + :sName(std::move(_aName)) + ,sTranslation(std::move(aString)) + ,sHelpId(std::move(sHid)) ,nId(_nId) ,nPos(nP) ,nUIFlags(_nUIFlags) @@ -97,7 +98,7 @@ namespace pcr #define DEF_INFO_4( ident, uinameres, pos, helpid, flag1, flag2, flag3, flag4 ) \ DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 ) - sal_uInt16 OPropertyInfoService::s_nCount = 0; + std::size_t OPropertyInfoService::s_nCount = 0; OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = nullptr; const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() @@ -358,7 +359,7 @@ namespace pcr }; s_pPropertyInfos = aPropertyInfos; - s_nCount = SAL_N_ELEMENTS(aPropertyInfos); + s_nCount = std::size(aPropertyInfos); // sort std::sort( s_pPropertyInfos, s_pPropertyInfos + s_nCount, PropertyInfoLessByName() ); @@ -387,10 +388,10 @@ namespace pcr return pInfo ? pInfo->sTranslation : OUString(); } - OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OUString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return pInfo ? pInfo->sHelpId : OString(); + return pInfo ? pInfo->sHelpId : OUString(); } sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const @@ -410,131 +411,131 @@ namespace pcr OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); + if (_nId == PROPERTY_ID_SUBMIT_METHOD) + { + return { "Get", "Post" }; + } const TranslateId* pStringItemsResId = nullptr; - int nElements = 0; + std::size_t nElements = 0; switch ( _nId ) { case PROPERTY_ID_IMAGEPOSITION: pStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_IMAGE_POSITION); + nElements = std::size(RID_RSC_ENUM_IMAGE_POSITION); break; case PROPERTY_ID_BORDER: pStringItemsResId = RID_RSC_ENUM_BORDER_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_BORDER_TYPE); + nElements = std::size(RID_RSC_ENUM_BORDER_TYPE); break; case PROPERTY_ID_ICONSIZE: pStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ICONSIZE_TYPE); + nElements = std::size(RID_RSC_ENUM_ICONSIZE_TYPE); break; case PROPERTY_ID_COMMANDTYPE: pStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_COMMAND_TYPE); + nElements = std::size(RID_RSC_ENUM_COMMAND_TYPE); break; case PROPERTY_ID_LISTSOURCETYPE: pStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_LISTSOURCE_TYPE); + nElements = std::size(RID_RSC_ENUM_LISTSOURCE_TYPE); break; case PROPERTY_ID_ALIGN: pStringItemsResId = RID_RSC_ENUM_ALIGNMENT; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ALIGNMENT); + nElements = std::size(RID_RSC_ENUM_ALIGNMENT); break; case PROPERTY_ID_VERTICAL_ALIGN: pStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_VERTICAL_ALIGN); + nElements = std::size(RID_RSC_ENUM_VERTICAL_ALIGN); break; case PROPERTY_ID_BUTTONTYPE: pStringItemsResId = RID_RSC_ENUM_BUTTONTYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_BUTTONTYPE); + nElements = std::size(RID_RSC_ENUM_BUTTONTYPE); break; case PROPERTY_ID_PUSHBUTTONTYPE: pStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_PUSHBUTTONTYPE); - break; - case PROPERTY_ID_SUBMIT_METHOD: - pStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_METHOD); + nElements = std::size(RID_RSC_ENUM_PUSHBUTTONTYPE); break; case PROPERTY_ID_SUBMIT_ENCODING: pStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_ENCODING); + nElements = std::size(RID_RSC_ENUM_SUBMIT_ENCODING); break; case PROPERTY_ID_DATEFORMAT: pStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_DATEFORMAT_LIST); + nElements = std::size(RID_RSC_ENUM_DATEFORMAT_LIST); break; case PROPERTY_ID_TIMEFORMAT: pStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TIMEFORMAT_LIST); + nElements = std::size(RID_RSC_ENUM_TIMEFORMAT_LIST); break; case PROPERTY_ID_DEFAULT_STATE: case PROPERTY_ID_STATE: pStringItemsResId = RID_RSC_ENUM_CHECKED; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CHECKED); + nElements = std::size(RID_RSC_ENUM_CHECKED); break; case PROPERTY_ID_CYCLE: pStringItemsResId = RID_RSC_ENUM_CYCLE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CYCLE); + nElements = std::size(RID_RSC_ENUM_CYCLE); break; case PROPERTY_ID_NAVIGATION: pStringItemsResId = RID_RSC_ENUM_NAVIGATION; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_NAVIGATION); + nElements = std::size(RID_RSC_ENUM_NAVIGATION); break; case PROPERTY_ID_TARGET_FRAME: pStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SUBMIT_TARGET); + nElements = std::size(RID_RSC_ENUM_SUBMIT_TARGET); break; case PROPERTY_ID_ORIENTATION: pStringItemsResId = RID_RSC_ENUM_ORIENTATION; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_ORIENTATION); + nElements = std::size(RID_RSC_ENUM_ORIENTATION); break; case PROPERTY_ID_CELL_EXCHANGE_TYPE: pStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_CELL_EXCHANGE_TYPE); + nElements = std::size(RID_RSC_ENUM_CELL_EXCHANGE_TYPE); break; case PROPERTY_ID_SHOW_SCROLLBARS: pStringItemsResId = RID_RSC_ENUM_SCROLLBARS; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SCROLLBARS); + nElements = std::size(RID_RSC_ENUM_SCROLLBARS); break; case PROPERTY_ID_VISUALEFFECT: pStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_VISUALEFFECT); + nElements = std::size(RID_RSC_ENUM_VISUALEFFECT); break; case PROPERTY_ID_TEXTTYPE: pStringItemsResId = RID_RSC_ENUM_TEXTTYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TEXTTYPE); + nElements = std::size(RID_RSC_ENUM_TEXTTYPE); break; case PROPERTY_ID_LINEEND_FORMAT: pStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_LINEEND_FORMAT); + nElements = std::size(RID_RSC_ENUM_LINEEND_FORMAT); break; case PROPERTY_ID_XSD_WHITESPACES: pStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WHITESPACE_HANDLING); + nElements = std::size(RID_RSC_ENUM_WHITESPACE_HANDLING); break; case PROPERTY_ID_SELECTION_TYPE: case PROPERTY_ID_SELECTIONMODEL: pStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SELECTION_TYPE); + nElements = std::size(RID_RSC_ENUM_SELECTION_TYPE); break; case PROPERTY_ID_SCALE_MODE: pStringItemsResId = RID_RSC_ENUM_SCALE_MODE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SCALE_MODE); + nElements = std::size(RID_RSC_ENUM_SCALE_MODE); break; case PROPERTY_ID_WRITING_MODE: pStringItemsResId = RID_RSC_ENUM_WRITING_MODE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WRITING_MODE); + nElements = std::size(RID_RSC_ENUM_WRITING_MODE); break; case PROPERTY_ID_WHEEL_BEHAVIOR: pStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_WHEEL_BEHAVIOR); + nElements = std::size(RID_RSC_ENUM_WHEEL_BEHAVIOR); break; case PROPERTY_ID_TEXT_ANCHOR_TYPE: pStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_TEXT_ANCHOR_TYPE); + nElements = std::size(RID_RSC_ENUM_TEXT_ANCHOR_TYPE); break; case PROPERTY_ID_SHEET_ANCHOR_TYPE: pStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; - nElements = SAL_N_ELEMENTS(RID_RSC_ENUM_SHEET_ANCHOR_TYPE); + nElements = std::size(RID_RSC_ENUM_SHEET_ANCHOR_TYPE); break; default: OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); @@ -544,7 +545,7 @@ namespace pcr std::vector< OUString > aReturn; aReturn.reserve(nElements); - for (int i = 0; i < nElements; ++i) + for (std::size_t i = 0; i < nElements; ++i) { aReturn.push_back(PcrRes(pStringItemsResId[i])); } @@ -590,7 +591,7 @@ namespace pcr getPropertyInfo(); // TODO: a real structure which allows quick access by name as well as by id - for (sal_uInt16 i = 0; i < s_nCount; i++) + for (std::size_t i = 0; i < s_nCount; ++i) if (s_pPropertyInfos[i].nId == _nId) return &s_pPropertyInfos[i]; @@ -675,7 +676,7 @@ namespace pcr --nIntValue; std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); - if ( ( nIntValue >= 0 ) && ( nIntValue < static_cast<sal_Int32>(aEnumStrings.size()) ) ) + if ( ( nIntValue >= 0 ) && ( o3tl::make_unsigned(nIntValue) < aEnumStrings.size() ) ) { sReturn = aEnumStrings[ nIntValue ]; } |