diff options
| author | Rene Engelhard <rene@debian.org> | 2007-10-19 10:12:43 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2007-10-19 10:12:43 +0000 |
| commit | 43c0e4e3c50608f1e0c7be53512431ceff26e799 (patch) | |
| tree | ff7ec1304bdd3c1fd0f895265359ad2c194130bf | |
| parent | b1821bae6c3f5c59565a7111f9fe69815f0d3a6f (diff) | |
Merge from trunk:ooo-build-2-2
2007-10-19 Rene Engelhard <rene@debian.org>
* patches/src680/apply,
patches/src680/ooo82608.vcl.gtkbadfree.diff: add fix for i#8260
| -rw-r--r-- | patches/src680/apply | 1 | ||||
| -rw-r--r-- | patches/src680/ooo82608.vcl.gtkbadfree.diff | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/src680/apply b/patches/src680/apply index caa164b93..ec5b6d3d1 100644 --- a/patches/src680/apply +++ b/patches/src680/apply @@ -1024,6 +1024,7 @@ vcl-bitmap2-negative-height.diff # Don't export an ASCII %%Title when we don't need to. psprint-title.diff, i#74335, n#241015, michael +ooo82608.vcl.gtkbadfree.diff, i#82608 [ BuildBits ] # use system xmlsec diff --git a/patches/src680/ooo82608.vcl.gtkbadfree.diff b/patches/src680/ooo82608.vcl.gtkbadfree.diff new file mode 100644 index 000000000..f6e64c0ed --- /dev/null +++ b/patches/src680/ooo82608.vcl.gtkbadfree.diff @@ -0,0 +1,31 @@ +Index: unx/gtk/gdi/salnativewidgets-gtk.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v +retrieving revision 1.39 +diff -u -r1.39 salnativewidgets-gtk.cxx +--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 3 Jul 2007 14:06:42 -0000 1.39 ++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 19 Oct 2007 08:46:59 -0000 +@@ -2898,9 +2899,9 @@ + aPartRect = Rectangle( aPartPos, aPartSize ); + + if ( pIndicatorSize ) +- g_free( pIndicatorSize ); ++ gtk_requisition_free( pIndicatorSize ); + if ( pIndicatorSpacing ) +- g_free( pIndicatorSpacing ); ++ gtk_border_free( pIndicatorSpacing ); + + return( aPartRect ); + } +@@ -2947,9 +2948,9 @@ + aIndicatorRect.Move( 0, 1 ); + + if ( pIndicatorSize ) +- g_free( pIndicatorSize ); ++ gtk_requisition_free( pIndicatorSize ); + if ( pIndicatorSpacing ) +- g_free( pIndicatorSpacing ); ++ gtk_border_free( pIndicatorSpacing ); + + return( aIndicatorRect ); + } |