applied_patches/0343-oox-import-drawing-font-spacing.diff

   1 diff -rup oox-orig/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx
   2 --- oox-orig/inc/oox/drawingml/drawingmltypes.hxx       2009-10-12 14:39:27.000000000 +0200
   3 +++ oox/inc/oox/drawingml/drawingmltypes.hxx    2009-10-12 14:39:38.000000000 +0200
   4 @@ -121,6 +121,7 @@ float GetTextSize( const ::rtl::OUString
   5
   6  /** converts the ST_TextSpacingPoint to 1/100mm */
   7  sal_Int32 GetTextSpacingPoint(  const ::rtl::OUString& sValue );
   8 +sal_Int32 GetTextSpacingPoint(  const sal_Int32 nValue );
   9
  10  /** */
  11  ::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
  12 diff -rup oox-orig/inc/oox/drawingml/textcharacterproperties.hxx oox/inc/oox/drawingml/textcharacterproperties.hxx
  13 --- oox-orig/inc/oox/drawingml/textcharacterproperties.hxx      2009-10-12 14:39:27.000000000 +0200
  14 +++ oox/inc/oox/drawingml/textcharacterproperties.hxx   2009-10-12 14:39:38.000000000 +0200
  15 @@ -55,6 +55,7 @@ struct TextCharacterProperties
  16      Color               maHighlightColor;
  17      OptValue< ::rtl::OUString > moLang;
  18      OptValue< sal_Int32 > moHeight;
  19 +    OptValue< sal_Int32 > moSpacing;
  20      OptValue< sal_Int32 > moUnderline;
  21      OptValue< sal_Int32 > moStrikeout;
  22      OptValue< sal_Int32 > moCaseMap;
  23 diff -rup oox-orig/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx
  24 --- oox-orig/source/drawingml/drawingmltypes.cxx        2009-10-12 14:39:27.000000000 +0200
  25 +++ oox/source/drawingml/drawingmltypes.cxx     2009-10-12 14:39:38.000000000 +0200
  26 @@ -128,10 +128,14 @@ sal_Int32 GetTextSpacingPoint( const OUS
  27  {
  28      sal_Int32 nRet;
  29      if( ::sax::Converter::convertNumber( nRet, sValue ) )
  30 -        nRet = ( nRet * 254 + 360 ) / 720;
  31 +           nRet = GetTextSpacingPoint( nRet );
  32      return nRet;
  33  }
  34
  35 +sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue )
  36 +{
  37 +       return ( nValue * 254 + 360 ) / 720;
  38 +}
  39
  40  float GetFontHeight( sal_Int32 nHeight )
  41  {
  42 diff -rup oox-orig/source/drawingml/textcharacterpropertiescontext.cxx oox/source/drawingml/textcharacterpropertiescontext.cxx
  43 --- oox-orig/source/drawingml/textcharacterpropertiescontext.cxx        2009-10-12 14:39:27.000000000 +0200
  44 +++ oox/source/drawingml/textcharacterpropertiescontext.cxx     2009-10-12 14:39:38.000000000 +0200
  45 @@ -61,6 +61,7 @@ TextCharacterPropertiesContext::TextChar
  46      AttributeList aAttribs( rXAttributes );
  47      mrTextCharacterProperties.moLang        = aAttribs.getString( XML_lang );
  48      mrTextCharacterProperties.moHeight      = aAttribs.getInteger( XML_sz );
  49 +    mrTextCharacterProperties.moSpacing     = aAttribs.getInteger( XML_spc );
  50      mrTextCharacterProperties.moUnderline   = aAttribs.getToken( XML_u );
  51      mrTextCharacterProperties.moStrikeout   = aAttribs.getToken( XML_strike );
  52  //    mrTextCharacterProperties.moCaseMap     = aAttribs.getToken( XML_cap );
  53 diff -rup oox-orig/source/drawingml/textcharacterproperties.cxx oox/source/drawingml/textcharacterproperties.cxx
  54 --- oox-orig/source/drawingml/textcharacterproperties.cxx       2009-10-12 14:39:27.000000000 +0200
  55 +++ oox/source/drawingml/textcharacterproperties.cxx    2009-10-12 14:40:54.000000000 +0200
  56 @@ -62,6 +62,7 @@ void TextCharacterProperties::assignUsed
  57      maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
  58      maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
  59      moHeight.assignIfUsed( rSourceProps.moHeight );
  60 +    moSpacing.assignIfUsed( rSourceProps.moSpacing );
  61      moUnderline.assignIfUsed( rSourceProps.moUnderline );
  62      moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
  63      moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
  64 @@ -129,6 +130,8 @@ void TextCharacterProperties::pushToProp
  65          rPropMap[ PROP_CharHeightComplex ] <<= fHeight;
  66      }
  67
  68 +    rPropMap[ PROP_CharKerning ] <<= (sal_Int16) GetTextSpacingPoint( moSpacing.get( 0 ) );
  69 +
  70      rPropMap[ PROP_CharUnderline ] <<= GetFontUnderline( moUnderline.get( XML_none ) );
  71      rPropMap[ PROP_CharStrikeout ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) );
  72      rPropMap[ PROP_CharCaseMap ] <<= GetCaseMap( moCaseMap.get( XML_none ) );
  73 diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt
  74 --- oox-orig/source/token/properties.txt        2009-10-12 14:39:27.000000000 +0200
  75 +++ oox/source/token/properties.txt     2009-10-12 14:41:22.000000000 +0200
  76 @@ -58,6 +58,7 @@ CharFontPitchComplex
  77  CharHeight
  78  CharHeightAsian
  79  CharHeightComplex
  80 +CharKerning
  81  CharLocale
  82  CharLocaleAsian
  83  CharLocaleComplex