Author: adamg Date: Sun Aug 6 18:43:55 2006 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- updated version (taken from openoffice.org issuezilla)
---- Files affected:
SOURCES:
openoffice.org-sfx2.badscript.diff (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/openoffice.org-sfx2.badscript.diff
diff -u SOURCES/openoffice.org-sfx2.badscript.diff:1.1
SOURCES/openoffice.org-sfx2.badscript.diff:1.1.2.1
--- SOURCES/openoffice.org-sfx2.badscript.diff:1.1 Fri Mar 17 09:02:44 2006
+++ SOURCES/openoffice.org-sfx2.badscript.diff Sun Aug 6 20:43:49 2006
@@ -1,19 +1,34 @@
-fix for a segfault on:
-format->character->hyperlink->events->oo.org macros->launcher
-
-Index: source/dialog/cfg.cxx
+Index: source/dialog/selector.cxx
===================================================================
-RCS file: /cvs/framework/sfx2/source/dialog/cfg.cxx,v
-retrieving revision 1.53
-diff -u -p -u -r1.53 cfg.cxx
---- sfx2/source/dialog/cfg.cxx 7 Sep 2005 18:12:28 -0000 1.53
-+++ sfx2/source/dialog/cfg.cxx 14 Mar 2006 10:50:22 -0000
-@@ -1746,7 +1746,7 @@ void SfxConfigGroupListBox_Impl::Request
-
bDisplay=FALSE;
- }
- }
-- if
(children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
-+ if ( children[n].is()
&& children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
- {
+RCS file: /cvs/graphics/svx/source/dialog/selector.cxx,v
+retrieving revision 1.17
+diff -u -r1.17 selector.cxx
+--- svx/source/dialog/selector.cxx 8 Sep 2005 22:01:09 -0000 1.17
++++ 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;
- /*
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/openoffice.org-sfx2.badscript.diff?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
