From a2d2d07781d3d851c2b77f9135e84d535ddd80cb Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Tue, 27 Apr 1999 22:14:36 +0000 Subject: [PATCH] Use shared IID --- layout/forms/nsComboboxControlFrame.cpp | 1 - layout/generic/nsTextTransformer.cpp | 6 +----- layout/html/base/src/nsTextTransformer.cpp | 6 +----- layout/html/forms/src/nsComboboxControlFrame.cpp | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index c390197f553..595d1c43ac5 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -63,7 +63,6 @@ static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); nsresult NS_NewComboboxControlFrame(nsIFrame*& aResult) diff --git a/layout/generic/nsTextTransformer.cpp b/layout/generic/nsTextTransformer.cpp index 439217061e7..e741615cf9f 100644 --- a/layout/generic/nsTextTransformer.cpp +++ b/layout/generic/nsTextTransformer.cpp @@ -24,8 +24,7 @@ #include "nsStyleConsts.h" #include "nsILineBreaker.h" #include "nsIWordBreaker.h" - - +#include "nsHTMLIIDs.h" #include "nsIServiceManager.h" #include "nsUnicharUtilCIID.h" #include "nsICaseConversion.h" @@ -34,9 +33,6 @@ static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID); static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID); static nsICaseConversion* gCaseConv = nsnull; -// XXX put a copy in nsHTMLIIDs -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); - // XXX I'm sure there are other special characters #define CH_NBSP 160 diff --git a/layout/html/base/src/nsTextTransformer.cpp b/layout/html/base/src/nsTextTransformer.cpp index 439217061e7..e741615cf9f 100644 --- a/layout/html/base/src/nsTextTransformer.cpp +++ b/layout/html/base/src/nsTextTransformer.cpp @@ -24,8 +24,7 @@ #include "nsStyleConsts.h" #include "nsILineBreaker.h" #include "nsIWordBreaker.h" - - +#include "nsHTMLIIDs.h" #include "nsIServiceManager.h" #include "nsUnicharUtilCIID.h" #include "nsICaseConversion.h" @@ -34,9 +33,6 @@ static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID); static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID); static nsICaseConversion* gCaseConv = nsnull; -// XXX put a copy in nsHTMLIIDs -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); - // XXX I'm sure there are other special characters #define CH_NBSP 160 diff --git a/layout/html/forms/src/nsComboboxControlFrame.cpp b/layout/html/forms/src/nsComboboxControlFrame.cpp index c390197f553..595d1c43ac5 100644 --- a/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -63,7 +63,6 @@ static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); nsresult NS_NewComboboxControlFrame(nsIFrame*& aResult)