You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by se...@apache.org on 2011/07/16 18:32:28 UTC
svn commit: r1147453 - in /poi/trunk/src/scratchpad/src/org/apache/poi/hwpf:
converter/WordToHtmlUtils.java usermodel/CharacterRun.java
Author: sergey
Date: Sat Jul 16 16:32:27 2011
New Revision: 1147453
URL: http://svn.apache.org/viewvc?rev=1147453&view=rev
Log:
made getHighlightColor() public, so convertor don't need to clone CHP info
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java?rev=1147453&r1=1147452&r2=1147453&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java Sat Jul 16 16:32:27 2011
@@ -17,7 +17,6 @@
package org.apache.poi.hwpf.converter;
import org.apache.poi.hwpf.usermodel.BorderCode;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
import org.apache.poi.hwpf.usermodel.CharacterRun;
import org.apache.poi.hwpf.usermodel.Paragraph;
import org.apache.poi.hwpf.usermodel.TableCell;
@@ -33,7 +32,7 @@ public class WordToHtmlUtils extends Abs
public static void addBorder( BorderCode borderCode, String where,
StringBuilder style )
{
- if ( borderCode == null || borderCode.getBorderType() == 0 )
+ if ( borderCode == null || borderCode.isEmpty() )
return;
if ( isEmpty( where ) )
@@ -58,10 +57,7 @@ public class WordToHtmlUtils extends Abs
public static void addCharactersProperties(
final CharacterRun characterRun, StringBuilder style )
{
- final CharacterProperties clonedProperties = characterRun
- .cloneProperties();
-
- addBorder( clonedProperties.getBrc(), EMPTY, style );
+ addBorder( characterRun.getBorder(), EMPTY, style );
if ( characterRun.isCapitalized() )
{
@@ -70,7 +66,7 @@ public class WordToHtmlUtils extends Abs
if ( characterRun.isHighlighted() )
{
style.append( "background-color: "
- + getColor( clonedProperties.getIcoHighlight() ) + "; " );
+ + getColor( characterRun.getHighlightedColor() ) + "; " );
}
if ( characterRun.isStrikeThrough() )
{
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java?rev=1147453&r1=1147452&r2=1147453&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java Sat Jul 16 16:32:27 2011
@@ -417,6 +417,11 @@ public final class CharacterRun
return _props.isFHighlight();
}
+ public byte getHighlightedColor()
+ {
+ return _props.getIcoHighlight();
+ }
+
public void setHighlighted(byte color)
{
_props.setFHighlight(true);
@@ -533,7 +538,10 @@ public final class CharacterRun
/**
* clone the CharacterProperties object associated with this
* characterRun so that you can apply it to another CharacterRun
+ *
+ * @deprecated This method shall not be public and should not be called from high-level code
*/
+ @Deprecated
public CharacterProperties cloneProperties() {
try {
return (CharacterProperties)_props.clone();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org