rpms/openoffice.org/devel openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, NONE, 1.1 openoffice.org.spec, 1.1624, 1.1625

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8770

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 
Log Message:
Resolves: rhbz#460626 openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch

openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch:

--- NEW FILE openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch ---
--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	2008-08-29 08:29:20.000000000 +0100
+++ openoffice.org/svx/source/dialog/optgdlg.cxx	2008-08-29 08:31:35.000000000 +0100
@@ -795,11 +795,11 @@
         switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
         {
             case STYLE_SYMBOLS_DEFAULT:     aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
-            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
-            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
-            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
-            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
-            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+            case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
+            case STYLE_SYMBOLS_INDUSTRIAL:  aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
+            case STYLE_SYMBOLS_CRYSTAL:     aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+            case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+            case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
         }
 
         aIconStyleLB.RemoveEntry( 0 );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1624
retrieving revision 1.1625
diff -u -r1.1624 -r1.1625
--- openoffice.org.spec	26 Aug 2008 11:59:52 -0000	1.1624
+++ openoffice.org.spec	29 Aug 2008 07:34:42 -0000	1.1625
@@ -110,6 +110,7 @@
 Patch38: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
 Patch39: workspace.fpicker8.patch
 Patch40: workspace.cmcfixes49.patch
+Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1288,6 +1289,7 @@
 %patch38 -p1 -b .ooo91904.sd.wrongindex.patch
 %patch39 -p1 -b .workspace.fpicker8.patch
 %patch40 -p0 -b .workspace.cmcfixes49.patch
+%patch41 -p0 -b .ooo91924.svx.consistentordering.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3647,6 +3649,7 @@
 * Tue Aug 26 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-3.2
 - writer2latex isn't really core enough to be hard required
 - smc-fonts-meera is a far better font than lohit-fonts-malayalam
+- Resolves: rhbz#460626 openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 
 * Tue Aug 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-3.1
 - next milestone