Kaydet (Commit) 23aa8ea1 authored tarafından rbuj's avatar rbuj Kaydeden (comit) Noel Grandin

xmerge: String comparison

Change-Id: Icda2e693c1e0177708c83af8048bc4e56c0db4ce
Reviewed-on: https://gerrit.libreoffice.org/10665Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 60534915
...@@ -434,7 +434,7 @@ public class Format implements Cloneable { ...@@ -434,7 +434,7 @@ public class Format implements Cloneable {
return false; return false;
} }
if (fontName!=rhs.fontName) if (fontName == null ? rhs.fontName != null : !fontName.equals(rhs.fontName))
return false; return false;
if (foreground!=rhs.foreground) if (foreground!=rhs.foreground)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment