applied_patches/0766-sw-export-commentfields.diff

   1 diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
   2 --- sw.orig/source/filter/ww8/wrtww8.cxx        2009-04-21 16:44:21.000000000 +0100
   3 +++ sw/source/filter/ww8/wrtww8.cxx     2009-04-21 17:11:00.000000000 +0100
   4 @@ -645,6 +645,11 @@
   5              plc = &rWrt.pFib->lcbPlcffldEdn;
   6              break;
   7
   8 +        case TXT_ATN:
   9 +            pfc = &rWrt.pFib->fcPlcffldAtn;
  10 +            plc = &rWrt.pFib->lcbPlcffldAtn;
  11 +            break;
  12 +
  13          case TXT_TXTBOX:
  14              pfc = &rWrt.pFib->fcPlcffldTxbx;
  15              plc = &rWrt.pFib->lcbPlcffldTxbx;
  16 @@ -2455,6 +2460,7 @@
  17          pFldHdFt->Write( *this );               // Fields ( Header/Footer )
  18          pFldFtn->Write( *this );                // Fields ( FootNotes )
  19          pFldEdn->Write( *this );                // Fields ( EndNotes )
  20 +        pFldAtn->Write( *this );                // Fields ( Annotations )
  21          pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
  22                                                  // plcfBkmkf/plcfBkmkl
  23          WriteDop( *this );                      // Document-Properties
  24 @@ -2490,6 +2496,7 @@
  25          pFldHdFt->Write( *this );               // Fields ( Header/Footer )
  26          pFldFtn->Write( *this );                // Fields ( FootNotes )
  27          pFldEdn->Write( *this );                // Fields ( EndNotes )
  28 +        pFldAtn->Write( *this );                // Fields ( Annotations )
  29          pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
  30          pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
  31
  32 @@ -2834,6 +2841,7 @@
  33      pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
  34      pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
  35      pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
  36 +    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
  37      pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
  38      pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
  39
  40 @@ -2883,6 +2891,7 @@
  41      DELETEZ( pFldFtn );
  42      DELETEZ( pFldTxtBxs );
  43      DELETEZ( pFldHFTxtBxs );
  44 +    DELETEZ( pFldAtn );
  45      DELETEZ( pFldEdn );
  46      DELETEZ( pFldHdFt );
  47      DELETEZ( pFldMain );
  48 @@ -3110,7 +3119,11 @@
  49
  50  bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
  51  {
  52 -    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
  53 +    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
  54 +    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
  55 +                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
  56 +                        + rWrt.pFib->ccpHdr );
  57 +    return bRet;
  58  }
  59
  60  void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
  61 diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
  62 --- sw.orig/source/filter/ww8/wrtww8.hxx        2009-04-21 16:44:21.000000000 +0100
  63 +++ sw/source/filter/ww8/wrtww8.hxx     2009-04-21 16:49:27.000000000 +0100
  64 @@ -473,6 +473,7 @@
  65      WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
  66      WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
  67      WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
  68 +    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
  69      WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
  70      WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
  71      WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
  72 diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
  73 --- sw.orig/source/filter/ww8/ww8atr.cxx        2009-04-21 16:44:21.000000000 +0100
  74 +++ sw/source/filter/ww8/ww8atr.cxx     2009-04-21 16:48:29.000000000 +0100
  75 @@ -1764,6 +1764,9 @@
  76          case TXT_EDN:
  77              pFldP = pFldEdn;
  78              break;
  79 +        case TXT_ATN:
  80 +            pFldP = pFldAtn;
  81 +            break;
  82          case TXT_TXTBOX:
  83              pFldP = pFldTxtBxs;
  84              break;