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

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorExport.cxx |    6 +++++-
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4ecd9b10345d5cc89692592a9180999550e9c019
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Mar 7 17:32:40 2018 +0200

    tdf#115432 footnote separator position wrong (3rd attempt)
    
    My second attempt in
    
       commit dedf5e4f9000e271683dea9a0488e1b45b91176c
       "tdf#115432 footnote separator position wrong (2nd attempt)"
    
    managed to lose part of the change because of incorrect rebasing.
    
    Change-Id: I7b18f3e1602c617d1cb414ef0eb2ee456aeb58ee
    Reviewed-on: https://gerrit.libreoffice.org/50901
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit dcd95c6fff548c7ac46688244e44b95464fb297d)
    Reviewed-on: https://gerrit.libreoffice.org/50912
    (cherry picked from commit 95bf328d76352c4a2745ece21ccf99ac41693fb8)
    Reviewed-on: https://gerrit.libreoffice.org/50917
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 74ca184edcfc..a4ca43a68dd6 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -75,8 +75,12 @@ void XMLFootnoteSeparatorExport::exportXML(
         switch (rMapper->GetEntryContextId(rState.mnIndex))
         {
         case CTF_PM_FTN_LINE_ADJUST:
-            rState.maValue >>= eLineAdjust;
+        {
+            sal_Int16 nTmp;
+            if (rState.maValue >>= nTmp)
+                eLineAdjust = static_cast<text::HorizontalAdjust>(nTmp);
             break;
+        }
         case CTF_PM_FTN_LINE_COLOR:
             rState.maValue >>= nLineColor;
             break;
commit d0535042efbb7f319ebb6fa8b2d256b986d671ec
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/50894
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 800b3eb336f8ad707848d44656e322ed87cb3570)
    Reviewed-on: https://gerrit.libreoffice.org/50916

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);