rpms/openoffice.org/devel openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch, NONE, 1.1 openoffice.org.spec, 1.854, 1.855

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch 
Log Message:
add openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch

openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch:
 framework/source/uielement/menubarmanager.cxx |   12 ++++++++++++
 source/uielement/menubarmanager.cxx           |    0 
 2 files changed, 12 insertions(+)

--- NEW FILE openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch ---
Index: source/uielement/menubarmanager.cxx
===================================================================
RCS file: /cvs/framework/framework/source/uielement/menubarmanager.cxx,v
retrieving revision 1.39
diff -u -r1.39 menubarmanager.cxx
--- openoffice.org.orig/framework/source/uielement/menubarmanager.cxx	4 Aug 2006 11:08:22 -0000	1.39
+++ openoffice.org/framework/source/uielement/menubarmanager.cxx	22 Aug 2006 10:54:02 -0000
@@ -1249,6 +1249,9 @@
                                 // Force update of popup menu
                                 pMenuItemHandler->xPopupMenuController->updatePopupMenu();
                                 bPopupMenu = sal_True;
+								if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+									pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
+
                             }
 
                             if ( xMenuItemDispatch.is() )
@@ -1271,6 +1274,9 @@
                     {
                         // Force update of popup menu
                         pMenuItemHandler->xPopupMenuController->updatePopupMenu();
+						if (PopupMenu*  pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+							pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
+
                     }
                     else if ( pMenuItemHandler->xMenuItemDispatch.is() )
                     {
@@ -1659,6 +1665,9 @@
                     if ( CreatePopupMenuController( pItemHandler ))
                         pItemHandler->xPopupMenuController->updatePopupMenu();
                 }
+
+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
             }
             else if (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
 				     ( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
@@ -1806,6 +1815,9 @@
                     if ( CreatePopupMenuController( pItemHandler ))
                         pItemHandler->xPopupMenuController->updatePopupMenu();
                 }
+
+				if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
+					pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
             }
 
 			m_aMenuItemHandlerVector.push_back( pItemHandler );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- openoffice.org.spec	21 Aug 2006 10:47:03 -0000	1.854
+++ openoffice.org.spec	22 Aug 2006 11:03:13 -0000	1.855
@@ -122,6 +122,7 @@
 Patch54: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 Patch55: openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 Patch56: openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
+Patch57: openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -978,6 +979,7 @@
 %patch54 -p1 -b .ooo68369.dtrans.crash.patch
 %patch55 -p1 -b .ooo68805.sw.ww8size.patch
 %patch56 -p1 -b .ooo68822.sw.recursiveim.patch
+%patch57 -p1 -b .ooo68851.framework.disablemenuifempty.patch
 
 tar xzf %{SOURCE1}
 
@@ -2501,11 +2503,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Aug 21 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
+* Tue Aug 22 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.3
 - fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 - fix openoffice.org-2.0.4.ooo68805.sw.ww8size.patch
 - fix openoffice.org-2.0.4.ooo68822.sw.recursiveim.patch
+- fix potential out of bounds in xmlhelp
 - drop openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch, fixed in gnome now
+- rh#203497# -> openoffice.org-2.0.4.ooo68851.framework.disablemenuifempty.patch
 
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch