ooo-build r12648 - in branches/ooo-build-2-4-1: . patches/src680
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12648 - in branches/ooo-build-2-4-1: . patches/src680
- Date: Fri, 23 May 2008 16:27:28 +0000 (UTC)
Author: pmladek
Date: Fri May 23 16:27:28 2008
New Revision: 12648
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12648&view=rev
Log:
2008-05-23 Petr Mladek <pmladek suse cz>
* patches/src680/raise-annotation-priority-above-charproperties-i53885.diff:
* patches/src680/apply: fixes DOC import to show "hiddden text"; fix by
Caolan, it is already in OOo-3.0; i#53885
Added:
branches/ooo-build-2-4-1/patches/src680/raise-annotation-priority-above-charproperties-i53885.diff
Modified:
branches/ooo-build-2-4-1/ChangeLog
branches/ooo-build-2-4-1/patches/src680/apply
Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply (original)
+++ branches/ooo-build-2-4-1/patches/src680/apply Fri May 23 16:27:28 2008
@@ -495,6 +495,10 @@
localize-pl-cygwin-paths.diff, tml
+# fixes DOC import to show "hiddden text"
+# fix by Caolan, already in OOo-3.0
+raise-annotation-priority-above-charproperties-i53885.diff, i#53885, pmladek
+
[ RadioButtons ]
# Add a GroupName property to RadioButtons so that RadioButtons don't need to
# share the same name to be part of the same group.
Added: branches/ooo-build-2-4-1/patches/src680/raise-annotation-priority-above-charproperties-i53885.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/raise-annotation-priority-above-charproperties-i53885.diff Fri May 23 16:27:28 2008
@@ -0,0 +1,27 @@
+Index: source/filter/ww8/ww8scan.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/ww8scan.cxx,v
+retrieving revision 1.132
+diff -u -r1.132 ww8scan.cxx
+--- sw/source/filter/ww8/ww8scan.cxx 25 May 2007 13:03:35 -0000 1.132
++++ sw/source/filter/ww8/ww8scan.cxx 12 Oct 2007 10:06:35 -0000
+@@ -4349,13 +4349,15 @@
+ pBkm = &aD[1];
+ pEdn = &aD[2];
+ pFtn = &aD[3];
+- pAnd = &aD[4];
+
+- pPcd = ( pBase->pPLCFx_PCD ) ? &aD[5] : 0;
++ pPcd = ( pBase->pPLCFx_PCD ) ? &aD[4] : 0;
+ //pPcdA index == pPcd index + 1
+- pPcdA = ( pBase->pPLCFx_PCDAttrs ) ? &aD[6] : 0;
++ pPcdA = ( pBase->pPLCFx_PCDAttrs ) ? &aD[5] : 0;
++
++ pChp = &aD[6];
++
++ pAnd = &aD[7];
+
+- pChp = &aD[7];
+ pPap = &aD[8];
+ pSep = &aD[9];
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]