ooo-build r12723 - in trunk: . patches/dev300

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12723 - in trunk: . patches/dev300
Date: Fri, 30 May 2008 11:54:21 +0000 (UTC)
Author: szalaik
Date: Fri May 30 11:54:21 2008
New Revision: 12723
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12723&view=rev

Log:
2008-05-30  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/ooop-win32-installer-branding.diff
	* patches/dev300/scp2_makefile_accessories.diff
	* patches/dev300/premium-splitted-language-pack-solenv.diff
	* patches/dev300/ooop-update-URL.diff
	* patches/dev300/extensions_configure.diff
	* patches/dev300/extensions_packinfo.diff
	* patches/dev300/helpdocument-menubar.diff
	* patches/dev300/toolbars_sc.diff
	* patches/dev300/scp2_build_accessories.diff
	* patches/dev300/toolbars_sw.diff
	* patches/dev300/toolbars_sd.diff: Patchfest ;o)
	Make OxygenOffice Professional patchset workable under
	DEV300 / trunk. This is a quick fix only, we will improve
	the quality of current patchset soon.

	* patches/dev300/apply



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/helpdocument-menubar.diff
   trunk/patches/dev300/ooop-update-URL.diff
   trunk/patches/dev300/ooop-win32-installer-branding.diff
   trunk/patches/dev300/premium-splitted-language-pack-solenv.diff
   trunk/patches/dev300/scp2_build_accessories.diff
   trunk/patches/dev300/scp2_makefile_accessories.diff
   trunk/patches/dev300/toolbars_sc.diff
   trunk/patches/dev300/toolbars_sd.diff
   trunk/patches/dev300/toolbars_sw.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May 30 11:54:21 2008
@@ -2112,12 +2112,12 @@
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
 
 [ IntegrateExtensions ]
-;scp2_build_extensions.diff
-;scp2_makefile_extensions.diff
-;scp2_extensions.diff
-;extensions_configure.diff
-;extensions_packinfo.diff
-;extensions_deliver.diff
+scp2_build_extensions.diff
+scp2_makefile_extensions.diff
+scp2_extensions.diff
+extensions_configure.diff
+extensions_packinfo.diff
+extensions_deliver.diff
 
 [ OxygenOfficeDefaultSettings ]
 # Always enable extended tips

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Fri May 30 11:54:21 2008
@@ -1,6 +1,6 @@
---- config_office/configure.in.original	2008-03-19 07:37:01.000000000 +0100
-+++ config_office/configure.in	2008-03-19 08:20:11.000000000 +0100
-@@ -5377,10 +5377,11 @@
+--- config_office/configure.in.original	2008-05-30 10:58:01.000000000 +0200
++++ config_office/configure.in	2008-05-30 11:03:00.000000000 +0200
+@@ -5407,6 +5407,7 @@
  else
     AC_MSG_RESULT([no])
     ENABLE_MINIMIZER=NO
@@ -8,12 +8,27 @@
  fi
  AC_SUBST(ENABLE_MINIMIZER)
  
-@@ -5458,6 +5458,7 @@
+@@ -5417,6 +5418,7 @@
+ else
+    AC_MSG_RESULT([no])
+    ENABLE_PRESENTER_SCREEN=NO
++   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
+ fi
+ AC_SUBST(ENABLE_PRESENTER_SCREEN)
+ 
+@@ -5432,6 +5434,7 @@
+ else
+   AC_MSG_RESULT([no])
+   ENABLE_PDFIMPORT=NO
++   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
+ fi
+ AC_SUBST(ENABLE_PDFIMPORT)
+ 
+@@ -5472,6 +5475,7 @@
  else
    AC_MSG_RESULT([no])
-   ENABLE_REPORTDESIGN=NO
-+  SCPDEFS="$SCPDEFS -DDISABLE_REPORTDESIGN"
-   SYSTEM_JFREEREPORT=NO
+   ENABLE_MEDIAWIKI=NO
++  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
  fi
- AC_SUBST(ENABLE_REPORTDESIGN)
-
+ AC_SUBST(ENABLE_MEDIAWIKI)
+ AC_SUBST(SYSTEM_APACHE_COMMONS)

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Fri May 30 11:54:21 2008
@@ -36,6 +36,6 @@
 +End
 +
 +Start
- module = "gid_Module_Prg_Wrt"
+ module = "gid_Module_Prg_Wrt_Bin"
  script = "shellscripts_module.txt"
- solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-writer"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"

Modified: trunk/patches/dev300/helpdocument-menubar.diff
==============================================================================
--- trunk/patches/dev300/helpdocument-menubar.diff	(original)
+++ trunk/patches/dev300/helpdocument-menubar.diff	Fri May 30 11:54:21 2008
@@ -230,16 +230,6 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- dbaccess/uiconfig/dbbrowser/menubar/menubar.xml.orig	2007-08-10 19:07:23.000000000 +0200
-+++ dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2007-09-13 07:20:15.975063500 +0200
-@@ -66,6 +66,7 @@
- 			<menu:menuitem menu:id=".uno:HelperDialog"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
 --- dbaccess/uiconfig/dbquery/menubar/menubar.xml.orig	2007-08-10 19:07:23.000000000 +0200
 +++ dbaccess/uiconfig/dbquery/menubar/menubar.xml	2007-09-13 07:20:17.865712700 +0200
 @@ -80,6 +80,7 @@

Modified: trunk/patches/dev300/ooop-update-URL.diff
==============================================================================
--- trunk/patches/dev300/ooop-update-URL.diff	(original)
+++ trunk/patches/dev300/ooop-update-URL.diff	Fri May 30 11:54:21 2008
@@ -1,14 +1,17 @@
---- scp2/source/ooo/profileitem_ooo.scp~	2006-04-13 19:07:19.000000000 +0200
-+++ scp2/source/ooo/profileitem_ooo.scp	2006-04-13 19:07:19.000000000 +0200
-@@ -213,7 +213,7 @@
+--- scp2/source/ooo/common_brand.scp.original	2008-05-30 10:52:54.000000000 +0200
++++ scp2/source/ooo/common_brand.scp	2008-05-30 11:32:40.000000000 +0200
+@@ -965,9 +965,9 @@
+     Key = "UpdateURL";
    #if defined(BUILD_SPECIAL)
-     Value = "${UPDATEURL}";
-   #else
--    Value = "";
+   #ifdef WNT
+-    Value = "${UPDATEURL}";
++    Value = "http://ooop.sourceforge.net/update/ooop.php";;
+   #else  // defined WNT
+-    Value = "${UPDATEURL}?pkgfmt=<pkgformat>";
 +    Value = "http://ooop.sourceforge.net/update/ooop.php";;
-   #endif
- End
-
+   #endif //defined WNT
+   #else
+     Value = "";
 --- scp2/util/makefile.mk	2006-09-08 12:05:19.000000000 +0200
 +++ scp2/util/makefile.mk	2006-09-08 12:06:07.000000000 +0200
 @@ -161,11 +161,9 @@

Modified: trunk/patches/dev300/ooop-win32-installer-branding.diff
==============================================================================
--- trunk/patches/dev300/ooop-win32-installer-branding.diff	(original)
+++ trunk/patches/dev300/ooop-win32-installer-branding.diff	Fri May 30 11:54:21 2008
@@ -77,9 +77,9 @@
  			RELATIVE_PATHES_IN_DDF 1
  		}
 @@ -150,9 +150,9 @@
-             PACKAGEREVISION 1
-             LICENSENAME LGPL
              NOVERSIONINDIRNAME 1
+ 			PROGRAMFILESROOT 1
+ 			GLOBALFILEGID gid_File_Dl_Cppu
 -            DOWNLOADBANNER urebanner.bmp
 -            DOWNLOADBITMAP urebitmap.bmp
 -            DOWNLOADSETUPICO ooosetup.ico
@@ -87,5 +87,5 @@
 +            DOWNLOADBITMAP urebitmap.bmp
 +            DOWNLOADSETUPICO ooosetup.ico
              DONTUSESTARTMENUFOLDER 1
+             SERVICESPROJEKT 1
              RELATIVE_PATHES_IN_DDF 1
-         }

Modified: trunk/patches/dev300/premium-splitted-language-pack-solenv.diff
==============================================================================
--- trunk/patches/dev300/premium-splitted-language-pack-solenv.diff	(original)
+++ trunk/patches/dev300/premium-splitted-language-pack-solenv.diff	Fri May 30 11:54:21 2008
@@ -1,25 +1,25 @@
 --- solenv/bin/modules/installer/languagepack.pm.orig	2008-03-25 00:19:45.000000000 +0100
 +++ solenv/bin/modules/installer/languagepack.pm	2008-03-23 15:36:44.000000000 +0100
 @@ -98,6 +98,11 @@
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
- 						if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
-+						if (( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Drawings") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Formulas") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Presentations") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Spreadsheets") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts_Kapitel") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases_Dateien")) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Samples_$locallang"; }
-+						if (( $oneitem->{'Dir'} eq "gid_Dir_Template_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Educate") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Finance") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Forms") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Labels") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Layout") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Misc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Officorr") || ($oneitem->{'Dir'} eq "id_Dir_Template_Offimisc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Personal") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Presnt" )) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Templates_$locallang"; }
-+						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Documentations" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Documentations_$locallang"; }
-+						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Advertisement" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Advertisement_$locallang"; }
-+
- 					}
- 				}
- 
+ #						if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
+ #						if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
+ #						if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
++#						if (( $oneitem->{'Dir'} eq "gid_Dir_Samples_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Drawings") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Formulas") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Presentations") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Spreadsheets") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Texts_Kapitel") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases") || ($oneitem->{'Dir'} eq "gid_Dir_Samples_Databases_Dateien")) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Samples_$locallang"; }
++#						if (( $oneitem->{'Dir'} eq "gid_Dir_Template_Language") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Educate") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Finance") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Forms") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Labels") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Layout") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Misc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Officorr") || ($oneitem->{'Dir'} eq "id_Dir_Template_Offimisc") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Personal") || ($oneitem->{'Dir'} eq "gid_Dir_Template_Presnt" )) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Templates_$locallang"; }
++#						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Documentations" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Documentations_$locallang"; }
++#						if ( $oneitem->{'Dir'} eq "gid_Dir_Samples_Advertisement" ) { $oneitem->{'modules'} = "gid_Module_Optional_Accessories_Advertisement_$locallang"; }
++#
+ #					}
+ #				}
+ #
 @@ -204,6 +209,10 @@
- 		if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; } 
- 		if ( ${$alldirs}[$i] =~ /-help/ ) { next; } 
- 		if ( ${$alldirs}[$i] =~ /-res/ ) { next; } 
-+        	if ( ${$alldirs}[$i] =~ /-extra-samples/ ) { next; } 
-+		if ( ${$alldirs}[$i] =~ /-extra-templates/ ) { next; } 
-+		if ( ${$alldirs}[$i] =~ /-extra-documentations/ ) { next; } 
-+		if ( ${$alldirs}[$i] =~ /-extra-advertisement/ ) { next; } 
- 	
- 		$packagename = ${$alldirs}[$i];
- 		last;
+ 	#	if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }  
+ 	#	if ( ${$alldirs}[$i] =~ /-help/ ) { next; } 
+ 	#	if ( ${$alldirs}[$i] =~ /-res/ ) { next; } 
++#        	if ( ${$alldirs}[$i] =~ /-extra-samples/ ) { next; } 
++#		if ( ${$alldirs}[$i] =~ /-extra-templates/ ) { next; } 
++#		if ( ${$alldirs}[$i] =~ /-extra-documentations/ ) { next; } 
++#		if ( ${$alldirs}[$i] =~ /-extra-advertisement/ ) { next; } 
+ 	#
+ 	#	$packagename = ${$alldirs}[$i];
+ 	#	last;

Modified: trunk/patches/dev300/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_build_accessories.diff	Fri May 30 11:54:21 2008
@@ -1,9 +1,9 @@
 --- scp2/prj/build.lst.orig	2007-10-15 14:55:31.000000000 +0200
 +++ scp2/prj/build.lst	2007-12-24 14:59:45.000000000 +0100
 @@ -25,4 +25,5 @@
- cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
- cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
- cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_accessories NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL

Modified: trunk/patches/dev300/scp2_makefile_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_makefile_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_makefile_accessories.diff	Fri May 30 11:54:21 2008
@@ -1,11 +1,11 @@
 --- scp2/util/makefile.mk.orig	2007-08-10 19:15:34.000000000 +0200
 +++ scp2/util/makefile.mk	2007-09-12 15:16:23.177216800 +0200
 @@ -90,7 +90,22 @@
-              module_python_mailmerge.par   \
-              file_python.par               \
-              profileitem_python.par        \
--             shortcut_python.par
-+             shortcut_python.par           \
+              ure.par                       \
+              common_brand.par              \
+              common_brand_readme.par       \
+-             ooo_brand.par
++             ooo_brand.par		\
 +             module_accessories.par        \
 +             module_font_accessories.par      \
 +             module_gallery_accessories.par   \
@@ -25,11 +25,11 @@
  .IF "$(SOLAR_JAVA)"!=""
  SCP1FILES +=                               \
 @@ -223,7 +234,22 @@
-              module_python.par             \
-              module_python_mailmerge.par   \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
+              ure.par                       \
+              common_brand.par              \
+              common_brand_readme.par       \
+-             ooo_brand.par
++             ooo_brand.par		\
 +             module_accessories.par        \
 +             module_font_accessories.par      \
 +             module_gallery_accessories.par   \

Modified: trunk/patches/dev300/toolbars_sc.diff
==============================================================================
--- trunk/patches/dev300/toolbars_sc.diff	(original)
+++ trunk/patches/dev300/toolbars_sc.diff	Fri May 30 11:54:21 2008
@@ -100,13 +100,12 @@
 diff -Naur sc.old/uiconfig/scalc/toolbar/insertbar.xml sc/uiconfig/scalc/toolbar/insertbar.xml
 --- sc.old/uiconfig/scalc/toolbar/insertbar.xml	2007-07-06 14:48:55.000000000 +0200
 +++ sc/uiconfig/scalc/toolbar/insertbar.xml	2008-04-10 07:30:56.000000000 +0200
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,8 @@
   <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
   <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
   <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="helpid:26063"  />
 - <toolbar:toolbaritem xlink:href=".uno:DrawChart" toolbar:helpid="helpid:26071" toolbar:visible="false" />
 - <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" toolbar:visible="false" />
-- <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673" toolbar:visible="false" />
 + <toolbar:toolbaritem xlink:href=".uno:DrawChart" toolbar:helpid="helpid:26071" />
 + <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
 + <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673" />

Modified: trunk/patches/dev300/toolbars_sd.diff
==============================================================================
--- trunk/patches/dev300/toolbars_sd.diff	(original)
+++ trunk/patches/dev300/toolbars_sd.diff	Fri May 30 11:54:21 2008
@@ -53,10 +53,9 @@
 + <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:helpid="27138"/>
  </toolbar:toolbar>
 \ Nincs Ãjsor a fÃjl vÃgÃn
-diff -Naur sd.old/uiconfig/sdraw/toolbar/insertbar.xml sd/uiconfig/sdraw/toolbar/insertbar.xml
---- sd.old/uiconfig/sdraw/toolbar/insertbar.xml	2007-06-27 17:48:17.000000000 +0200
-+++ sd/uiconfig/sdraw/toolbar/insertbar.xml	2008-04-10 07:49:53.000000000 +0200
-@@ -3,19 +3,19 @@
+--- sd.old/uiconfig/sdraw/toolbar/insertbar.xml	2008-05-30 12:30:16.000000000 +0200
++++ sd/uiconfig/sdraw/toolbar/insertbar.xml	2008-05-30 12:35:13.000000000 +0200
+@@ -3,10 +3,11 @@
  <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
   <toolbar:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="helpid:27014"  />
   <toolbar:toolbarseparator/>
@@ -64,31 +63,26 @@
 +	<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
  	<toolbar:toolbarseparator/>
 -	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertSpreadsheet" toolbar:helpid="helpid:10217"  />
 +	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015" />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141"  />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertSpreadsheet" toolbar:helpid="helpid:10217" />
  	<toolbar:toolbarseparator/>
--	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
--	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
--	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106"  />
--	<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140"  />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
+@@ -14,7 +15,9 @@
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677"  toolbar:visible="false" />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106"  />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140"  />
 -	<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561"  toolbar:visible="false" />
 -	<toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673"  toolbar:visible="false" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676" toolbar:visible="false" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677" toolbar:visible="false" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673" />
  	<toolbar:toolbarseparator/>
- </toolbar:toolbar>
+-</toolbar:toolbar>
 \ Nincs Ãjsor a fÃjl vÃgÃn
++</toolbar:toolbar>
++
 diff -Naur sd.old/uiconfig/sdraw/toolbar/standardbar.xml sd/uiconfig/sdraw/toolbar/standardbar.xml
 --- sd.old/uiconfig/sdraw/toolbar/standardbar.xml	2005-01-27 16:26:42.000000000 +0100
 +++ sd/uiconfig/sdraw/toolbar/standardbar.xml	2008-04-10 09:20:54.000000000 +0200
@@ -213,10 +207,9 @@
 + <toolbar:toolbaritem xlink:href=".uno:ConnectorCurveCircles" toolbar:helpid="27138"/>
  </toolbar:toolbar>
 \ Nincs Ãjsor a fÃjl vÃgÃn
-diff -Naur sd.old/uiconfig/simpress/toolbar/insertbar.xml sd/uiconfig/simpress/toolbar/insertbar.xml
---- sd.old/uiconfig/simpress/toolbar/insertbar.xml	2007-06-27 17:48:31.000000000 +0200
-+++ sd/uiconfig/simpress/toolbar/insertbar.xml	2008-04-10 07:49:27.000000000 +0200
-@@ -3,19 +3,19 @@
+--- sd/uiconfig/simpress/toolbar/insertbar.xml.orig	2008-05-30 12:30:27.000000000 +0200
++++ sd/uiconfig/simpress/toolbar/insertbar.xml	2008-05-30 12:35:12.000000000 +0200
+@@ -3,10 +3,11 @@
  <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
   <toolbar:toolbaritem xlink:href=".uno:InsertPage" toolbar:helpid="helpid:27014"  />
   <toolbar:toolbarseparator/>
@@ -224,29 +217,26 @@
 +	<toolbar:toolbaritem xlink:href=".uno:InsertObjectFloatingFrame" toolbar:helpid="helpid:5563" />
  	<toolbar:toolbarseparator/>
 -	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertSpreadsheet" toolbar:helpid="helpid:10217"  />
 +	<toolbar:toolbaritem xlink:href=".uno:ImportFromFile" toolbar:helpid="helpid:27015" />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:10141"  />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertSpreadsheet" toolbar:helpid="helpid:10217" />
  	<toolbar:toolbarseparator/>
--	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
--	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
--	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677"  toolbar:visible="false" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:helpid="helpid:5676" toolbar:visible="false" />
-+	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677" toolbar:visible="false" />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241"  />
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="helpid:6695"  />
+@@ -14,7 +15,9 @@
+ 	<toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:helpid="helpid:5677"  toolbar:visible="false" />
  	<toolbar:toolbaritem xlink:href=".uno:InsertMath" toolbar:helpid="helpid:27106"/>
  	<toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="helpid:10140"  />
 -	<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561"  toolbar:visible="false"   />
 -	<toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672"  toolbar:visible="false" />
--	<toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673"  toolbar:visible="false" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672" />
 +	<toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673" />
  	<toolbar:toolbarseparator/>
- </toolbar:toolbar>
+-</toolbar:toolbar>
 \ Nincs Ãjsor a fÃjl vÃgÃn
++</toolbar:toolbar>
++
 diff -Naur sd.old/uiconfig/simpress/toolbar/textobjectbar.xml sd/uiconfig/simpress/toolbar/textobjectbar.xml
 --- sd.old/uiconfig/simpress/toolbar/textobjectbar.xml	2005-09-23 12:47:44.000000000 +0200
 +++ sd/uiconfig/simpress/toolbar/textobjectbar.xml	2008-04-10 09:04:13.000000000 +0200

Modified: trunk/patches/dev300/toolbars_sw.diff
==============================================================================
--- trunk/patches/dev300/toolbars_sw.diff	(original)
+++ trunk/patches/dev300/toolbars_sw.diff	Fri May 30 11:54:21 2008
@@ -86,13 +86,12 @@
   <toolbar:toolbarseparator/>
   <toolbar:toolbaritem xlink:href=".uno:InsertDoc" toolbar:helpid="5532"/>
   <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
-@@ -22,9 +22,9 @@
+@@ -22,8 +22,9 @@
   <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
 - <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" toolbar:helpid="helpid:5561"  />
 - <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false" toolbar:helpid="helpid:5672"  />
-- <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:visible="false" toolbar:helpid="helpid:5673"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673"  />
@@ -608,13 +607,12 @@
   <toolbar:toolbaritem xlink:href=".uno:EditGlossary"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="20328"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:helpid="52824"/>
-@@ -22,9 +22,9 @@
+@@ -22,8 +22,9 @@
   <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia" toolbar:helpid="6695"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
   <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
 - <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false" toolbar:helpid="helpid:5561"  />
 - <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false" toolbar:helpid="helpid:5672"  />
-- <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:visible="false" toolbar:helpid="helpid:5673"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:helpid="helpid:5561"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:helpid="helpid:5672"  />
 + <toolbar:toolbaritem xlink:href=".uno:InsertApplet" toolbar:helpid="helpid:5673"  />
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]