From 2c8607b6cfc59345e3ecfb4ae094b6c8e4cdce13 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 13 Apr 2006 00:27:00 +0000 Subject: [PATCH] Fix --disable-places bustage, from bug 270893 git-svn-id: svn://10.0.0.236/trunk@194285 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/bookmarks/src/nsBookmarksFeedHandler.cpp | 2 -- .../browser/components/bookmarks/src/nsBookmarksService.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp index bf213d8ea62..700e45d4f6a 100644 --- a/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp +++ b/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp @@ -36,8 +36,6 @@ * ***** END LICENSE BLOCK ***** */ #include "nsBookmarksService.h" -#include "nsArrayEnumerator.h" -#include "nsArray.h" #include "nsIDOMWindow.h" #include "nsIObserverService.h" #include "nsIRDFContainer.h" diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp index da162a74551..93709e30364 100644 --- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp @@ -50,7 +50,7 @@ #include "nsBookmarksService.h" #include "nsArrayEnumerator.h" -#include "nsArray.h" +#include "nsIMutableArray.h" #include "nsVoidArray.h" #include "nsIBrowserHandler.h" #include "nsIDOMWindow.h" @@ -3052,8 +3052,8 @@ nsBookmarksService::GetParentChain(nsIRDFResource* aSource, nsIArray** aParents) return NS_ERROR_NULL_POINTER; nsresult rv; - nsCOMPtr parentArray; - rv = NS_NewArray(getter_AddRefs(parentArray)); + nsCOMPtr parentArray = + do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, NS_ERROR_OUT_OF_MEMORY); nsCOMPtr source = aSource, parent;