[Libreoffice-commits] core.git: include/svx svx/source

[Julien Nabet (via logerrit)]

 include/svx/strings.hrc       |    4 ----
 svx/source/svdraw/svdattr.cxx |   14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit be31a1de5c53e997ea6af5af51baa28e1e183733
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Nov 24 18:26:30 2021 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Nov 24 21:27:05 2021 +0100

    tdf#145833: Remove ITEMVALMEASURETEXTTYPES part in SdrMeasureTextHPosItem 
(svx)
    
    There's no need to use translations since it's only internal use
    See comments in the bugtracker to read the discussion
    
    Change-Id: Ic249081630640ad3ac306babe943f43ef8163901
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125785
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index a18d9d305e3d..8505c410a3df 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -300,10 +300,6 @@
 #define STR_ItemValEDGE_BEZIER                              
NC_("STR_ItemValEDGE_BEZIER", "Curved Connector")
 #define STR_ItemValMEASURE_STD                              
NC_("STR_ItemValMEASURE_STD", "Standard")
 #define STR_ItemValMEASURE_RADIUS                           
NC_("STR_ItemValMEASURE_RADIUS", "Radius")
-#define STR_ItemValMEASURE_TEXTHAUTO                        
NC_("STR_ItemValMEASURE_TEXTHAUTO", "automatic")
-#define STR_ItemValMEASURE_TEXTLEFTOUTSIDE                  
NC_("STR_ItemValMEASURE_TEXTLEFTOUTSIDE", "left outside")
-#define STR_ItemValMEASURE_TEXTINSIDE                       
NC_("STR_ItemValMEASURE_TEXTINSIDE", "inside (centered)")
-#define STR_ItemValMEASURE_TEXTRIGHTOUTSID                  
NC_("STR_ItemValMEASURE_TEXTRIGHTOUTSID", "right outside")
 #define STR_ItemValMEASURE_TEXTVAUTO                        
NC_("STR_ItemValMEASURE_TEXTVAUTO", "automatic")
 #define STR_ItemValMEASURE_ABOVE                            
NC_("STR_ItemValMEASURE_ABOVE", "on the line")
 #define STR_ItemValMEASURETEXT_BREAKEDLINE                  
NC_("STR_ItemValMEASURETEXT_BREAKEDLINE", "broken line")
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 982e6d7e8c18..b0df93a13855 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1603,15 +1603,15 @@ sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() 
const { return 4; }
 
 OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos)
 {
-    static TranslateId ITEMVALMEASURETEXTTYPES[] =
+    static std::array<OUString, 4> aMeasureTextHPosItem
     {
-        STR_ItemValMEASURE_TEXTHAUTO,
-        STR_ItemValMEASURE_TEXTLEFTOUTSIDE,
-        STR_ItemValMEASURE_TEXTINSIDE,
-        STR_ItemValMEASURE_TEXTRIGHTOUTSID
+        "automatic",
+        "left outside",
+        "inside (centered)",
+        "right outside"
     };
-    assert(nPos < SAL_N_ELEMENTS(ITEMVALMEASURETEXTTYPES) && "wrong pos!");
-    return SvxResId(ITEMVALMEASURETEXTTYPES[nPos]);
+    assert(nPos < aMeasureTextHPosItem.size() && "wrong pos!");
+    return aMeasureTextHPosItem[nPos];
 }
 
 bool SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,