rpms/openoffice.org/devel openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch, NONE, 1.1 openoffice.org.spec, 1.898, 1.899

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch 
Log Message:
add openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch

openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch:
 source/window/window.cxx     |    0 
 vcl/source/window/window.cxx |   20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.241.4.1
diff -u -r1.241.4.1 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx	28 Aug 2006 15:49:39 -0000	1.241.4.1
+++ openoffice.org/vcl/source/window/window.cxx	25 Oct 2006 10:19:11 -0000
@@ -822,11 +827,21 @@
         if( nStyle & WB_NOSHADOW )
             nFrameStyle |= SAL_FRAME_STYLE_NOSHADOW;
 
-        if( mpWindowImpl->mnType == WINDOW_DIALOG          ||
-            mpWindowImpl->mnType == WINDOW_TABDIALOG       ||
-            mpWindowImpl->mnType == WINDOW_MODALDIALOG     ||
-            mpWindowImpl->mnType == WINDOW_MODELESSDIALOG )
-            nFrameStyle |= SAL_FRAME_STYLE_DIALOG;
+	switch (mpWindowImpl->mnType)
+	{
+	    case WINDOW_DIALOG:
+            case WINDOW_TABDIALOG:
+            case WINDOW_MODALDIALOG:
+            case WINDOW_MODELESSDIALOG:
+	    case WINDOW_MESSBOX:
+            case WINDOW_INFOBOX:
+            case WINDOW_WARNINGBOX:
+            case WINDOW_ERRORBOX:
+            case WINDOW_QUERYBOX:
+                nFrameStyle |= SAL_FRAME_STYLE_DIALOG;
+	    default:
+	        break;
+	}
 
         SalFrame* pParentFrame = NULL;
         if ( pParent )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -r1.898 -r1.899
--- openoffice.org.spec	25 Oct 2006 07:43:44 -0000	1.898
+++ openoffice.org.spec	25 Oct 2006 10:25:49 -0000	1.899
@@ -138,6 +138,7 @@
 Patch70: openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
 Patch71: openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
 Patch72: workspace.fwk53.patch
+Patch73: openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1010,6 +1011,7 @@
 %patch70 -p1 -b .ooo69620.vcl.atkcombo.patch
 %patch71 -p1 -b .ooo70782.secondaryfpicker.atk.patch
 %patch72 -p1 -b .workspace.fwk53.patch
+%patch73 -p1 -b .ooo70835.vcl.minimizealerts.patch
 
 tar xzf %{SOURCE1}
 
@@ -2543,6 +2545,7 @@
   openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
 - Resolves: rhbz#211969 add openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
 - Resolves: rhbz#212009 add workspace.fwk53.patch
+- Resolves: rhbz#212141 add openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
 
 * Thu Oct 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.4
 - add openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch for rh#210440#