diff options
| author | rbuj <robert.buj@gmail.com> | 2014-07-31 19:37:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-08-01 06:30:58 +0000 |
| commit | 23aa8ea1ac4316c89c0dcbc2da2fef8dfcd9e3c3 (patch) | |
| tree | 60a6acec04c59c90a446f54b7940a948817b4e53 /xmerge | |
| parent | 6053491532a5d9954caaa4abf09af30850f0cb94 (diff) | |
xmerge: String comparison
Change-Id: Icda2e693c1e0177708c83af8048bc4e56c0db4ce
Reviewed-on: https://gerrit.libreoffice.org/10665
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 a28edaaf9e89..d39a4d9f1da5 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) |