[ooo-build-commit] distro-configs/OxygenOfficeLinux.conf.in distro-configs/OxygenOfficeWindows.conf.in patches/dev300

Kalman "" Szalai kami911 at kemper.freedesktop.org
Sun Oct 11 04:15:30 PDT 2009 

 distro-configs/OxygenOfficeLinux.conf.in          |    2 
 distro-configs/OxygenOfficeWindows.conf.in        |    2 
 patches/dev300/helpdocument-menubar.diff          |   72 +++++++++-------------
 patches/dev300/ooop-win32-installer-branding.diff |   46 ++++++--------
 patches/dev300/toolbars_sd.diff                   |   14 ++--
 5 files changed, 65 insertions(+), 71 deletions(-)

New commits:
commit 3596eed6d6e8b58aeb1ba10e45926cffc278f4ea
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sun Oct 11 13:07:17 2009 +0200

    Updates OxygenOffice setting and patches.
    
    * distro-configs/OxygenOfficeLinux.conf.in:
    * distro-configs/OxygenOfficeWindows.conf.in:
    * patches/dev300/helpdocument-menubar.diff:
    * patches/dev300/ooop-win32-installer-branding.diff:
    * patches/dev300/toolbars_sd.diff:

diff --git a/distro-configs/OxygenOfficeLinux.conf.in b/distro-configs/OxygenOfficeLinux.conf.in
index a35775e..5b8d96e 100644
--- a/distro-configs/OxygenOfficeLinux.conf.in
+++ b/distro-configs/OxygenOfficeLinux.conf.in
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.1 M012 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional Alpha 3.2.0 M000 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
diff --git a/distro-configs/OxygenOfficeWindows.conf.in b/distro-configs/OxygenOfficeWindows.conf.in
index 44b3be5..a7ecf93 100644
--- a/distro-configs/OxygenOfficeWindows.conf.in
+++ b/distro-configs/OxygenOfficeWindows.conf.in
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.1 M012 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional Alpha 3.2.0 M000 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
diff --git a/patches/dev300/helpdocument-menubar.diff b/patches/dev300/helpdocument-menubar.diff
index 8084d40..8c3f095 100644
--- a/patches/dev300/helpdocument-menubar.diff
+++ b/patches/dev300/helpdocument-menubar.diff
@@ -178,48 +178,40 @@
  			<menu:menuitem menu:id=".uno:About"/>
 --- sd/uiconfig/sdraw/menubar/menubar.xml.orig	2009-02-12 14:52:42.000000000 +0100
 +++ sd/uiconfig/sdraw/menubar/menubar.xml	2009-02-14 07:08:14.000000000 +0100
-@@ -315,10 +315,16 @@
- 	</menu:menu>
- 	<menu:menu menu:id=".uno:HelpMenu">
- 		<menu:menupopup>
--			<menu:menuitem menu:id=".uno:HelpIndex"/>
--			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+			<menu:menuitem menu:id=".uno:HelpIndex"/>
- 			<menu:menuseparator/>
--			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+			<menu:menuitem menu:id=".uno:HelpTip"/>
-+			<menu:menuitem menu:id=".uno:ActiveHelp"/>
-+			<menu:menuseparator/>
-+			<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"/>
+@@ -315,9 +315,15 @@
+     <menu:menu menu:id=".uno:HelpMenu">
+         <menu:menupopup>
+             <menu:menuitem menu:id=".uno:HelpIndex"/>
++            <menu:menuseparator/>
+             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
++            <menu:menuitem menu:id=".uno:HelpTip"/>
++            <menu:menuitem menu:id=".uno:ActiveHelp"/>
+             <menu:menuseparator/>
++            <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"/>
 --- sd/uiconfig/simpress/menubar/menubar.xml.orig	2009-02-12 14:52:42.000000000 +0100
 +++ sd/uiconfig/simpress/menubar/menubar.xml	2009-02-14 07:04:07.000000000 +0100
-@@ -290,10 +290,16 @@
- 	</menu:menu>
- 	<menu:menu menu:id=".uno:HelpMenu">
- 		<menu:menupopup>
--			<menu:menuitem menu:id=".uno:HelpIndex"/>
--			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+			<menu:menuitem menu:id=".uno:HelpIndex"/>
- 			<menu:menuseparator/>
--			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+			<menu:menuitem menu:id=".uno:HelpTip"/>
-+			<menu:menuitem menu:id=".uno:ActiveHelp"/>
-+			<menu:menuseparator/>
-+			<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"/>
+@@ -294,9 +294,15 @@
+     <menu:menu menu:id=".uno:HelpMenu">
+         <menu:menupopup>
+             <menu:menuitem menu:id=".uno:HelpIndex"/>
++            <menu:menuseparator/>
+             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
++            <menu:menuitem menu:id=".uno:HelpTip"/>
++            <menu:menuitem menu:id=".uno:ActiveHelp"/>
+             <menu:menuseparator/>
++            <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/dbapp/menubar/menubar.xml.orig	2007-08-10 19:07:22.000000000 +0200
 +++ dbaccess/uiconfig/dbapp/menubar/menubar.xml	2007-09-13 07:20:13.662533900 +0200
 @@ -138,6 +138,7 @@
diff --git a/patches/dev300/ooop-win32-installer-branding.diff b/patches/dev300/ooop-win32-installer-branding.diff
index 8a275cf..69d199b 100644
--- a/patches/dev300/ooop-win32-installer-branding.diff
+++ b/patches/dev300/ooop-win32-installer-branding.diff
@@ -11,30 +11,28 @@
  en-US = "&Next >"
 --- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
 +++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
-@@ -372,9 +372,17 @@
- 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-# 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--#	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+	$(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+	$(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+
-
-
+@@ -408,9 +408,17 @@
+     $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+     $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+     $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++    $(COPY) $(PRJ)$/res$/nologoinstall_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
++    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
++    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++    $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+ 
 
 --- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
 +++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
diff --git a/patches/dev300/toolbars_sd.diff b/patches/dev300/toolbars_sd.diff
index 4562a91..4aadce0 100644
--- a/patches/dev300/toolbars_sd.diff
+++ b/patches/dev300/toolbars_sd.diff
@@ -109,13 +109,14 @@ diff -Naur sd.old/uiconfig/sdraw/toolbar/textobjectbar.xml sd/uiconfig/sdraw/too
   <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403"/>
   <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404"/>
   <toolbar:toolbarseparator/>
-@@ -36,5 +36,6 @@
+@@ -36,5 +40,7 @@
   <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
   <toolbar:toolbarseparator/>
   <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
-- <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:visible="false" toolbar:helpid="27019"/>
+- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
 -</toolbar:toolbar>
 \ Nincs újsor a fájl végén
++ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="27019"/>
 + <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:helpid="27019"/>
 +</toolbar:toolbar>
 +
@@ -260,16 +261,19 @@ diff -Naur sd.old/uiconfig/simpress/toolbar/textobjectbar.xml sd/uiconfig/simpre
   <toolbar:toolbarseparator/>
   <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/>
   <toolbar:toolbaritem xlink:href=".uno:OutlineLeft" toolbar:helpid="10152"/>
-@@ -37,7 +37,7 @@
+@@ -39,7 +39,9 @@
   <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:helpid="10296"/>
   <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
   <toolbar:toolbaritem xlink:href=".uno:OutlineBullet" toolbar:helpid="10156"/>
-- <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:visible="false" toolbar:helpid="27019"/>
+- <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/>
 + <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:helpid="27019"/>
++ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:helpid="27019"/>
   <toolbar:toolbarseparator/>
   <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
- </toolbar:toolbar>
+-</toolbar:toolbar>
 \ Nincs újsor a fájl végén
++</toolbar:toolbar>
++
 diff -Naur sd.old/uiconfig/simpress/toolbar/toolbar.xml sd/uiconfig/simpress/toolbar/toolbar.xml
 --- sd.old/uiconfig/simpress/toolbar/toolbar.xml	2008-04-07 13:34:28.000000000 +0200
 +++ sd/uiconfig/simpress/toolbar/toolbar.xml	2008-04-10 09:35:06.000000000 +0200

More information about the ooo-build-commit mailing list