rpms/openoffice.org/devel workspace.vcl39.patch,1.3,1.4

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16176

Modified Files:
	workspace.vcl39.patch 
Log Message:
tweak patch

workspace.vcl39.patch:
 padmin/source/fontentry.cxx                |    6 
 psprint/inc/psprint/fontmanager.hxx        |    2 
 psprint/source/fontmanager/fontcache.cxx   |   40 --
 psprint/source/fontmanager/fontconfig.cxx  |    7 
 psprint/source/fontmanager/fontmanager.cxx |   17 -
 psprint/source/fontsubset/sft.c            |    8 
 psprint/source/fontsubset/sft.h            |    2 
 toolkit/source/awt/vclxtoolkit.cxx         |    5 
 vcl/inc/salframe.hxx                       |    2 
 vcl/inc/sallayout.hxx                      |   10 
 vcl/inc/scrbar.hxx                         |    1 
 vcl/inc/window.hxx                         |    2 
 vcl/source/app/stdtext.cxx                 |    5 
 vcl/source/app/svapp.cxx                   |    5 
 vcl/source/app/svdata.cxx                  |   41 +-
 vcl/source/control/button.cxx              |   52 ++-
 vcl/source/control/edit.cxx                |    6 
 vcl/source/control/ilstbox.cxx             |   29 -
 vcl/source/control/scrbar.cxx              |   88 +++--
 vcl/source/gdi/bmpfast.cxx                 |   34 +-
 vcl/source/gdi/sallayout.cxx               |   49 ++
 vcl/source/window/brdwin.cxx               |    7 
 vcl/source/window/menu.cxx                 |   63 ++-
 vcl/source/window/msgbox.cxx               |   23 +
 vcl/source/window/scrwnd.cxx               |   11 
 vcl/source/window/splitwin.cxx             |   15 
 vcl/source/window/window.cxx               |    5 
 vcl/unx/gtk/app/gtkdata.cxx                |   18 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx   |   33 -
 vcl/unx/gtk/window/gtkframe.cxx            |   92 +++--
 vcl/unx/inc/plugins/gtk/gtkframe.hxx       |    1 
 vcl/unx/inc/salframe.h                     |    1 
 vcl/unx/inc/wmadaptor.hxx                  |   21 +
 vcl/unx/source/app/sm.cxx                  |   11 
 vcl/unx/source/app/soicon.cxx              |    3 
 vcl/unx/source/app/wmadaptor.cxx           |  179 +++++++---
 vcl/unx/source/gdi/pspgraphics.cxx         |    2 
 vcl/unx/source/gdi/xfont.cxx               |    5 
 vcl/unx/source/window/salframe.cxx         |   37 ++
 vcl/win/inc/salgdi.h                       |    1 
 vcl/win/source/gdi/salgdi.cxx              |    2 
 vcl/win/source/gdi/salgdi3.cxx             |  274 ++++++++++++----
 vcl/win/source/gdi/winlayout.cxx           |  492 ++++++++++++++++++-----------
 vcl/win/source/window/salframe.cxx         |   15 
 44 files changed, 1177 insertions(+), 545 deletions(-)

Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.vcl39.patch	8 Jun 2005 18:00:30 -0000	1.3
+++ workspace.vcl39.patch	4 Jul 2005 10:25:50 -0000	1.4
@@ -940,57 +940,6 @@
      return false;
  }
  
-Index: source/gdi/metric.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/metric.cxx,v
-retrieving revision 1.14
-retrieving revision 1.14.12.1
-diff -u -p -u -r1.14 -r1.14.12.1
---- openoffice.org.orig/vcl/source/gdi/metric.cxx	29 Mar 2005 11:45:44 -0000	1.14
-+++ openoffice.org/vcl/source/gdi/metric.cxx	23 May 2005 12:54:39 -0000	1.14.12.1
-@@ -643,7 +643,9 @@ bool ParseCMAP( const unsigned char* pCm
-             rResult.mnPairCount = 2;
-             return true;
-         }
--    
-+
-+        delete[] pCodePairs;
-+        delete[] pStartGlyphs;
-         return false;
-     }
- 
-@@ -731,6 +733,7 @@ bool ParseCMAP( const unsigned char* pCm
-             *(pCP++) = *itInt;
-         
-         // glyph mapping for non-unicode fonts not implemented
-+        delete[] pStartGlyphs;
-         pStartGlyphs = NULL;
-     }
-     
-Index: source/gdi/print.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
-retrieving revision 1.47
-retrieving revision 1.47.2.1
-diff -u -p -u -r1.47 -r1.47.2.1
---- openoffice.org.orig/vcl/source/gdi/print.cxx	12 Apr 2005 12:19:33 -0000	1.47
-+++ openoffice.org/vcl/source/gdi/print.cxx	1 Jun 2005 08:10:20 -0000	1.47.2.1
-@@ -724,6 +724,7 @@ Printer::~Printer()
- 	{
- 		// OutputDevice-Dtor versucht das gleiche, deshalb muss hier
- 		// der FontEntry auch auf NULL gesetzt werden
-+        // TODO: consolidate duplicate cleanup by Printer and OutputDevice
- 		if ( mpFontEntry )
- 		{
- 			mpFontCache->Release( mpFontEntry );
-@@ -740,6 +741,7 @@ Printer::~Printer()
- 			mpGetDevSizeList = NULL;
- 		}
- 		delete mpFontCache;
-+        mpFontCache = NULL;
-         // font list deleted by OutputDevice dtor
- 	}
- 
 Index: source/gdi/sallayout.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/gdi/sallayout.cxx,v