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/27 17:57:47 UTC
svn commit: r1151511 - in /poi/trunk/src/scratchpad/src/org/apache/poi/hwpf:
converter/AbstractWordUtils.java converter/WordToFoUtils.java
usermodel/CharacterRun.java
Author: sergey
Date: Wed Jul 27 15:57:45 2011
New Revision: 1151511
URL: http://svn.apache.org/viewvc?rev=1151511&view=rev
Log:
output language in (Word) XSL FO
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1151511&r1=1151510&r2=1151511&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java Wed Jul 27 15:57:45 2011
@@ -23,6 +23,9 @@ import java.io.InputStream;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
+
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFDocumentCore;
import org.apache.poi.hwpf.HWPFOldDocument;
@@ -46,6 +49,9 @@ public class AbstractWordUtils
{
static final String EMPTY = "";
+ private static final POILogger logger = POILogFactory
+ .getLogger( AbstractWordUtils.class );
+
public static final float TWIPS_PER_INCH = 1440.0f;
public static final int TWIPS_PER_PT = 20;
@@ -377,6 +383,23 @@ public class AbstractWordUtils
return "";
}
+ public static String getLanguage( int languageCode )
+ {
+ switch ( languageCode )
+ {
+ case 1033:
+ return "en-us";
+ case 1049:
+ return "ru-ru";
+ case 2057:
+ return "en-uk";
+ default:
+ logger.log( POILogger.WARN, "Uknown or unmapped language code: ",
+ Integer.valueOf( languageCode ) );
+ return "";
+ }
+ }
+
public static String getListItemNumberLabel( int number, int format )
{
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java?rev=1151511&r1=1151510&r2=1151511&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java Wed Jul 27 15:57:45 2011
@@ -74,6 +74,12 @@ public class WordToFoUtils extends Abstr
{
inline.setAttribute( "color", getColor24( characterRun.getIco24() ) );
}
+ if ( characterRun.getLanguageCode() != 0 )
+ {
+ final String language = getLanguage( characterRun.getLanguageCode() );
+ if ( isNotEmpty( language ) )
+ inline.setAttribute( "language", language );
+ }
if ( characterRun.isCapitalized() )
{
inline.setAttribute( "text-transform", "uppercase" );
@@ -273,7 +279,7 @@ public class WordToFoUtils extends Abstr
graphicElement.setAttribute( "clip", "rect(" + rectTop + "pt, "
+ rectRight + "pt, " + rectBottom + "pt, " + rectLeft
+ "pt)" );
- graphicElement.setAttribute( "oveerflow", "hidden" );
+ graphicElement.setAttribute( "overflow", "hidden" );
}
}
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=1151511&r1=1151510&r2=1151511&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 Wed Jul 27 15:57:45 2011
@@ -620,6 +620,10 @@ public final class CharacterRun
return _props.getBrc();
}
+ public int getLanguageCode() {
+ return _props.getLidDefault();
+ }
+
public String toString() {
String text = text();
return "CharacterRun of " + text.length() + " characters - " + text;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org