|
|
@ -161,10 +161,13 @@ public class WriteCellStyle { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (source.getWriteFont() != null) { |
|
|
|
if (source.getWriteFont() != null) { |
|
|
|
if (target.getWriteFont() == null) { |
|
|
|
WriteFont targetWriteFont = target.getWriteFont(); |
|
|
|
target.setWriteFont(source.getWriteFont()); |
|
|
|
if (targetWriteFont == null) { |
|
|
|
|
|
|
|
targetWriteFont = new WriteFont(); |
|
|
|
|
|
|
|
WriteFont.merge(source.getWriteFont(), targetWriteFont); |
|
|
|
|
|
|
|
target.setWriteFont(targetWriteFont); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
WriteFont.merge(source.getWriteFont(), target.getWriteFont()); |
|
|
|
WriteFont.merge(source.getWriteFont(), targetWriteFont); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (source.getHidden() != null) { |
|
|
|
if (source.getHidden() != null) { |
|
|
|