tdf#156699 sfx2: Extract helper method to get char value + name

It will be reused in an upcoming commit to set the a11y
name for the `SvxCharView`.

Change-Id: Ib5938e5363571e547ee00cac8432f919b60cd97a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155756
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

1 files changed, 16 insertions, 2 deletions

diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 50c7099a84a7..99fa9dbd1d3d 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -65,7 +65,7 @@ void SvxCharView::GetFocus()
 
 void SvxCharView::LoseFocus() { Invalidate(); }
 
-OUString SvxCharView::GetCharInfoText()
+bool SvxCharView::GetDecimalValueAndCharName(sal_UCS4& rDecimalValue, OUString& rCharName)
 {
     OUString charValue = GetText();
     sal_UCS4 nDecimalValue = charValue.iterateCodePoints(&o3tl::temporary(sal_Int32(1)), -1);
@@ -77,8 +77,22 @@ OUString SvxCharView::GetCharInfoText()
     u_charName(nDecimalValue, U_UNICODE_CHAR_NAME, buffer, sizeof(buffer), &errorCode);
     if (U_SUCCESS(errorCode))
     {
+        rDecimalValue = nDecimalValue;
+        rCharName = OUString::createFromAscii(buffer);
+        return true;
+    }
+    return false;
+}
+
+OUString SvxCharView::GetCharInfoText()
+{
+    sal_UCS4 nDecimalValue = 0;
+    OUString sCharName;
+    const bool bSuccess = GetDecimalValueAndCharName(nDecimalValue, sCharName);
+    if (bSuccess)
+    {
         OUString aHexText = OUString::number(nDecimalValue, 16).toAsciiUpperCase();
-        return charValue + u" " + OUString::createFromAscii(buffer) + u" U+" + aHexText;
+        return GetText() + u" " + sCharName + u" U+" + aHexText;
     }
     return OUString();
 }