sw/source/ui/frmdlg/frmpage.cxx | 84 +++++++++++++++++++-------------------
sw/source/uibase/fldui/fldmgr.cxx | 78 +++++++++++++++++------------------
2 files changed, 81 insertions(+), 81 deletions(-)
New commits:
commit 9bc3c4fa8d380bd7ae5689692cc80f815bed4707
Author: Dr. David Alan Gilbert <d...@treblig.org>
AuthorDate: Thu Jun 8 21:43:15 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jun 13 16:22:00 2023 +0200
tdf#147021: sw/source use std::size() instead of SAL_N_ELEMENTS
Three big chunks of repeated use of SAL_N_ELEMENTS.
Change-Id: I1250b22a4bfadb4868382b996208f40c32235268
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152774
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index dc4e98da5b84..19bed7ba0476 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -407,46 +407,46 @@ static size_t lcl_GetFrameMapCount( const FrameMap* pMap)
if ( pMap )
{
if( pMap == aVParaHtmlMap)
- return SAL_N_ELEMENTS(aVParaHtmlMap);
+ return std::size(aVParaHtmlMap);
if( pMap == aVAsCharHtmlMap)
- return SAL_N_ELEMENTS(aVAsCharHtmlMap);
+ return std::size(aVAsCharHtmlMap);
if( pMap == aHParaHtmlMap)
- return SAL_N_ELEMENTS(aHParaHtmlMap);
+ return std::size(aHParaHtmlMap);
if( pMap == aHParaHtmlAbsMap)
- return SAL_N_ELEMENTS(aHParaHtmlAbsMap);
+ return std::size(aHParaHtmlAbsMap);
if ( pMap == aVPageMap )
- return SAL_N_ELEMENTS(aVPageMap);
+ return std::size(aVPageMap);
if ( pMap == aVPageHtmlMap )
- return SAL_N_ELEMENTS(aVPageHtmlMap);
+ return std::size(aVPageHtmlMap);
if ( pMap == aVAsCharMap )
- return SAL_N_ELEMENTS(aVAsCharMap);
+ return std::size(aVAsCharMap);
if ( pMap == aVParaMap )
- return SAL_N_ELEMENTS(aVParaMap);
+ return std::size(aVParaMap);
if ( pMap == aHParaMap )
- return SAL_N_ELEMENTS(aHParaMap);
+ return std::size(aHParaMap);
if ( pMap == aHFrameMap )
- return SAL_N_ELEMENTS(aHFrameMap);
+ return std::size(aHFrameMap);
if ( pMap == aVFrameMap )
- return SAL_N_ELEMENTS(aVFrameMap);
+ return std::size(aVFrameMap);
if ( pMap == aHCharMap )
- return SAL_N_ELEMENTS(aHCharMap);
+ return std::size(aHCharMap);
if ( pMap == aHCharHtmlMap )
- return SAL_N_ELEMENTS(aHCharHtmlMap);
+ return std::size(aHCharHtmlMap);
if ( pMap == aHCharHtmlAbsMap )
- return SAL_N_ELEMENTS(aHCharHtmlAbsMap);
+ return std::size(aHCharHtmlAbsMap);
if ( pMap == aVCharMap )
- return SAL_N_ELEMENTS(aVCharMap);
+ return std::size(aVCharMap);
if ( pMap == aVCharHtmlMap )
- return SAL_N_ELEMENTS(aVCharHtmlMap);
+ return std::size(aVCharHtmlMap);
if ( pMap == aVCharHtmlAbsMap )
- return SAL_N_ELEMENTS(aVCharHtmlAbsMap);
+ return std::size(aVCharHtmlAbsMap);
if ( pMap == aHPageHtmlMap )
- return SAL_N_ELEMENTS(aHPageHtmlMap);
+ return std::size(aHPageHtmlMap);
if ( pMap == aHFlyHtmlMap )
- return SAL_N_ELEMENTS(aHFlyHtmlMap);
+ return std::size(aHFlyHtmlMap);
if ( pMap == aVFlyHtmlMap )
- return SAL_N_ELEMENTS(aVFlyHtmlMap);
- return SAL_N_ELEMENTS(aHPageMap);
+ return std::size(aVFlyHtmlMap);
+ return std::size(aHPageMap);
}
return 0;
}
@@ -742,27 +742,27 @@ namespace
void SwFramePage::setOptimalFrameWidth()
{
static FrameMaps const aMaps[] = {
- { aHPageMap, SAL_N_ELEMENTS(aHPageMap) },
- { aHPageHtmlMap, SAL_N_ELEMENTS(aHPageHtmlMap) },
- { aVPageMap, SAL_N_ELEMENTS(aVPageMap) },
- { aVPageHtmlMap, SAL_N_ELEMENTS(aVPageHtmlMap) },
- { aHFrameMap, SAL_N_ELEMENTS(aHFrameMap) },
- { aHFlyHtmlMap, SAL_N_ELEMENTS(aHFlyHtmlMap) },
- { aVFrameMap, SAL_N_ELEMENTS(aVFrameMap) },
- { aVFlyHtmlMap, SAL_N_ELEMENTS(aVFlyHtmlMap) },
- { aHParaMap, SAL_N_ELEMENTS(aHParaMap) },
- { aHParaHtmlMap, SAL_N_ELEMENTS(aHParaHtmlMap) },
- { aHParaHtmlAbsMap, SAL_N_ELEMENTS(aHParaHtmlAbsMap) },
- { aVParaMap, SAL_N_ELEMENTS(aVParaMap) },
- { aVParaHtmlMap, SAL_N_ELEMENTS(aVParaHtmlMap) },
- { aHCharMap, SAL_N_ELEMENTS(aHCharMap) },
- { aHCharHtmlMap, SAL_N_ELEMENTS(aHCharHtmlMap) },
- { aHCharHtmlAbsMap, SAL_N_ELEMENTS(aHCharHtmlAbsMap) },
- { aVCharMap, SAL_N_ELEMENTS(aVCharMap) },
- { aVCharHtmlMap, SAL_N_ELEMENTS(aVCharHtmlMap) },
- { aVCharHtmlAbsMap, SAL_N_ELEMENTS(aVCharHtmlAbsMap) },
- { aVAsCharMap, SAL_N_ELEMENTS(aVAsCharMap) },
- { aVAsCharHtmlMap, SAL_N_ELEMENTS(aVAsCharHtmlMap) }
+ { aHPageMap, std::size(aHPageMap) },
+ { aHPageHtmlMap, std::size(aHPageHtmlMap) },
+ { aVPageMap, std::size(aVPageMap) },
+ { aVPageHtmlMap, std::size(aVPageHtmlMap) },
+ { aHFrameMap, std::size(aHFrameMap) },
+ { aHFlyHtmlMap, std::size(aHFlyHtmlMap) },
+ { aVFrameMap, std::size(aVFrameMap) },
+ { aVFlyHtmlMap, std::size(aVFlyHtmlMap) },
+ { aHParaMap, std::size(aHParaMap) },
+ { aHParaHtmlMap, std::size(aHParaHtmlMap) },
+ { aHParaHtmlAbsMap, std::size(aHParaHtmlAbsMap) },
+ { aVParaMap, std::size(aVParaMap) },
+ { aVParaHtmlMap, std::size(aVParaHtmlMap) },
+ { aHCharMap, std::size(aHCharMap) },
+ { aHCharHtmlMap, std::size(aHCharHtmlMap) },
+ { aHCharHtmlAbsMap, std::size(aHCharHtmlAbsMap) },
+ { aVCharMap, std::size(aVCharMap) },
+ { aVCharHtmlMap, std::size(aVCharHtmlMap) },
+ { aVCharHtmlAbsMap, std::size(aVCharHtmlAbsMap) },
+ { aVAsCharMap, std::size(aVAsCharMap) },
+ { aVAsCharHtmlMap, std::size(aVAsCharHtmlMap) }
};
std::vector<SvxSwFramePosString::StringId> aFrames;
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index efc5f916f178..1596b1094e89 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -303,55 +303,55 @@ struct SwFieldPack
const SwFieldPack aSwFields[] =
{
// Document
- { SwFieldTypesEnum::ExtendedUser, FLD_EU_ARY,
SAL_N_ELEMENTS(FLD_EU_ARY), nullptr, 0 },
- { SwFieldTypesEnum::Author, nullptr, 0,
FMT_AUTHOR_ARY, SAL_N_ELEMENTS(FMT_AUTHOR_ARY) },
- { SwFieldTypesEnum::Date, FLD_DATE_ARY,
SAL_N_ELEMENTS(FLD_DATE_ARY), nullptr, 0 },
- { SwFieldTypesEnum::Time, FLD_TIME_ARY,
SAL_N_ELEMENTS(FLD_TIME_ARY), nullptr, 0 },
- { SwFieldTypesEnum::PageNumber, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) -1 },
- { SwFieldTypesEnum::NextPage, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) },
- { SwFieldTypesEnum::PreviousPage, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) },
- { SwFieldTypesEnum::Filename, nullptr, 0,
FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) },
- { SwFieldTypesEnum::DocumentStatistics, FLD_STAT_ARY,
SAL_N_ELEMENTS(FLD_STAT_ARY), FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY)
-1 },
-
- { SwFieldTypesEnum::Chapter, nullptr, 0,
FMT_CHAPTER_ARY, SAL_N_ELEMENTS(FMT_CHAPTER_ARY) },
- { SwFieldTypesEnum::TemplateName, nullptr, 0,
FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) },
- { SwFieldTypesEnum::ParagraphSignature, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::ExtendedUser, FLD_EU_ARY,
std::size(FLD_EU_ARY), nullptr, 0 },
+ { SwFieldTypesEnum::Author, nullptr, 0,
FMT_AUTHOR_ARY, std::size(FMT_AUTHOR_ARY) },
+ { SwFieldTypesEnum::Date, FLD_DATE_ARY,
std::size(FLD_DATE_ARY), nullptr, 0 },
+ { SwFieldTypesEnum::Time, FLD_TIME_ARY,
std::size(FLD_TIME_ARY), nullptr, 0 },
+ { SwFieldTypesEnum::PageNumber, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) -1 },
+ { SwFieldTypesEnum::NextPage, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) },
+ { SwFieldTypesEnum::PreviousPage, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) },
+ { SwFieldTypesEnum::Filename, nullptr, 0,
FMT_FF_ARY, std::size(FMT_FF_ARY) },
+ { SwFieldTypesEnum::DocumentStatistics, FLD_STAT_ARY,
std::size(FLD_STAT_ARY), FMT_NUM_ARY, std::size(FMT_NUM_ARY) -1 },
+
+ { SwFieldTypesEnum::Chapter, nullptr, 0,
FMT_CHAPTER_ARY, std::size(FMT_CHAPTER_ARY) },
+ { SwFieldTypesEnum::TemplateName, nullptr, 0,
FMT_FF_ARY, std::size(FMT_FF_ARY) },
+ { SwFieldTypesEnum::ParagraphSignature, nullptr, 0,
nullptr, 0 },
// Functions
- { SwFieldTypesEnum::ConditionalText, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::Dropdown, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::Input, FLD_INPUT_ARY,
SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 },
- { SwFieldTypesEnum::Macro, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::JumpEdit, nullptr, 0,
FMT_MARK_ARY, SAL_N_ELEMENTS(FMT_MARK_ARY) },
- { SwFieldTypesEnum::CombinedChars, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::HiddenText, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::HiddenParagraph, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::ConditionalText, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::Dropdown, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::Input, FLD_INPUT_ARY,
std::size(FLD_INPUT_ARY), nullptr, 0 },
+ { SwFieldTypesEnum::Macro, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::JumpEdit, nullptr, 0,
FMT_MARK_ARY, std::size(FMT_MARK_ARY) },
+ { SwFieldTypesEnum::CombinedChars, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::HiddenText, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::HiddenParagraph, nullptr, 0,
nullptr, 0 },
// Cross-References
- { SwFieldTypesEnum::SetRef, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::GetRef, nullptr, 0,
FMT_REF_ARY, SAL_N_ELEMENTS(FMT_REF_ARY) },
+ { SwFieldTypesEnum::SetRef, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::GetRef, nullptr, 0,
FMT_REF_ARY, std::size(FMT_REF_ARY) },
// DocInformation
- { SwFieldTypesEnum::DocumentInfo, nullptr, 0,
FMT_REG_ARY, SAL_N_ELEMENTS(FMT_REG_ARY) },
+ { SwFieldTypesEnum::DocumentInfo, nullptr, 0,
FMT_REG_ARY, std::size(FMT_REG_ARY) },
// Database
- { SwFieldTypesEnum::Database, nullptr, 0,
FMT_DBFLD_ARY, SAL_N_ELEMENTS(FMT_DBFLD_ARY) },
- { SwFieldTypesEnum::DatabaseNextSet, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::DatabaseNumberSet, nullptr, 0,
nullptr, 0 },
- { SwFieldTypesEnum::DatabaseSetNumber, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
- { SwFieldTypesEnum::DatabaseName, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::Database, nullptr, 0,
FMT_DBFLD_ARY, std::size(FMT_DBFLD_ARY) },
+ { SwFieldTypesEnum::DatabaseNextSet, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::DatabaseNumberSet, nullptr, 0,
nullptr, 0 },
+ { SwFieldTypesEnum::DatabaseSetNumber, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) - 2 },
+ { SwFieldTypesEnum::DatabaseName, nullptr, 0,
nullptr, 0 },
// Variables
- { SwFieldTypesEnum::Set, nullptr, 0,
FMT_SETVAR_ARY, SAL_N_ELEMENTS(FMT_SETVAR_ARY) },
-
- { SwFieldTypesEnum::Get, nullptr, 0,
FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
- { SwFieldTypesEnum::DDE, nullptr, 0,
FMT_DDE_ARY, SAL_N_ELEMENTS(FMT_DDE_ARY) },
- { SwFieldTypesEnum::Formel, nullptr, 0,
FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
- { SwFieldTypesEnum::Input, FLD_INPUT_ARY,
SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 },
- { SwFieldTypesEnum::Sequence, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
- { SwFieldTypesEnum::SetRefPage, FLD_PAGEREF_ARY,
SAL_N_ELEMENTS(FLD_PAGEREF_ARY),nullptr, 0 },
- { SwFieldTypesEnum::GetRefPage, nullptr, 0,
FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 1 },
- { SwFieldTypesEnum::User, nullptr, 0,
FMT_USERVAR_ARY, SAL_N_ELEMENTS(FMT_USERVAR_ARY) }
+ { SwFieldTypesEnum::Set, nullptr, 0,
FMT_SETVAR_ARY, std::size(FMT_SETVAR_ARY) },
+
+ { SwFieldTypesEnum::Get, nullptr, 0,
FMT_GETVAR_ARY, std::size(FMT_GETVAR_ARY) },
+ { SwFieldTypesEnum::DDE, nullptr, 0,
FMT_DDE_ARY, std::size(FMT_DDE_ARY) },
+ { SwFieldTypesEnum::Formel, nullptr, 0,
FMT_GETVAR_ARY, std::size(FMT_GETVAR_ARY) },
+ { SwFieldTypesEnum::Input, FLD_INPUT_ARY,
std::size(FLD_INPUT_ARY), nullptr, 0 },
+ { SwFieldTypesEnum::Sequence, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) - 2 },
+ { SwFieldTypesEnum::SetRefPage, FLD_PAGEREF_ARY,
std::size(FLD_PAGEREF_ARY),nullptr, 0 },
+ { SwFieldTypesEnum::GetRefPage, nullptr, 0,
FMT_NUM_ARY, std::size(FMT_NUM_ARY) - 1 },
+ { SwFieldTypesEnum::User, nullptr, 0,
FMT_USERVAR_ARY, std::size(FMT_USERVAR_ARY) }
};
// access to the shell
