[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/vcl-free-renderpicture.diff |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit e9220a187a5baf40424483a001fa2ed0a98b8fc0
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 26 21:13:05 2009 +0100

    Oops, fixed one more corner case in render pic release
    
    * patches/dev300/vcl-free-renderpicture.diff:

diff --git a/patches/dev300/vcl-free-renderpicture.diff b/patches/dev300/vcl-free-renderpicture.diff
index b08bab2..cd4987c 100644
--- a/patches/dev300/vcl-free-renderpicture.diff
+++ b/patches/dev300/vcl-free-renderpicture.diff
@@ -5,23 +5,24 @@ From: Thorsten Behrens <thb at openoffice.org>
 
 ---
 
- vcl/unx/gtk/window/gtkframe.cxx    |    4 ++++
+ vcl/unx/gtk/window/gtkframe.cxx    |    5 +++++
  vcl/unx/inc/salframe.h             |    2 +-
  vcl/unx/source/window/salframe.cxx |    9 +++++----
- 3 files changed, 10 insertions(+), 5 deletions(-)
+ 3 files changed, 11 insertions(+), 5 deletions(-)
 
 
 diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index e3e58b5..3cc1c44 100644
+index e3e58b5..75cd135 100644
 --- vcl/unx/gtk/window/gtkframe.cxx
 +++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -2394,6 +2394,10 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
+@@ -2394,6 +2394,11 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
          }
      }
  
 +    // free xrender resources
 +    for( unsigned int i = 0; i < sizeof(m_aGraphics)/sizeof(m_aGraphics[0]); i++ )
-+        m_aGraphics[i].pGraphics->SetDrawable( None, m_nScreen );
++        if( m_aGraphics[i].bInUse )
++            m_aGraphics[i].pGraphics->SetDrawable( None, m_nScreen );
 +
      // first deinit frame
      if( m_pIMHandler )