From cb39a2dc4cb0795990184bf6f59d730bcad57738 Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Fri, 4 Dec 1998 10:01:42 +0000 Subject: [PATCH] Changed RDF document CID. git-svn-id: svn://10.0.0.236/trunk@15770 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/uriloader/base/nsDocLoader.cpp | 4 ++-- mozilla/webshell/src/nsDocLoader.cpp | 4 ++-- .../webshell/tests/viewer/nsSetupRegistry.cpp | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 4132fb411ad..cabfb4546ba 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -87,7 +87,7 @@ NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); /* Define CIDs... */ NS_DEFINE_IID(kCHTMLDocumentCID, NS_HTMLDOCUMENT_CID); NS_DEFINE_IID(kCXMLDocumentCID, NS_XMLDOCUMENT_CID); -NS_DEFINE_IID(kCRDFDocumentCID, NS_RDFDOCUMENT_CID); +NS_DEFINE_IID(kCRDFHTMLDocumentCID, NS_RDFHTMLDOCUMENT_CID); NS_DEFINE_IID(kCImageDocumentCID, NS_IMAGEDOCUMENT_CID); NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); @@ -461,7 +461,7 @@ nsDocFactoryImpl::CreateRDFDocument(nsIURL* aURL, /* * Create the image document... */ - rv = nsRepository::CreateInstance(kCRDFDocumentCID, + rv = nsRepository::CreateInstance(kCRDFHTMLDocumentCID, nsnull, kIDocumentIID, (void **)&doc); diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 4132fb411ad..cabfb4546ba 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -87,7 +87,7 @@ NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); /* Define CIDs... */ NS_DEFINE_IID(kCHTMLDocumentCID, NS_HTMLDOCUMENT_CID); NS_DEFINE_IID(kCXMLDocumentCID, NS_XMLDOCUMENT_CID); -NS_DEFINE_IID(kCRDFDocumentCID, NS_RDFDOCUMENT_CID); +NS_DEFINE_IID(kCRDFHTMLDocumentCID, NS_RDFHTMLDOCUMENT_CID); NS_DEFINE_IID(kCImageDocumentCID, NS_IMAGEDOCUMENT_CID); NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); @@ -461,7 +461,7 @@ nsDocFactoryImpl::CreateRDFDocument(nsIURL* aURL, /* * Create the image document... */ - rv = nsRepository::CreateInstance(kCRDFDocumentCID, + rv = nsRepository::CreateInstance(kCRDFHTMLDocumentCID, nsnull, kIDocumentIID, (void **)&doc); diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp index 6c0a0a744fb..2208af36c37 100644 --- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp +++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp @@ -120,6 +120,7 @@ static NS_DEFINE_IID(kCDocumentLoaderCID, NS_DOCUMENTLOADER_CID); static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID); static NS_DEFINE_IID(kCPluginHostCID, NS_PLUGIN_HOST_CID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); +static NS_DEFINE_CID(kWellFormedDTDCID, NS_WELLFORMEDDTD_CID); static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); static NS_DEFINE_IID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); @@ -135,9 +136,13 @@ static NS_DEFINE_CID(kRDFResourceManagerCID, NS_RDFRESOURCEMANAGER_CID); static NS_DEFINE_CID(kRDFSimpleDataBaseCID, NS_RDFSIMPLEDATABASE_CID); static NS_DEFINE_CID(kRDFBookMarkDataSourceCID, NS_RDFBOOKMARKDATASOURCE_CID); static NS_DEFINE_CID(kRDFRegistryCID, NS_RDFREGISTRY_CID); -static NS_DEFINE_CID(kRDFDocumentCID, NS_RDFDOCUMENT_CID); +static NS_DEFINE_CID(kRDFHTMLDocumentCID, NS_RDFHTMLDOCUMENT_CID); static NS_DEFINE_CID(kCSSParserCID, NS_CSSPARSER_CID); +static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); +static NS_DEFINE_CID(kHTMLStyleSheetCID, NS_HTMLSTYLESHEET_CID); +static NS_DEFINE_CID(kTextNodeCID, NS_TEXTNODE_CID); +static NS_DEFINE_CID(kSelectionCID, NS_SELECTION_CID); extern "C" void NS_SetupRegistry() @@ -177,6 +182,7 @@ NS_SetupRegistry() nsRepository::RegisterFactory(kPrefCID, PREF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCPluginHostCID, PLUGIN_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kWellFormedDTDCID, PARSER_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCDOMScriptObjectFactory, DOM_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCDOMNativeObjectRegistry, DOM_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCHTMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); @@ -188,12 +194,16 @@ NS_SetupRegistry() nsRepository::RegisterFactory(kIEditFactoryIID, EDITOR_DLL, PR_FALSE, PR_FALSE); #endif //XP_MAC - nsRepository::RegisterFactory(kRDFDocumentCID, RDF_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kRDFHTMLDocumentCID, RDF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kRDFMemoryDataSourceCID, RDF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kRDFResourceManagerCID, RDF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kRDFBookMarkDataSourceCID, RDF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kRDFSimpleDataBaseCID, RDF_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kRDFRegistryCID, RDF_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kCSSParserCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kCSSParserCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kPresShellCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kHTMLStyleSheetCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kTextNodeCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kSelectionCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); }