rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch, NONE, 1.1 openoffice.org.spec, 1.1888, 1.1889

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7052/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch 
Log Message:
add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch

openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch ---
diff -ru sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
--- sw.orig/source/filter/ww8/wrtww8.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.cxx	2009-04-21 17:11:00.000000000 +0100
@@ -645,6 +645,11 @@
             plc = &rWrt.pFib->lcbPlcffldEdn;
             break;
 
+        case TXT_ATN:
+            pfc = &rWrt.pFib->fcPlcffldAtn;
+            plc = &rWrt.pFib->lcbPlcffldAtn;
+            break;
+
         case TXT_TXTBOX:
             pfc = &rWrt.pFib->fcPlcffldTxbx;
             plc = &rWrt.pFib->lcbPlcffldTxbx;
@@ -2455,6 +2460,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pBkmks->Write( *this );                 // Bookmarks - sttbfBkmk/
                                                 // plcfBkmkf/plcfBkmkl
         WriteDop( *this );                      // Document-Properties
@@ -2490,6 +2496,7 @@
         pFldHdFt->Write( *this );               // Fields ( Header/Footer )
         pFldFtn->Write( *this );                // Fields ( FootNotes )
         pFldEdn->Write( *this );                // Fields ( EndNotes )
+        pFldAtn->Write( *this );                // Fields ( Annotations )
         pFldTxtBxs->Write( *this );             // Fields ( Textboxes )
         pFldHFTxtBxs->Write( *this );           // Fields ( Head/Foot-Textboxes )
 
@@ -2834,6 +2841,7 @@
     pFldHdFt = new WW8_WrPlcFld( 2, TXT_HDFT );
     pFldFtn = new WW8_WrPlcFld( 2, TXT_FTN );
     pFldEdn = new WW8_WrPlcFld( 2, TXT_EDN );
+    pFldAtn = new WW8_WrPlcFld( 2, TXT_ATN );
     pFldTxtBxs = new WW8_WrPlcFld( 2, TXT_TXTBOX );
     pFldHFTxtBxs = new WW8_WrPlcFld( 2, TXT_HFTXTBOX );
 
@@ -2883,6 +2891,7 @@
     DELETEZ( pFldFtn );
     DELETEZ( pFldTxtBxs );
     DELETEZ( pFldHFTxtBxs );
+    DELETEZ( pFldAtn );
     DELETEZ( pFldEdn );
     DELETEZ( pFldHdFt );
     DELETEZ( pFldMain );
@@ -3110,7 +3119,11 @@
 
 bool WW8_WrPlcPostIt::WriteTxt(SwWW8Writer& rWrt)
 {
-    return WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
+    rWrt.pFldAtn->Finish( rWrt.Fc2Cp( rWrt.Strm().Tell() ),
+                        rWrt.pFib->ccpText + rWrt.pFib->ccpFtn
+                        + rWrt.pFib->ccpHdr );
+    return bRet;
 }
 
 void WW8_WrPlcPostIt::WritePlc( SwWW8Writer& rWrt ) const
diff -ru sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
--- sw.orig/source/filter/ww8/wrtww8.hxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/wrtww8.hxx	2009-04-21 16:49:27.000000000 +0100
@@ -473,6 +473,7 @@
     WW8_WrPlcFld* pFldHdFt;         // Felder in Header/Footer
     WW8_WrPlcFld* pFldFtn;          // Felder in FootNotes
     WW8_WrPlcFld* pFldEdn;          // Felder in EndNotes
+    WW8_WrPlcFld* pFldAtn;          // Felder in Annotations
     WW8_WrPlcFld* pFldTxtBxs;       // fields in textboxes
     WW8_WrPlcFld* pFldHFTxtBxs;     // fields in header/footer textboxes
     WW8_WrMagicTable *pMagicTable;  // keeps track of table cell positions, and
diff -ru sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-21 16:44:21.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-21 16:48:29.000000000 +0100
@@ -1764,6 +1764,9 @@
         case TXT_EDN:
             pFldP = pFldEdn;
             break;
+        case TXT_ATN:
+            pFldP = pFldAtn;
+            break;
         case TXT_TXTBOX:
             pFldP = pFldTxtBxs;
             break;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -r1.1888 -r1.1889
--- openoffice.org.spec	21 Apr 2009 14:39:55 -0000	1.1888
+++ openoffice.org.spec	21 Apr 2009 19:48:32 -0000	1.1889
@@ -138,6 +138,7 @@
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
 Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch66: openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1634,6 +1635,7 @@
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
 %patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch66 -p0 -b .ooo101159.ww8.export.commentfields.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4129,6 +4131,7 @@
 %changelog
 * Tue Apr 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
 - add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+- add openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
 
 * Sun Apr 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors