external/jpeg/README | 4 ++-- sw/source/core/fields/chpfld.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 988af531b337f8c829554ac2d12d41369bb2f19e Author: Andras Timar <andras.ti...@collabora.com> Date: Mon Feb 3 20:16:04 2014 +0100 update location of jpeg filter in README Change-Id: I418cccac5181c9a4e41f0fd5e06af10a21714f48 diff --git a/external/jpeg/README b/external/jpeg/README index a5c3c02..ab97a9e 100644 --- a/external/jpeg/README +++ b/external/jpeg/README @@ -1,6 +1,6 @@ External library for reading/writing jpegs -This is only used by the svtools jpeg import filter that is provided -for use by VCL see [[svtools/source/filter/jpeg]] +This is only used by the jpeg import filter that is provided +for use by VCL see [[vcl/source/filter/jpeg]] commit 57f10ec58c5be97ca7f66850c53a0d04c9885942 Author: Andras Timar <andras.ti...@collabora.com> Date: Tue Feb 4 20:05:15 2014 +0100 fdo#74489 replace '\n' to ' ' in fields (e.g. multiline headings) Change-Id: I1ce125e459dfcf22adef85efac344ceb320812a2 diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index b878ccd..e7fe520 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -34,7 +34,7 @@ namespace OUString removeControlChars(OUString sIn) { - OUStringBuffer aBuf(sIn); + OUStringBuffer aBuf(sIn.replace('\n', ' ')); sal_Int32 nLen = aBuf.getLength(); for (sal_Int32 i = 0; i < nLen; ++i) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits