summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-19 15:41:59 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-19 16:52:22 +0200
commit7320d7a4a4dd0657f2d650a6f580ad399529f0f1 (patch)
treed6d4e3865290d2bbbbed0fcc13ae9981f648ca3f /svx/source/unodraw
parent766cdd869d7d983e9e171a3eae0629cb9a0206ff (diff)
OUStringChar must either take a sal_Unicode or an ASCII char
...so forbid anything else, to avoid issues like the one described in 766cdd869d7d983e9e171a3eae0629cb9a0206ff "This code wants to add the numeric SvxRotateMode value". Some remaining places that apparently do want to convert some numeric value to sal_Unicode have been augmented with an explicit cast. Change-Id: I6200a84e250e697bc88694bd71142ca1d9a13651 Reviewed-on: https://gerrit.libreoffice.org/81132 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 0271af05eb69..4480fd533540 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -346,10 +346,10 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
switch(mpDoc->GetPageNumType())
{
case css::style::NumberingType::CHARS_UPPER_LETTER:
- aPageNumValue += OUStringChar( (mnPageNumber - 1) % 26 + 'A' );
+ aPageNumValue += OUStringChar( sal_Unicode((mnPageNumber - 1) % 26 + 'A') );
break;
case css::style::NumberingType::CHARS_LOWER_LETTER:
- aPageNumValue += OUStringChar( (mnPageNumber - 1) % 26 + 'a' );
+ aPageNumValue += OUStringChar( sal_Unicode((mnPageNumber - 1) % 26 + 'a') );
break;
case css::style::NumberingType::ROMAN_UPPER:
bUpper = true;