rpms/openoffice.org/devel openoffice.org.spec, 1.1890, 1.1891 workspace.hb18.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Apr 22 10:23:00 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23394/devel
Modified Files:
openoffice.org.spec workspace.hb18.patch
Removed Files:
openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch
Log Message:
merge patchs to accepted upstream workspaces
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -r1.1890 -r1.1891
--- openoffice.org.spec 21 Apr 2009 20:10:01 -0000 1.1890
+++ openoffice.org.spec 22 Apr 2009 10:22:27 -0000 1.1891
@@ -137,7 +137,6 @@
Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
Patch63: workspace.slideshow1.patch
Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch65: 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}
@@ -1610,7 +1609,7 @@
%patch39 -p1 -b .workspace.cmcfixes54.patch
%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .workspace.hb18.patch
+%patch42 -p0 -b .workspace.hb18.patch
%patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
%patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
%patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1633,7 +1632,6 @@
%patch62 -p1 -b .ooo101152.solenv.kn.patch
%patch63 -p2 -b .workspace.slideshow1.patch
%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch65 -p0 -b .ooo101159.ww8.export.commentfields.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
workspace.hb18.patch:
Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.hb18.patch 20 Apr 2009 21:38:12 -0000 1.1
+++ workspace.hb18.patch 22 Apr 2009 10:22:28 -0000 1.2
@@ -3,8 +3,8 @@
RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
retrieving revision 1.11
diff -u -r1.11 index.cxx
---- openoffice.org.orig/sw/source/core/bastyp/index.cxx 10 Apr 2008 12:51:37 -0000 1.11
-+++ openoffice.org/sw/source/core/bastyp/index.cxx 4 Feb 2009 14:59:32 -0000
+--- sw.orig/source/core/bastyp/index.cxx 10 Apr 2008 12:51:37 -0000 1.11
++++ sw/source/core/bastyp/index.cxx 4 Feb 2009 14:59:32 -0000
@@ -302,7 +302,7 @@
pArr->pFirst = pArr->pLast = this;
nIndex = nIdx;
@@ -14,3 +14,87 @@
ChgValue( *pArr->pLast, nIdx );
else
ChgValue( *pArr->pFirst, nIdx );
+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;
--- openoffice.org-3.1.0.ooo101159.ww8.export.commentfields.patch DELETED ---
More information about the scm-commits
mailing list