[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch, NONE, 1.1



Author: caolanm

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

Added Files:
	openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch 
Log Message:
macros crash on invalid hierarchy

openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch:
 source/dialog/selector.cxx     |    0 
 svx/source/dialog/selector.cxx |    6 ++++++
 2 files changed, 6 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch ---
Index: source/dialog/selector.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/selector.cxx,v
retrieving revision 1.17
diff -u -r1.17 selector.cxx
--- openoffice.org.orig/svx/source/dialog/selector.cxx	8 Sep 2005 22:01:09 -0000	1.17
+++ openoffice.org/svx/source/dialog/selector.cxx	31 Jul 2006 10:03:28 -0000
@@ -586,6 +586,8 @@
 							node is a first level child of the Root and is NOT
 							either the current document, user or share */
 							Reference< browse::XBrowseNode >& theChild = children[n];
+							if (!theChild.is())
+								continue;
                             ::rtl::OUString uiName = theChild->getName();
 							BOOL bDisplay = TRUE;
 
@@ -905,6 +907,8 @@
 
 					for ( ULONG n = 0; n < children.getLength(); n++ )
 					{
+         				if (!children[n].is())
+							continue;
 						if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT)
 						{
 							OUString uri;
@@ -1061,6 +1065,8 @@
 							node is a first level child of the Root and is NOT
 							either the current document, user or share */
 							Reference< browse::XBrowseNode >& theChild = children[n];
+                            if (!theChild.is())
+                                continue;
                             ::rtl::OUString uiName = theChild->getName();
 							BOOL bDisplay = TRUE;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]