xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 30e3c1c571f3a545143adaceb91102b7d6e329a3
Author: Noel Grandin <noel.gran...@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 <mst...@redhat.com>
Tested-by: Jenkins <c...@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.gran...@collabora.co.uk>
(cherry picked from commit 4ecd9b10345d5cc89692592a9180999550e9c019)
Reviewed-on: https://gerrit.libreoffice.org/50929
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
