From 8aa9a6f0c076430b86da931edb627c752f1fe812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 22 Oct 2010 16:33:07 +0100
Subject: [PATCH] tweak to apply

---
 libreoffice-xdg632229.gnomeshell.patch | 32 +++-----------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/libreoffice-xdg632229.gnomeshell.patch b/libreoffice-xdg632229.gnomeshell.patch
index a9121ca..502d4a3 100644
--- a/libreoffice-xdg632229.gnomeshell.patch
+++ b/libreoffice-xdg632229.gnomeshell.patch
@@ -160,44 +160,18 @@ diff -ru vcl/inc/vcl/syswin.hxx vcl/inc/vcl/syswin.hxx
  };
  
  #endif // _SV_SYSWIN_HXX
-diff -ru vcl/os2/inc/salframe.h vcl/os2/inc/salframe.h
---- vcl/os2/inc/salframe.h	2010-10-14 21:43:20.000000000 +0100
-+++ vcl/os2/inc/salframe.h	2010-10-22 13:26:15.000000000 +0100
-@@ -158,6 +158,7 @@
-     virtual bool				SetPluginParent( SystemParentData* pNewParent );
-     virtual void                SetBackgroundBitmap( SalBitmap* );
-     virtual void                SetScreenNumber( unsigned int );
-+    virtual void                SetWMClass( const rtl::OUString &rWMClass );
-     virtual void				ResetClipRegion();
-     virtual void				BeginSetClipRegion( ULONG nRects );
-     virtual void				UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-diff -ru vcl/os2/source/window/salframe.cxx vcl/os2/source/window/salframe.cxx
---- vcl/os2/source/window/salframe.cxx	2010-10-18 17:01:44.000000000 +0100
-+++ vcl/os2/source/window/salframe.cxx	2010-10-22 13:18:17.000000000 +0100
-@@ -1366,6 +1366,10 @@
- {
- }
- 
-+void Os2SalFrame::SetWMClass( const rtl::OUString &/*rWMClass*/ )
-+{
-+}
-+
- // -----------------------------------------------------------------------
- 
- // native menu implementation - currently empty
 diff -ru vcl/source/window/syswin.cxx vcl/source/window/syswin.cxx
 --- vcl/source/window/syswin.cxx	2010-10-14 21:43:20.000000000 +0100
 +++ vcl/source/window/syswin.cxx	2010-10-22 13:29:21.000000000 +0100
-@@ -1084,4 +1084,9 @@
+@@ -1082,3 +1082,8 @@
+ {
      mpWindowImpl->mpFrame->SetScreenNumber( nScreen );
  }
- 
++
 +void SystemWindow::SetWMClass( const rtl::OUString &rWMClass )
 +{
 +    mpWindowImpl->mpFrame->SetWMClass( rWMClass );
 +}
-+
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
 --- vcl/unx/gtk/window/gtkframe.cxx	2010-10-22 08:55:43.000000000 +0100
 +++ vcl/unx/gtk/window/gtkframe.cxx	2010-10-22 14:12:08.000000000 +0100