GNOME.org
 

ooo-build r14313 - in branches/ooo-build-2-4-1: . patches/src680

Author: ccheney
Date: Wed Oct 15 02:27:41 2008
New Revision: 14313
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14313&view=rev

Log:
2008-10-14 Chris Cheney <ccheney ubuntu com>

        merge from debian-2-4-1:

        * patches/src680/apply:
        * patches/src680/cws-chart28.diff: backport cws chart28
        * patches/src680/i89812.diff: backport fix for issue 89812
        * patches/src680/math-draw-generic-name.diff:
        * patches/src680/math-draw-generic-name-localize.diff:
          add GenericName to Math and Draw .desktop files
        * patches/src680/soffice-detect-mozilla-certificates.diff:
          optimize (see bugs.debian.org/499062)
        * patches/src680/soffice-remove-webwizard.diff:
          remove WebWizard remains on startup
        * patches/src680/unxsplash-rework.diff:
          don't run the external oosplash with -nologo (no splash anyway) and
          with the (new) -no-oosplash. Latter needed for e.g. OOo calls from
          mutt via mimecap (see bugs.debian.org/396276)


Added:
   branches/ooo-build-2-4-1/patches/src680/cws-chart28.diff
   branches/ooo-build-2-4-1/patches/src680/i89812.diff
   branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name-localize.diff
   branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name.diff
   branches/ooo-build-2-4-1/patches/src680/soffice-remove-webwizard.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply
   branches/ooo-build-2-4-1/patches/src680/soffice-detect-mozilla-certificates.diff
   branches/ooo-build-2-4-1/patches/src680/unxsplash-rework.diff

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	Wed Oct 15 02:27:41 2008
@@ -323,6 +323,10 @@
 
 cws-cmcfixes47-sw.diff, i#90306
 
+[ CWSBackports < ooh680-m18 ]
+cws-chart28.diff, i#90071
+i89812.diff
+
 [ CWSBackports < ooh680-m17 ]
 
 cws-dba241e.diff, i#87092, i#90011
@@ -533,6 +537,9 @@
 # fix by Caolan, already in OOo-3.0
 raise-annotation-priority-above-charproperties-i53885.diff, i#53885, pmladek
 
+math-draw-generic-name.diff, i#93909, rengelha
+math-draw-generic-name-localize.diff, i#93909, rengelha
+
 [ Fixes > ooh680-m15 ]
 
 # init all members in svx's line geometry creator
@@ -984,6 +991,7 @@
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
+soffice-remove-webwizard.diff
 
 [ DebianOnly ]
 

Added: branches/ooo-build-2-4-1/patches/src680/cws-chart28.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/cws-chart28.diff	Wed Oct 15 02:27:41 2008
@@ -0,0 +1,18 @@
+? cws-chart28.diff
+Index: source/view/main/Clipping.cxx
+===================================================================
+RCS file: /cvs/graphics/chart2/source/view/main/Clipping.cxx,v
+retrieving revision 1.6.82.1
+retrieving revision 1.6.82.1.10.1
+diff -u -r1.6.82.1 -r1.6.82.1.10.1
+--- chart2/source/view/main/Clipping.cxx	10 Jan 2008 17:14:29 -0000	1.6.82.1
++++ chart2/source/view/main/Clipping.cxx	3 Jun 2008 17:37:38 -0000	1.6.82.1.10.1
+@@ -182,7 +182,7 @@
+         rPoly.SequenceX.realloc(nPolygonIndex+1);
+         rPoly.SequenceY.realloc(nPolygonIndex+1);
+         rPoly.SequenceZ.realloc(nPolygonIndex+1);
+-        rResultPointCount.push_back(0);
++        rResultPointCount.resize(nPolygonIndex+1,0);
+     }
+ 
+     drawing::DoubleSequence* pOuterSequenceX = &rPoly.SequenceX.getArray()[nPolygonIndex];

Added: branches/ooo-build-2-4-1/patches/src680/i89812.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/i89812.diff	Wed Oct 15 02:27:41 2008
@@ -0,0 +1,27 @@
+Index: htmlnum.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/htmlnum.cxx,v
+retrieving revision 1.27
+retrieving revision 1.27.8.1
+diff -u -u -r1.27 -r1.27.8.1
+--- sw/source/filter/html/htmlnum.cxx	13 Jun 2008 10:41:03 -0000	1.27
++++ sw/source/filter/html/htmlnum.cxx	26 Jun 2008 13:39:00 -0000	1.27.8.1
+@@ -359,6 +359,18 @@
+ 			if( !aPropInfo.bRightMargin )
+ 				aItemSet.ClearItem( RES_LR_SPACE );
+ 
++            // --> OD 2008-06-26 #i89812#
++            // Perform change to list style before calling <DoPositioning(..)>,
++            // because <DoPositioning(..)> may open a new context and thus may
++            // clear the <SwHTMLNumRuleInfo> instance hold by local variable <rInfo>.
++            if( bChangeNumFmt )
++            {
++                rInfo.GetNumRule()->Set( nLevel, aNumFmt );
++                pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
++                bChangeNumFmt = sal_False;
++            }
++            // <--
++
+ 			DoPositioning( aItemSet, aPropInfo, pCntxt );
+ 
+ 			InsertAttrs( aItemSet, aPropInfo, pCntxt );

Added: branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name-localize.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name-localize.diff	Wed Oct 15 02:27:41 2008
@@ -0,0 +1,13 @@
+Index: desktop/share/localize.sdf
+===================================================================
+--- sysui/desktop/share/localize.sdf	(Revision 261918)
++++ sysui/desktop/share/localize.sdf	(Arbeitskopie)
+@@ -3102,6 +3102,8 @@
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	vi	Xá là tá				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-CN	ååçå				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-TW	ææèçå				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	math				0	de	Formeleditor				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	draw				0	de	Zeichenprogramm				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	af	%PRODUCTNAME-drukkeradministrasie				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	ar	ØØØØØ ØØØØØØ %PRODUCTNAME				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	as-IN	%PRODUCTNAME àààààà ààààààà				2002-02-02 02:02:02

Added: branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/math-draw-generic-name.diff	Wed Oct 15 02:27:41 2008
@@ -0,0 +1,33 @@
+Index: desktop/menus/math.desktop
+===================================================================
+--- sysui/desktop/menus/math.desktop	(Revision 261918)
++++ sysui/desktop/menus/math.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -math %U
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+ Name=%PRODUCTNAME Math
++GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
+Index: desktop/menus/draw.desktop
+===================================================================
+--- sysui/desktop/menus/draw.desktop	(Revision 261918)
++++ sysui/desktop/menus/draw.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -draw %U
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+ Name=%PRODUCTNAME Draw
++GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
+Index: desktop/share/launcher_genericname.ulf
+===================================================================
+--- sysui/desktop/share/launcher_genericname.ulf	(Revision 261918)
++++ sysui/desktop/share/launcher_genericname.ulf	(Arbeitskopie)
+@@ -10,3 +10,8 @@
+ [base]
+ en-US = "Database Development"
+ 
++[math]
++en-US = "Formula Editor"
++
++[draw]
++en-US = "Drawing Program"

Modified: branches/ooo-build-2-4-1/patches/src680/soffice-detect-mozilla-certificates.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/soffice-detect-mozilla-certificates.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/soffice-detect-mozilla-certificates.diff	Wed Oct 15 02:27:41 2008
@@ -5,7 +5,7 @@
 diff -u -u -r1.25 soffice.sh
 --- desktop/scripts/soffice.sh	5 Jul 2006 22:33:58 -0000	1.25
 +++ desktop/scripts/soffice.sh	9 Sep 2006 11:07:33 -0000
-@@ -189,6 +189,24 @@
+@@ -189,6 +189,29 @@
  OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
  export OPENOFFICE_MOZILLA_FIVE_HOME
  
@@ -18,7 +18,12 @@
 +		fi;
 +	done
 +	if [ -n "$dir" ]; then
-+		cert8=`find $dir -name "cert8.db" | head -n 1`
++		# In most case cert8.db will be in $dir/*/cert8.db.
++	        # Test this first. Do a full search otherwise.
++		cert8=`find $dir -maxdepth 2 -name "cert8.db" | head -n 1`
++	        if [ ! -n "$cert8" ]; then
++			cert8=`find $dir -name "cert8.db" | head -n 1`
++		fi
 +		if [ -n "$cert8" ]; then
 +			profiledir=`dirname "$cert8"`
 +			MOZILLA_CERTIFICATE_FOLDER=$profiledir

Added: branches/ooo-build-2-4-1/patches/src680/soffice-remove-webwizard.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/soffice-remove-webwizard.diff	Wed Oct 15 02:27:41 2008
@@ -0,0 +1,25 @@
+Index: scripts/soffice.sh
+===================================================================
+RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
+retrieving revision 1.28.48.1
+diff -u -r1.28.48.1 soffice.sh
+--- desktop/scripts/soffice.sh	2 Jan 2008 14:47:34 -0000	1.28.48.1
++++ desktop/scripts/soffice.sh	23 Sep 2008 10:47:17 -0000
+@@ -364,6 +364,17 @@
+     sd_binary="oosplash.bin"
+ fi
+ 
++# Fix for bug #mdv41228 #i89207
++# Remove this line:
++# <library:library library:name="WebWizard" xlink:href="file:///usr/lib/openoffice/share/basic/WebWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="true"/>
++# from files below.
++# Since 2007.0 WebWizard does not exist anymore.
++dialog_xlc=~/.openoffice.org2/user/basic/dialog.xlc
++script_xlc=~/.openoffice.org2/user/basic/script.xlc
++if [ -f $dialog_xlc -a -f $script_xlc ]; then
++    sed -i "s/.*library:name=\"WebWizard\".*openoffice.*//" $dialog_xlc $script_xlc
++fi
++
+ # execute soffice binary
+ "$sd_prog/$sd_binary" "$@" &
+ trap 'kill -9 $!' TERM

Modified: branches/ooo-build-2-4-1/patches/src680/unxsplash-rework.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/unxsplash-rework.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/unxsplash-rework.diff	Wed Oct 15 02:27:41 2008
@@ -46,12 +46,17 @@
 index 7fd1393..20936bd 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -262,6 +262,10 @@ else
+@@ -262,6 +262,15 @@ else
  fi
  export PATH
  
 +# test for availability of the fast external splash
-+if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] ; then
++for arg in $@; do
++	if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
++		no_oosplash=y
++	fi
++done
++if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
 +    sd_binary="oosplash.bin"
 +fi
  
@@ -2349,3 +2354,24 @@
  
              //DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
              mpWindowImpl->mbSuppressAccessibilityEvents = FALSE;
+Index: smoketest.pl
+===================================================================
+RCS file: /cvs/installation/smoketestoo_native/smoketest.pl,v
+retrieving revision 1.27
+diff -u -u -r1.27 smoketest.pl
+--- smoketestoo_native/smoketest.pl	6 Dec 2007 17:17:22 -0000	1.27
++++ smoketextoo_native/smoketest.pl	7 Oct 2008 13:41:41 -0000
+@@ -467,11 +467,11 @@
+ 	}
+ 	if ((defined($ENV{OS})) && (defined($ENV{PROEXT})) && ($ENV{OS} eq "LINUX") && ($ENV{PROEXT} eq ".pro") && $is_do_statistics)  {
+ 		print "collecting statistic...\n";
+-		$Command = "$PERL stats.pl -p=\"$programpath" . "soffice\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
++		$Command = "$PERL stats.pl -p=\"$programpath" . "soffice\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
+ 		execute_Command ($Command, $error_startOffice, $show_Message, $command_normal);
+ 	}
+ 	else {
+-		$Command = "\"$programpath" . "soffice\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
++		$Command = "\"$programpath" . "soffice\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
+ 		execute_Command ($Command, $error_startOffice, $show_Message, $command_normal);
+ 	}
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]