xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 23aa8ea1ac4316c89c0dcbc2da2fef8dfcd9e3c3 Author: rbuj <robert....@gmail.com> Date: Thu Jul 31 19:37:15 2014 +0200 xmerge: String comparison Change-Id: Icda2e693c1e0177708c83af8048bc4e56c0db4ce Reviewed-on: https://gerrit.libreoffice.org/10665 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index a28edaa..d39a4d9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -434,7 +434,7 @@ public class Format implements Cloneable { return false; } - if (fontName!=rhs.fontName) + if (fontName == null ? rhs.fontName != null : !fontName.equals(rhs.fontName)) return false; if (foreground!=rhs.foreground) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits