diff --git a/0001-in-msword-the-hard-break-between-image-and-caption-h.patch b/0001-in-msword-the-hard-break-between-image-and-caption-h.patch new file mode 100644 index 0000000..dc06805 --- /dev/null +++ b/0001-in-msword-the-hard-break-between-image-and-caption-h.patch @@ -0,0 +1,46 @@ +From feedd45ba2dd308af2d3a1b2f64681b9467535b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 27 Oct 2016 14:37:03 +0100 +Subject: [PATCH] in msword the hard-break between image and caption has a + width + +while for us it doesn't, make it invisible to give it zero width +in both implementations to head off interoperability misery + +Change-Id: I0944006817944b20ef35502c8588357e7ee54810 +--- + sw/source/core/frmedt/fews.cxx | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx +index 9d206c1..58d0c90 100644 +--- a/sw/source/core/frmedt/fews.cxx ++++ b/sw/source/core/frmedt/fews.cxx +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -502,8 +503,15 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rText, con + } + //put a hard-break after the graphic to keep it separated + //from the caption text if the outer frame is resized +- SwIndex aIdx(pTextNode, bBefore ? nInsertPos : 1); ++ const sal_Int32 nIndex = bBefore ? nInsertPos : 1; ++ SwIndex aIdx(pTextNode, nIndex); + pTextNode->InsertText("\n", aIdx); ++ //set the hard-break to be hidden, otherwise it has ++ //non-zero width in word and so hard-break flows on ++ //the next line, pushing the caption text out of ++ //the frame making the caption apparently disappear ++ SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN); ++ pTextNode->InsertItem(aHidden, nIndex, nIndex + 1); + } + } + +-- +2.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index f1efb53..38e436f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -291,7 +291,8 @@ Patch55: 0001-Resolves-tdf-103530-tdf-103531-OOXML-external-refere.patch Patch56: 0001-convert-angle-from-degrees-to-radians-for-glm.patch Patch57: 0001-remove-OpenGL-transitions-config.-file-from-scheme.patch Patch58: 0001-Resolves-tdf-103472-gtk3-dnd-must-clear-listener-aft.patch -Patch59: 0001-ensure-checkForUniqueItem-on-inserting-a-new-slide.patch +Patch59: 0001-in-msword-the-hard-break-between-image-and-caption-h.patch +Patch60: 0001-ensure-checkForUniqueItem-on-inserting-a-new-slide.patch %if ! 0%{?rhel} Patch400: 0001-Update-liborcus-to-0.11.0.patch @@ -2365,10 +2366,11 @@ done %endif %changelog -* Mon Nov 07 2016 Caolán McNamara - 1:5.1.6.2-3-UNBUILT +* Mon Nov 07 2016 Caolán McNamara - 1:5.1.6.2-3 - implement CryptoAPI RC4 + SHA1 encryption scheme for doc - Resolves: tdf#103530 tdf#103531 OOXML: external references - tdf#103472 gtk3 dnd must clear listener after dragDropEnd dispatch +- improve caption export to .doc - ensure checkForUniqueItem on inserting a new slide * Fri Oct 21 2016 Caolán McNamara - 1:5.1.6.2-2