rpms/openoffice.org/devel .cvsignore, 1.150.2.3, 1.150.2.4 openoffice.org-2.2.0.rh232389.tango.patch, 1.5, 1.5.2.1 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.25, 1.1440.2.26 sources, 1.273.2.2, 1.273.2.3

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sat Mar 15 13:42:07 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25174

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	.cvsignore openoffice.org-2.2.0.rh232389.tango.patch 
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	openoffice.org.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150.2.3
retrieving revision 1.150.2.4
diff -u -r1.150.2.3 -r1.150.2.4
--- .cvsignore	12 Mar 2008 16:40:53 -0000	1.150.2.3
+++ .cvsignore	15 Mar 2008 13:41:28 -0000	1.150.2.4
@@ -4,4 +4,4 @@
 Tigert-templates.tar.gz
 unowinreg.dll
 bengali.sdf
-DEV300_m2.tar.bz2
+DEV300_m3.tar.bz2

openoffice.org-2.2.0.rh232389.tango.patch:

Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- openoffice.org-2.2.0.rh232389.tango.patch	16 Aug 2007 07:04:22 -0000	1.5
+++ openoffice.org-2.2.0.rh232389.tango.patch	15 Mar 2008 13:41:28 -0000	1.5.2.1
@@ -173,3 +173,47 @@
  
  # settings for mozilla idl compiler
  XPIDL=xpidl
+Index: inc/bf_svtools/imgdef.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svtools/imgdef.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 imgdef.hxx
+--- openoffice.org.orig/binfilter/inc/bf_svtools/imgdef.hxx	12 Mar 2008 12:09:35 -0000	1.2
++++ openoffice.org/binfilter/inc/bf_svtools/imgdef.hxx	15 Mar 2008 11:08:44 -0000
+@@ -49,9 +49,7 @@
+ enum SfxSymbolsStyle
+ {
+     SFX_SYMBOLS_STYLE_AUTO,
+-    SFX_SYMBOLS_STYLE_DEFAULT,
+     SFX_SYMBOLS_STYLE_HICONTRAST,
+-    SFX_SYMBOLS_STYLE_INDUSTRIAL,
+     SFX_SYMBOLS_STYLE_CRYSTAL,
+     SFX_SYMBOLS_STYLE_TANGO
+ };
+Index: bf_svtools/source/config/svt_miscopt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svtools/source/config/svt_miscopt.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svt_miscopt.cxx
+--- openoffice.org.orig/binfilter/bf_svtools/source/config/svt_miscopt.cxx	12 Mar 2008 08:33:33 -0000	1.2
++++ openofficelorg/binfilter/bf_svtools/source/config/svt_miscopt.cxx	15 Mar 2008 11:09:04 -0000
+@@ -278,9 +278,7 @@
+ 	switch ( nStyle )
+ 	{
+ 		case STYLE_SYMBOLS_AUTO:       return SFX_SYMBOLS_STYLE_AUTO;
+-		case STYLE_SYMBOLS_DEFAULT:    return SFX_SYMBOLS_STYLE_DEFAULT;
+ 		case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST;
+-		case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
+ 		case STYLE_SYMBOLS_CRYSTAL:    return SFX_SYMBOLS_STYLE_CRYSTAL;
+ 		case STYLE_SYMBOLS_TANGO:      return SFX_SYMBOLS_STYLE_TANGO;
+ 	}
+@@ -293,9 +291,7 @@
+ 	switch ( nStyle )
+ 	{
+ 		case SFX_SYMBOLS_STYLE_AUTO:       return STYLE_SYMBOLS_AUTO;
+-		case SFX_SYMBOLS_STYLE_DEFAULT:    return STYLE_SYMBOLS_DEFAULT;
+ 		case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST;
+-		case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
+ 		case SFX_SYMBOLS_STYLE_CRYSTAL:    return STYLE_SYMBOLS_CRYSTAL;
+ 		case SFX_SYMBOLS_STYLE_TANGO:      return STYLE_SYMBOLS_TANGO;
+ 	}

openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch:

Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	6 Feb 2008 16:39:46 -0000	1.1
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	15 Mar 2008 13:41:28 -0000	1.1.2.1
@@ -1,14 +1,11 @@
 diff -ru sd/inc/app.hrc sd/inc/app.hrc
 --- openoffice.org.orig/sd/inc/app.hrc	2008-02-05 17:05:14.000000000 +0000
 +++ openoffice.org/sd/inc/app.hrc	2008-02-05 20:29:11.000000000 +0000
-@@ -469,6 +469,8 @@
- // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
- #define SID_SHOW_SLIDE                      (SID_SD_START+440)
+@@ -470,5 +470,6 @@
  
--#define SID_ADD_MOTION_PATH				(SID_SD_START+441)
-+#define SID_ADD_MOTION_PATH                 (SID_SD_START+441)
-+
-+#define SID_TP_EDIT_MASTER                  (SID_SD_START+442)
+ #define SID_ADD_MOTION_PATH					(SID_SD_START+441)
+ #define SID_TABLE_TOOLBOX					(SID_SD_START+442)
++#define SID_TP_EDIT_MASTER                  (SID_SD_START+443)
  
  #endif
 diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.25
retrieving revision 1.1440.2.26
diff -u -r1.1440.2.25 -r1.1440.2.26
--- openoffice.org.spec	14 Mar 2008 10:36:37 -0000	1.1440.2.25
+++ openoffice.org.spec	15 Mar 2008 13:41:28 -0000	1.1440.2.26
@@ -1,5 +1,5 @@
 %define oootag DEV300
-%define ooomilestone 2
+%define ooomilestone 3
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -2916,7 +2916,7 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Thu Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.2.1
+* Fri Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.3.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.273.2.2
retrieving revision 1.273.2.3
diff -u -r1.273.2.2 -r1.273.2.3
--- sources	12 Mar 2008 16:40:53 -0000	1.273.2.2
+++ sources	15 Mar 2008 13:41:28 -0000	1.273.2.3
@@ -4,4 +4,4 @@
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-5311182b27647f0de8b5ab86e72e75b4  DEV300_m2.tar.bz2
+3c11eeb7859d8c917a163fa82a427bb1  DEV300_m3.tar.bz2




More information about the fedora-extras-commits mailing list