From fd6d75b30f7487bd28df9771d35a338c470ad80f Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Fri, 25 Jan 2002 00:26:44 +0000 Subject: [PATCH] fix for bug 112209 - remove last consumers of nsStr:: routines r=dbaron, sr=jst git-svn-id: svn://10.0.0.236/trunk@112785 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBulletFrame.cpp | 2 +- mozilla/layout/html/base/src/nsBulletFrame.cpp | 2 +- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 2 +- mozilla/string/obsolete/nsStr.h | 2 -- mozilla/xpcom/string/obsolete/nsStr.h | 2 -- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 30504ddc47d..a06a9f5606b 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -264,7 +264,7 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext, GetListItemText(aPresContext, *myList, text); if (NS_STYLE_DIRECTION_RTL == vis->mDirection) { - nsStr::Delete2(text, 0, 1); + text.Cut(0, 1); text.Append(NS_LITERAL_STRING(".")); } break; diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index 30504ddc47d..a06a9f5606b 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -264,7 +264,7 @@ nsBulletFrame::Paint(nsIPresContext* aPresContext, GetListItemText(aPresContext, *myList, text); if (NS_STYLE_DIRECTION_RTL == vis->mDirection) { - nsStr::Delete2(text, 0, 1); + text.Cut(0, 1); text.Append(NS_LITERAL_STRING(".")); } break; diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 128fd702ca4..b4ae19bc886 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -2853,7 +2853,7 @@ nsMsgCompose::LoadDataFromFile(nsFileSpec& fSpec, nsString &sigData) PRInt32 metaCharsetOffset = sigData.Find(metaCharset,PR_TRUE,0,-1); if (metaCharsetOffset != kNotFound) - nsStr::Delete2(sigData, metaCharsetOffset, metaCharset.Length()); + sigData.Cut(metaCharsetOffset, metaCharset.Length()); } PR_FREEIF(readBuf); diff --git a/mozilla/string/obsolete/nsStr.h b/mozilla/string/obsolete/nsStr.h index a1e03ada09e..5b05c98f300 100644 --- a/mozilla/string/obsolete/nsStr.h +++ b/mozilla/string/obsolete/nsStr.h @@ -359,10 +359,8 @@ protected: * @param aCount tells us the (max) # of chars to delete */ static void Delete1(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount); -public: static void Delete2(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount); -protected: /** * helper routines for Delete1, Delete2 */ diff --git a/mozilla/xpcom/string/obsolete/nsStr.h b/mozilla/xpcom/string/obsolete/nsStr.h index a1e03ada09e..5b05c98f300 100644 --- a/mozilla/xpcom/string/obsolete/nsStr.h +++ b/mozilla/xpcom/string/obsolete/nsStr.h @@ -359,10 +359,8 @@ protected: * @param aCount tells us the (max) # of chars to delete */ static void Delete1(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount); -public: static void Delete2(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount); -protected: /** * helper routines for Delete1, Delete2 */