summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-01-28 10:38:46 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2018-01-30 18:28:04 +0100
commite8436c38dcefc1b120ead43d3c2ac7ff4903511a (patch)
tree86d4692cef69c3ef29d68e934628b477ad5c68be
parentbump product version to 6.0.0.3.0+ (diff)
downloadcore-libreoffice-6-0-0.tar.gz
core-libreoffice-6-0-0.zip
tdf#115269: fix crash when changing horizontal align (reportdesign) libreoffice-6-0-0
See bt: https://bugs.documentfoundation.org/attachment.cgi?id=139403 Regression from https://cgit.freedesktop.org/libreoffice/core/log/?qt=range&q=00657aef09d854c74fb426a935a3e8b1fc390bb0 Change-Id: Id23dbbec7dd93a603d906b5d8f7bbf74d14e1d65 Reviewed-on: https://gerrit.libreoffice.org/48765 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 3003c27d87c6ad47ed9cadb1f574882c530522b1) Reviewed-on: https://gerrit.libreoffice.org/48787 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 1c80a32ae1c7..0b7225f834b9 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1257,7 +1257,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
sal_Int16 nParagraphAdjust = (sal_Int16)style::ParagraphAdjust_LEFT;
aPropertyValue >>= nParagraphAdjust;
if (static_cast<sal_uInt32>(nParagraphAdjust) < SAL_N_ELEMENTS(RID_STR_PARAADJUST_CONST) - 1)
- aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[nParagraphAdjust]);
+ aControlValue <<= RptResId(RID_STR_PARAADJUST_CONST[nParagraphAdjust]);
}
break;
case PROPERTY_ID_BACKCOLOR: