[openoffice.org/f13/master] adapt for OOO320_m12

[Caolan McNamara]

commit 342fd3501e20e67e16d88de7cb51e36171a732b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 13 10:37:49 2010 +0100

    adapt for OOO320_m12

 openoffice.org-3.3.0.ooo113856.vcl.mutter.patch |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch b/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
index 3325aa8..8cae4ea 100644
--- a/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
+++ b/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
@@ -1,13 +1,11 @@
 diff -r e08d3a985a67 vcl/unx/gtk/window/gtkframe.cxx
 --- a/vcl/unx/gtk/window/gtkframe.cxx	Fri Aug 06 13:25:47 2010 +0100
 +++ b/vcl/unx/gtk/window/gtkframe.cxx	Fri Aug 13 08:58:07 2010 +0100
-@@ -1355,7 +1355,8 @@
-             // awesome.
-             bool bHack =
-                 getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity") ||
--                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("compiz")
-+                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("compiz") ||
-+                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Mutter")
-                 ;
-             if( nUserTime == 0 && bHack )
-             {
+@@ -1365,6 +1365,7 @@
+             if( nUserTime == 0 && 
+                (
+                  getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity") ||
++                 getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Mutter") ||
+                  (
+                     getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("compiz") &&
+                     (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION))