From 4c60f37b9f699e4e5e77e63ec97b53080d3364ff Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Fri, 4 Apr 2003 03:57:03 +0000 Subject: [PATCH] Fixing merge conflict from bug 194240 the right way -- removing redundant function decls. r=mozbot. git-svn-id: svn://10.0.0.236/trunk@140672 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/build/nsLayoutModule.cpp | 29 ------------------------- 1 file changed, 29 deletions(-) diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 39561a29317..c49459f6a99 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -367,35 +367,6 @@ nsresult NS_NewSyncLoadDOMService(nsISyncLoadDOMService** aResult); nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult); nsresult NS_NewXPointerResult(nsIXPointerResult **aResult); -nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult); -nsresult NS_CreateCSSFrameConstructor(nsICSSFrameConstructor** aResult); -nsresult NS_NewLayoutHistoryState(nsILayoutHistoryState** aResult); -nsresult NS_NewAutoCopyService(nsIAutoCopyService** aResult); -nsresult NS_NewSelectionImageService(nsISelectionImageService** aResult); - -nsresult NS_NewSelection(nsIFrameSelection** aResult); -nsresult NS_NewDomSelection(nsISelection** aResult); -nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult); -nsresult NS_NewRange(nsIDOMRange** aResult); -nsresult NS_NewRangeUtils(nsIRangeUtils** aResult); -nsresult NS_NewContentIterator(nsIContentIterator** aResult); -nsresult NS_NewPreContentIterator(nsIContentIterator** aResult); -nsresult NS_NewGenRegularIterator(nsIContentIterator** aResult); -nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aResult); -nsresult NS_NewGenSubtreeIterator(nsIContentIterator** aInstancePtrResult); -nsresult NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult); -nsresult NS_NewHTMLElementFactory(nsIElementFactory** aResult); -nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); -nsresult NS_NewHTMLCopyTextEncoder(nsIDocumentEncoder** aResult); -nsresult NS_NewTextEncoder(nsIDocumentEncoder** aResult); -nsresult NS_NewXBLService(nsIXBLService** aResult); -nsresult NS_NewBindingManager(nsIBindingManager** aResult); -nsresult NS_NewNodeInfoManager(nsINodeInfoManager** aResult); -nsresult NS_NewContentPolicy(nsIContentPolicy** aResult); -nsresult NS_NewFrameLoader(nsIFrameLoader** aResult); -nsresult NS_NewSyncLoadDOMService(nsISyncLoadDOMService** aResult); -nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult); - #ifdef MOZ_XUL nsresult NS_NewXULElementFactory(nsIElementFactory** aResult); NS_IMETHODIMP NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);