rpms/openoffice.org/devel openoffice.org-3.0.0.ooo95318.system-showicons.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.0.ooo95318.system-showicons.patch 
Log Message:
defuzz

openoffice.org-3.0.0.ooo95318.system-showicons.patch:

Index: openoffice.org-3.0.0.ooo95318.system-showicons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo95318.system-showicons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo95318.system-showicons.patch	23 Oct 2008 08:01:49 -0000	1.1
+++ openoffice.org-3.0.0.ooo95318.system-showicons.patch	23 Oct 2008 14:04:56 -0000	1.2
@@ -771,7 +771,7 @@
 diff -u -r1.7 settings.hxx
 --- openoffice.org.orig/vcl/inc/vcl/settings.hxx	4 Jul 2008 17:23:04 -0000	1.7
 +++ openoffice.org/vcl/inc/vcl/settings.hxx	23 Oct 2008 07:50:09 -0000
-@@ -426,12 +426,13 @@
+@@ -426,6 +426,7 @@
      USHORT                          mnUseSystemUIFonts;
      USHORT                          mnAutoMnemonic;
      USHORT                          mnUseImagesInMenus;
@@ -779,28 +779,17 @@
      ULONG                           mnUseFlatBorders;
      long                            mnMinThumbSize;
      ULONG                           mnSymbolsStyle;
-     ULONG                           mnPreferredSymbolsStyle;
-     USHORT                          mnSkipDisabledInMenus;
-     Wallpaper                       maWorkspaceGradient;
- };
- 
- #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
-@@ -730,11 +732,15 @@
+@@ -731,6 +732,10 @@
                                          { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; }
      BOOL							GetUseImagesInMenus() const
                                          { return (BOOL) mpData->mnUseImagesInMenus; }
-+    void							SetUseImagesWithChecksInMenus( BOOL bUseImagesWithChecksInMenus)
++    void                                                      SetUseImagesWithChecksInMenus( BOOL bUseImagesWithChecksInMenus)
 +                                        { CopyData(); mpData->mnUseImagesWithChecksInMenus = bUseImagesWithChecksInMenus; }
-+    BOOL							GetUseImagesWithChecksInMenus() const
++    BOOL                                                      GetUseImagesWithChecksInMenus() const
 +                                        { return (BOOL) mpData->mnUseImagesWithChecksInMenus; }
      void							SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus )
                                          { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; }
      BOOL							GetSkipDisabledInMenus() const
-                                         { return (BOOL) mpData->mnSkipDisabledInMenus; }
- 
-     void                            SetAppFont( const Font& rFont )
-                                         { CopyData(); mpData->maAppFont = rFont; }
-     const Font&                     GetAppFont() const
 Index: source/app/settings.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/app/settings.cxx,v
@@ -808,19 +797,15 @@
 diff -u -r1.77 settings.cxx
 --- openoffice.org.orig/vcl/source/app/settings.cxx	4 Jul 2008 17:34:44 -0000	1.77
 +++ openoffice.org/vcl/source/app/settings.cxx	23 Oct 2008 07:50:10 -0000
-@@ -533,10 +534,11 @@
+@@ -534,6 +534,7 @@
  	mnUseFlatMenues 			= rData.mnUseFlatMenues;
      mnAutoMnemonic				= rData.mnAutoMnemonic;
      mnUseImagesInMenus			= rData.mnUseImagesInMenus;
-+    mnUseImagesWithChecksInMenus	= rData.mnUseImagesWithChecksInMenus;
++    mnUseImagesWithChecksInMenus      = rData.mnUseImagesWithChecksInMenus;
      mnSkipDisabledInMenus		= rData.mnSkipDisabledInMenus;
      mnToolbarIconSize			= rData.mnToolbarIconSize;
      mnSymbolsStyle				= rData.mnSymbolsStyle;
-     mnPreferredSymbolsStyle			= rData.mnPreferredSymbolsStyle;
- }
- 
- // -----------------------------------------------------------------------
-@@ -623,6 +626,7 @@
+@@ -625,6 +626,7 @@
  	mnUseFlatBorders 			= 0;
  	mnUseFlatMenues 			= 0;
  	mnUseImagesInMenus			= (USHORT)TRUE;
@@ -828,7 +813,7 @@
  	mnSkipDisabledInMenus		= (USHORT)FALSE;
      
      Gradient aGrad( GRADIENT_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR );
-@@ -1048,6 +1052,7 @@
+@@ -1050,6 +1052,7 @@
           (mpData->maFieldFont               == rSet.mpData->maFieldFont)                &&
           (mpData->maIconFont                == rSet.mpData->maIconFont)					&&
           (mpData->mnUseImagesInMenus		== rSet.mpData->mnUseImagesInMenus)			&&