applied_patches/0836-cws-ooxml03-docx-sw-fix-spacing.diff

   1 Index: attributeoutputbase.hxx
   2 ===================================================================
   3 --- sw/source/filter/docx/attributeoutputbase.hxx       (revision 271125)
   4 +++ sw/source/filter/docx/attributeoutputbase.hxx       (working copy)
   5 @@ -453,8 +453,11 @@
   6      virtual void TextHardBlank( const SwFmtHardBlank& ) = 0;
   7
   8      /// Sfx item RES_PARATR_LINESPACING
   9 -    virtual void ParaLineSpacing( const SvxLineSpacingItem& ) = 0;
  10 +    void ParaLineSpacing( const SvxLineSpacingItem& );
  11
  12 +    /// Count the values in ParaLineSpacing, and pass theme here.
  13 +    virtual void ParaLineSpacing_Impl( short nSpace, short nMulti ) = 0;
  14 +
  15      /// Sfx item RES_PARATR_ADJUST
  16      virtual void ParaAdjust( const SvxAdjustItem& ) = 0;
  17
  18 Index: ww8atr.cxx
  19 ===================================================================
  20 --- sw/source/filter/docx/docx-ww8atr.cxx       (revision 271125)
  21 +++ sw/source/filter/docx/docx-ww8atr.cxx       (working copy)
  22 @@ -4434,7 +4434,7 @@
  23
  24  /* File PARATR.HXX  */
  25
  26 -void WW8AttributeOutput::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
  27 +void WW8AttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
  28  {
  29      // sprmPDyaLine
  30      if ( m_rWW8Export.bWrtWW8 )
  31 @@ -4442,6 +4442,12 @@
  32      else
  33          m_rWW8Export.pO->Insert( 20, m_rWW8Export.pO->Count() );
  34
  35 +    m_rWW8Export.InsUInt16( nSpace );
  36 +    m_rWW8Export.InsUInt16( nMulti );
  37 +}
  38 +
  39 +void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
  40 +{
  41      short nSpace = 240, nMulti = 0;
  42
  43      switch ( rSpacing.GetLineSpaceRule() )
  44 @@ -4462,15 +4468,14 @@
  45                      sal_uInt16 nScript =
  46                          i18n::ScriptType::LATIN;
  47                      const SwAttrSet *pSet = 0;
  48 -                    if ( m_rWW8Export.pOutFmtNode && m_rWW8Export.pOutFmtNode->ISA( SwFmt ) )
  49 +                    if ( GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwFmt ) )
  50                      {
  51 -                        const SwFmt *pFmt = (const SwFmt*)( m_rWW8Export.pOutFmtNode );
  52 +                        const SwFmt *pFmt = (const SwFmt*)( GetExport().pOutFmtNode );
  53                          pSet = &pFmt->GetAttrSet();
  54                      }
  55 -                    else if ( m_rWW8Export.pOutFmtNode && m_rWW8Export.pOutFmtNode->ISA( SwTxtNode ) )
  56 +                    else if ( GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwTxtNode ) )
  57                      {
  58 -                        const SwTxtNode* pNd =
  59 -                            (const SwTxtNode*)m_rWW8Export.pOutFmtNode;
  60 +                        const SwTxtNode* pNd = (const SwTxtNode*)GetExport().pOutFmtNode;
  61                          pSet = &pNd->GetSwAttrSet();
  62                          if ( pBreakIt->xBreak.is() )
  63                          {
  64 @@ -4481,7 +4486,7 @@
  65                      ASSERT( pSet, "No attrset for lineheight :-(" );
  66                      if ( pSet )
  67                      {
  68 -                        nSpace = nSpace + (short)( AttrSetToLineHeight( *m_rWW8Export.pDoc,
  69 +                        nSpace = nSpace + (short)( AttrSetToLineHeight( *GetExport().pDoc,
  70                              *pSet, *Application::GetDefaultDevice(), nScript ) );
  71                      }
  72                  }
  73 @@ -4501,8 +4506,7 @@
  74          break;
  75      }
  76
  77 -    m_rWW8Export.InsUInt16( nSpace );
  78 -    m_rWW8Export.InsUInt16( nMulti );
  79 +    ParaLineSpacing_Impl( nSpace, nMulti );
  80  }
  81
  82  void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
  83 Index: ww8attributeoutput.hxx
  84 ===================================================================
  85 --- sw/source/filter/docx/ww8attributeoutput.hxx        (revision 271125)
  86 +++ sw/source/filter/docx/ww8attributeoutput.hxx        (working copy)
  87 @@ -327,7 +327,7 @@
  88      virtual void TextHardBlank( const SwFmtHardBlank& );
  89
  90      /// Sfx item RES_PARATR_LINESPACING
  91 -    virtual void ParaLineSpacing( const SvxLineSpacingItem& );
  92 +    virtual void ParaLineSpacing_Impl( short nSpace, short nMulti );
  93
  94      /// Sfx item RES_PARATR_ADJUST
  95      virtual void ParaAdjust( const SvxAdjustItem& rHt );
  96 Index: docxattributeoutput.cxx
  97 ===================================================================
  98 --- sw/source/filter/docx/docx-docxattributeoutput.cxx  (revision 271348)
  99 +++ sw/source/filter/docx/docx-docxattributeoutput.cxx  (working copy)
 100 @@ -2790,46 +2790,23 @@
 101  #endif
 102  }
 103
 104 -void DocxAttributeOutput::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
 105 +void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short /*nMulti*/ )
 106  {
 107 -    if (!m_pSpacingAttrList)
 108 +    if ( !m_pSpacingAttrList )
 109          m_pSpacingAttrList = m_pSerializer->createAttrList();
 110
 111 -    bool bLineSpaceRuleAuto = true;
 112 -
 113 -    switch ( rSpacing.GetLineSpaceRule() )
 114 +    if ( nSpace < 0 )
 115      {
 116 -    case SVX_LINE_SPACE_FIX:
 117 -        m_pSpacingAttrList->add(FSNS( XML_w, XML_lineRule ), OString( (sal_Char *)"exact") );
 118 -        bLineSpaceRuleAuto = false;
 119 -        break;
 120 -    case SVX_LINE_SPACE_MIN:
 121 -        m_pSpacingAttrList->add(FSNS( XML_w, XML_lineRule ), OString( (sal_Char *)"atLeast") );
 122 -        bLineSpaceRuleAuto = false;
 123 -        break;
 124 -    case SVX_LINE_SPACE_AUTO:
 125 -    default:
 126 -        m_pSpacingAttrList->add(FSNS( XML_w, XML_lineRule ), OString( (sal_Char *)"auto") );
 127 -        break;
 128 +        m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "exact" );
 129 +        m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( -nSpace ) ) );
 130      }
 131 -
 132 -    sal_Int32 nSpace = 240;
 133 -
 134 -    switch ( rSpacing.GetInterLineSpaceRule() )
 135 +    else if ( nSpace > 0 )
 136      {
 137 -    case SVX_INTER_LINE_SPACE_PROP:
 138 -        nSpace = (sal_Int32)(( 240L * rSpacing.GetPropLineSpace() ) / 100L );
 139 -        break;
 140 -    case SVX_INTER_LINE_SPACE_FIX:
 141 -        nSpace = rSpacing.GetInterLineSpace() /* + rSpacing.GetLineHeight() */;
 142 -        break;
 143 -    case SVX_INTER_LINE_SPACE_OFF:
 144 -    default:
 145 -        nSpace = rSpacing.GetLineHeight();
 146 -        break;
 147 +        m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "atLeast" );
 148 +        m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( nSpace ) ) );
 149      }
 150 -
 151 -    m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( nSpace ) );
 152 +    else
 153 +        m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "auto" );
 154  }
 155
 156  void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
 157 Index: docxattributeoutput.hxx
 158 ===================================================================
 159 --- sw/source/filter/docx/docxattributeoutput.hxx       (revision 271125)
 160 +++ sw/source/filter/docx/docxattributeoutput.hxx       (working copy)
 161 @@ -440,7 +440,7 @@
 162      virtual void TextHardBlank( const SwFmtHardBlank& );
 163
 164      /// Sfx item RES_PARATR_LINESPACING
 165 -    virtual void ParaLineSpacing( const SvxLineSpacingItem& rSpacing );
 166 +    virtual void ParaLineSpacing_Impl( short nSpace, short nMulti );
 167
 168      /// Sfx item RES_PARATR_ADJUST
 169      virtual void ParaAdjust( const SvxAdjustItem& rAdjust );