[Libreoffice-commits] core.git: sd/source

[Mike Kaganski (via logerrit)]

 sd/source/ui/sidebar/LayoutMenu.cxx |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 29691361002154a34c3a617e75682af4cbc19048
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Oct 19 09:59:15 2023 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Oct 19 12:31:16 2023 +0200

    Use std::span instead of sentinel elements
    
    Change-Id: Idcde4728f4db5b878c126c29c1953dff7c47f05a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158139
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index bf3ff1257e99..9022609df7d7 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -82,13 +82,10 @@ struct snew_slide_value_info
 
 }
 
-constexpr std::u16string_view EMPTY = u"";
-
 constexpr snew_slide_value_info notes[] =
 {
     {BMP_SLIDEN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
      AUTOLAYOUT_NOTES},
-    {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 constexpr snew_slide_value_info handout[] =
@@ -105,7 +102,6 @@ constexpr snew_slide_value_info handout[] =
      AUTOLAYOUT_HANDOUT6},
     {BMP_SLIDEH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT9},
-    {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 constexpr snew_slide_value_info standard[] =
@@ -128,7 +124,6 @@ constexpr snew_slide_value_info standard[] =
     {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, 
AUTOLAYOUT_VTITLE_VCONTENT},
     {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, 
AUTOLAYOUT_TITLE_VCONTENT},
     {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   
WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT},
-    {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 class LayoutValueSet : public ValueSet
@@ -518,7 +513,7 @@ void LayoutMenu::Fill()
     catch (RuntimeException&)
     {}
 
-    const snew_slide_value_info* pInfo = nullptr;
+    std::span<const snew_slide_value_info> pInfo;
     if (sCenterPaneViewName == framework::FrameworkHelper::msNotesViewURL)
     {
         pInfo = notes;
@@ -532,27 +527,23 @@ void LayoutMenu::Fill()
     {
         pInfo = standard;
     }
-    else
-    {
-        pInfo = nullptr;
-    }
 
     Clear();
-    for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mpStrResId; i++, pInfo++)
+    for (size_t i = 0; i < pInfo.size(); i++)
     {
-        if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
+        if ((WritingMode_TB_RL != pInfo[i].meWritingMode) || bVertical)
         {
-            Image aImg(OUString::Concat("private:graphicrepository/") + 
pInfo->msBmpResId);
+            Image aImg(OUString::Concat("private:graphicrepository/") + 
pInfo[i].msBmpResId);
 
-            if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
+            if (bRightToLeft && (WritingMode_TB_RL != pInfo[i].meWritingMode))
             { // FIXME: avoid interpolating RTL layouts.
                 BitmapEx aRTL = aImg.GetBitmapEx();
                 aRTL.Mirror(BmpMirrorFlags::Horizontal);
                 aImg = Image(aRTL);
             }
 
-            mxLayoutValueSet->InsertItem(i, aImg, SdResId(pInfo->mpStrResId));
-            mxLayoutValueSet->SetItemData (i, new 
AutoLayout(pInfo->maAutoLayout));
+            mxLayoutValueSet->InsertItem(i + 1, aImg, 
SdResId(pInfo[i].mpStrResId));
+            mxLayoutValueSet->SetItemData(i + 1, new 
AutoLayout(pInfo[i].maAutoLayout));
         }
     }
 }