nsTextServicesDocument should be #ifdef'd out when building the plaintext editor only. Fixing phoenix build bustage.

This commit is contained in:
bryner%netscape.com 2002-11-14 02:23:08 +00:00
Родитель eb280e54ba
Коммит ac330e4e56
1 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -39,21 +39,17 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#include "nsIGenericFactory.h" #include "nsIGenericFactory.h"
#include "nsEditorCID.h" #include "nsEditorCID.h"
#include "nsEditor.h" // for gInstanceCount #include "nsEditor.h" // for gInstanceCount
#include "nsPlaintextEditor.h" #include "nsPlaintextEditor.h"
#include "nsEditorController.h" //CID #include "nsEditorController.h" //CID
#include "nsTextServicesDocument.h"
#include "nsTextServicesCID.h"
#include "nsIControllerContext.h" #include "nsIControllerContext.h"
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY #ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
#include "nsHTMLEditor.h" #include "nsHTMLEditor.h"
#include "nsTextServicesDocument.h"
#include "nsTextServicesCID.h"
#endif #endif
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -63,8 +59,6 @@
// //
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextServicesDocument)
NS_IMETHODIMP nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID, NS_IMETHODIMP nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID,
void **aResult) void **aResult)
@ -100,6 +94,7 @@ NS_IMETHODIMP nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID,
} }
#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY #ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextServicesDocument)
#ifdef ENABLE_EDITOR_API_LOG #ifdef ENABLE_EDITOR_API_LOG
#include "nsHTMLEditorLog.h" #include "nsHTMLEditorLog.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditorLog) NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditorLog)
@ -128,9 +123,11 @@ static const nsModuleComponentInfo components[] = {
{ "Editor Controller", NS_EDITORCONTROLLER_CID, { "Editor Controller", NS_EDITORCONTROLLER_CID,
"@mozilla.org/editor/editorcontroller;1", "@mozilla.org/editor/editorcontroller;1",
nsEditorControllerConstructor, }, nsEditorControllerConstructor, },
#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
{ NULL, NS_TEXTSERVICESDOCUMENT_CID, { NULL, NS_TEXTSERVICESDOCUMENT_CID,
"@mozilla.org/textservices/textservicesdocument;1", "@mozilla.org/textservices/textservicesdocument;1",
nsTextServicesDocumentConstructor }, nsTextServicesDocumentConstructor },
#endif
}; };
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////