[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - xmloff/source

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorImport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e1030d3e044d7754dc3a0a2a0af289ff5e434a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Mar 6 15:18:53 2018 +0200

    tdf#115432 footnote separator position wrong (2nd attempt)
    
    the first attempt (d4a8d91abd40dee7f7bd739a678a502a6e34cb59)
    incorrectly changed the type of a UNO property defined in a
    published IDL file.
    
    Change-Id: I75bc75dead0954d1faa6dfb6adab9f4c42c67cfc
    Reviewed-on: https://gerrit.libreoffice.org/50827
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 1163bcd5da3063e7e988ebf49d9b60dfd6f6c703)
    Reviewed-on: https://gerrit.libreoffice.org/50898
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index c9a7bfb2dd07..546e5bdec4e4 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -159,7 +159,7 @@ void XMLFootnoteSeparatorImport::StartElement(
     sal_Int32 nIndex;
 
     nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_ADJUST);
-    XMLPropertyState aLineAdjust( nIndex, uno::Any(eLineAdjust));
+    XMLPropertyState aLineAdjust( nIndex, uno::Any(sal_Int16(eLineAdjust)) );
     rProperties.push_back(aLineAdjust);
 
     nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_COLOR);