rpms/openoffice.org/devel openoffice.org.spec, 1.2147, 1.2148 workspace.fchints01.patch, 1.1, 1.2

Mon Feb 15 09:41:28 UTC 2010

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.fchints01.patch 
Log Message:
defuzz patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2147
retrieving revision 1.2148
diff -u -p -r1.2147 -r1.2148

--- openoffice.org.spec	15 Feb 2010 09:20:36 -0000	1.2147
+++ openoffice.org.spec	15 Feb 2010 09:41:28 -0000	1.2148
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4183,6 +4183,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.5
+- Resolves: rhbz#565330 abrt in ImplGetGraphics
+
 * Tue Feb 09 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.4
 - Resolves: rhbz#445588 improve same name substitution
 - backport workspace.x86_64_bridgefix.patch

workspace.fchints01.patch:
 inc/vcl/fontmanager.hxx                |   15 -
 inc/vcl/glyphcache.hxx                 |    9 
 inc/vcl/impfont.hxx                    |   35 +++
 inc/vcl/outdev.hxx                     |    4 
 inc/vcl/outfont.hxx                    |    4 
 inc/vcl/salgdi.hxx                     |    3 
 inc/vcl/settings.hxx                   |    6 
 inc/vcl/vclenum.hxx                    |   21 +
 source/app/settings.cxx                |    2 
 source/glyphs/gcach_ftyp.cxx           |   99 +++++---
 source/glyphs/gcach_ftyp.hxx           |    9 
 source/window/winproc.cxx              |    6 
 unx/gtk/gdi/salnativewidgets-gtk.cxx   |   18 +
 unx/gtk/window/gtkframe.cxx            |    3 
 unx/headless/svpgdi.hxx                |    1 
 unx/headless/svppspgraphics.cxx        |   26 --
 unx/inc/pspgraphics.h                  |    2 
 unx/inc/salgdi.h                       |    2 
 unx/source/fontmanager/fontcache.cxx   |   13 -
 unx/source/fontmanager/fontconfig.cxx  |  385 +++++++++++++++++++++------------
 unx/source/fontmanager/fontmanager.cxx |    8 
 unx/source/gdi/pspgraphics.cxx         |   26 --
 unx/source/gdi/salgdi3.cxx             |  240 +++++++++++++++++++-
 unx/source/gdi/xlfd_extd.cxx           |    3 
 24 files changed, 655 insertions(+), 285 deletions(-)

Index: workspace.fchints01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fchints01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.fchints01.patch	15 Feb 2010 09:20:36 -0000	1.1
+++ workspace.fchints01.patch	15 Feb 2010 09:41:28 -0000	1.2
@@ -1,11 +1,3 @@
-diff -r 458049042e56 -r c28e2e0d774b .hgtags
---- a/.hgtags	Thu Dec 17 17:08:37 2009 +0100
-+++ b/.hgtags	Fri Feb 12 17:12:55 2010 +0100
-@@ -36,3 +36,4 @@
- 0d8650731e2fe04a3b67ec4e9728924544664187 DEV300_m65
- ac21e7bc7efeb2facf313e07ed7b188c6a5b5e33 DEV300_m66
- c47b380d5a9bd4909ae5dc8262f058f3792a04fc DEV300_m67
-+458049042e56db759174f42fe67e460d55b1cadc DEV300_m68
 diff -r 458049042e56 -r c28e2e0d774b vcl/inc/vcl/fontmanager.hxx
 --- a/vcl/inc/vcl/fontmanager.hxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/inc/vcl/fontmanager.hxx	Fri Feb 12 17:12:55 2010 +0100
@@ -64,14 +56,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
 diff -r 458049042e56 -r c28e2e0d774b vcl/inc/vcl/glyphcache.hxx
 --- a/vcl/inc/vcl/glyphcache.hxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/inc/vcl/glyphcache.hxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -42,6 +41,7 @@
  class ServerFontLayout;
  class ExtraKernInfo;
@@ -159,14 +143,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
 diff -r 458049042e56 -r c28e2e0d774b vcl/inc/vcl/outdev.hxx
 --- a/vcl/inc/vcl/outdev.hxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/inc/vcl/outdev.hxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -80,6 +79,7 @@
  class FontCharMap;
  class SalLayout;
@@ -209,14 +185,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
 diff -r 458049042e56 -r c28e2e0d774b vcl/inc/vcl/salgdi.hxx
 --- a/vcl/inc/vcl/salgdi.hxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/inc/vcl/salgdi.hxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -237,9 +236,10 @@
      void                   ReleaseFonts() { SetFont( NULL, 0 ); }
      // get the current font's metrics
@@ -614,33 +582,9 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
  
      /* #i64117# gtk sets a nice background pixmap
      *  but we actually don't really want that, so save
-diff -r 458049042e56 -r c28e2e0d774b vcl/unx/headless/svpgdi.cxx
---- a/vcl/unx/headless/svpgdi.cxx	Thu Dec 17 17:08:37 2009 +0100
-+++ b/vcl/unx/headless/svpgdi.cxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
-@@ -587,3 +586,4 @@
- {
-     return false;
- }
-+
 diff -r 458049042e56 -r c28e2e0d774b vcl/unx/headless/svpgdi.hxx
 --- a/vcl/unx/headless/svpgdi.hxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/unx/headless/svpgdi.hxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -173,3 +172,4 @@
  };
  
@@ -682,22 +626,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
      switch( rInfo.m_eType )
      {
          case psp::fonttype::Builtin:
-diff -r 458049042e56 -r c28e2e0d774b vcl/unx/headless/svppspgraphics.hxx
---- a/vcl/unx/headless/svppspgraphics.hxx	Thu Dec 17 17:08:37 2009 +0100
-+++ b/vcl/unx/headless/svppspgraphics.hxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
-@@ -193,3 +192,4 @@
- };
- 
- #endif // _SVP_PSPGRAPHICS_HXX
-+
 diff -r 458049042e56 -r c28e2e0d774b vcl/unx/inc/pspgraphics.h
 --- a/vcl/unx/inc/pspgraphics.h	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/unx/inc/pspgraphics.h	Fri Feb 12 17:12:55 2010 +0100
@@ -713,14 +641,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
 diff -r 458049042e56 -r c28e2e0d774b vcl/unx/inc/salgdi.h
 --- a/vcl/unx/inc/salgdi.h	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/unx/inc/salgdi.h	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -253,7 +252,7 @@
      virtual void			SetTextColor( SalColor nSalColor );
      virtual USHORT			SetFont( ImplFontSelectData*, int nFallbackLevel );
@@ -778,14 +698,6 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
 diff -r 458049042e56 -r c28e2e0d774b vcl/unx/source/fontmanager/fontconfig.cxx
 --- a/vcl/unx/source/fontmanager/fontconfig.cxx	Thu Dec 17 17:08:37 2009 +0100
 +++ b/vcl/unx/source/fontmanager/fontconfig.cxx	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *
 @@ -37,33 +36,40 @@
  using namespace psp;
  
@@ -1713,14 +1625,3 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
      mnQuality      = -1;
  }
  
-diff -r 458049042e56 -r c28e2e0d774b vcl/win/inc/salgdi.h
---- a/vcl/win/inc/salgdi.h	Thu Dec 17 17:08:37 2009 +0100
-+++ b/vcl/win/inc/salgdi.h	Fri Feb 12 17:12:55 2010 +0100
-@@ -7,7 +7,6 @@
-  * OpenOffice.org - a multi-platform office productivity suite
-  *
-  * $RCSfile$
-- * $Revision$
-  *
-  * This file is part of OpenOffice.org.
-  *

