[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - reportdesign/source

[Julien Nabet]

 reportdesign/source/ui/inspection/GeometryHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e8436c38dcefc1b120ead43d3c2ac7ff4903511a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jan 28 10:38:46 2018 +0100

    tdf#115269: fix crash when changing horizontal align (reportdesign)
    
    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 at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 3003c27d87c6ad47ed9cadb1f574882c530522b1)
    Reviewed-on: https://gerrit.libreoffice.org/48787
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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: