From cf1b290be148fa1d3511a1aeef70c319ebcf82c2 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Thu, 17 Aug 2000 21:07:45 +0000 Subject: [PATCH] not part of the build; temporarily patching these files to use the old (what is currently in the tree) |GetReadableFragment| scheme, so that clients can start using this now both on the tip and on the DOMAPI... branch git-svn-id: svn://10.0.0.236/trunk@76579 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/public/nsPrintfCString.h | 3 ++- mozilla/string/src/nsPrintfCString.cpp | 21 +++++++++++++++++++ mozilla/xpcom/ds/nsPrintfCString.cpp | 21 +++++++++++++++++++ mozilla/xpcom/ds/nsPrintfCString.h | 3 ++- mozilla/xpcom/string/public/nsPrintfCString.h | 3 ++- mozilla/xpcom/string/src/nsPrintfCString.cpp | 21 +++++++++++++++++++ 6 files changed, 69 insertions(+), 3 deletions(-) diff --git a/mozilla/string/public/nsPrintfCString.h b/mozilla/string/public/nsPrintfCString.h index c89d5d0f9a0..6ee4b13e3f8 100755 --- a/mozilla/string/public/nsPrintfCString.h +++ b/mozilla/string/public/nsPrintfCString.h @@ -81,7 +81,8 @@ class nsPrintfCString virtual PRUint32 Length() const; protected: - virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; + virtual const char* GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const; +// virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; private: char* mStart; diff --git a/mozilla/string/src/nsPrintfCString.cpp b/mozilla/string/src/nsPrintfCString.cpp index 167a5f0822b..17cc3f44c76 100755 --- a/mozilla/string/src/nsPrintfCString.cpp +++ b/mozilla/string/src/nsPrintfCString.cpp @@ -94,6 +94,7 @@ nsPrintfCString::Length() const return mLength; } +#if 0 PRBool nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const { @@ -112,3 +113,23 @@ nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFra return PR_FALSE; } } +#else +const char* +nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const + { + switch ( aRequest ) + { + case kFirstFragment: + case kLastFragment: + case kFragmentAt: + aFragment.mEnd = (aFragment.mStart = mStart) + mLength; + return mStart + aOffset; + + case kPrevFragment: + case kNextFragment: + default: + return 0; + } + } +#endif + diff --git a/mozilla/xpcom/ds/nsPrintfCString.cpp b/mozilla/xpcom/ds/nsPrintfCString.cpp index 167a5f0822b..17cc3f44c76 100755 --- a/mozilla/xpcom/ds/nsPrintfCString.cpp +++ b/mozilla/xpcom/ds/nsPrintfCString.cpp @@ -94,6 +94,7 @@ nsPrintfCString::Length() const return mLength; } +#if 0 PRBool nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const { @@ -112,3 +113,23 @@ nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFra return PR_FALSE; } } +#else +const char* +nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const + { + switch ( aRequest ) + { + case kFirstFragment: + case kLastFragment: + case kFragmentAt: + aFragment.mEnd = (aFragment.mStart = mStart) + mLength; + return mStart + aOffset; + + case kPrevFragment: + case kNextFragment: + default: + return 0; + } + } +#endif + diff --git a/mozilla/xpcom/ds/nsPrintfCString.h b/mozilla/xpcom/ds/nsPrintfCString.h index c89d5d0f9a0..6ee4b13e3f8 100755 --- a/mozilla/xpcom/ds/nsPrintfCString.h +++ b/mozilla/xpcom/ds/nsPrintfCString.h @@ -81,7 +81,8 @@ class nsPrintfCString virtual PRUint32 Length() const; protected: - virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; + virtual const char* GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const; +// virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; private: char* mStart; diff --git a/mozilla/xpcom/string/public/nsPrintfCString.h b/mozilla/xpcom/string/public/nsPrintfCString.h index c89d5d0f9a0..6ee4b13e3f8 100755 --- a/mozilla/xpcom/string/public/nsPrintfCString.h +++ b/mozilla/xpcom/string/public/nsPrintfCString.h @@ -81,7 +81,8 @@ class nsPrintfCString virtual PRUint32 Length() const; protected: - virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; + virtual const char* GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const; +// virtual PRBool GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const; private: char* mStart; diff --git a/mozilla/xpcom/string/src/nsPrintfCString.cpp b/mozilla/xpcom/string/src/nsPrintfCString.cpp index 167a5f0822b..17cc3f44c76 100755 --- a/mozilla/xpcom/string/src/nsPrintfCString.cpp +++ b/mozilla/xpcom/string/src/nsPrintfCString.cpp @@ -94,6 +94,7 @@ nsPrintfCString::Length() const return mLength; } +#if 0 PRBool nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest ) const { @@ -112,3 +113,23 @@ nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFra return PR_FALSE; } } +#else +const char* +nsPrintfCString::GetReadableFragment( nsReadableFragment& aFragment, nsFragmentRequest aRequest, PRUint32 aOffset ) const + { + switch ( aRequest ) + { + case kFirstFragment: + case kLastFragment: + case kFragmentAt: + aFragment.mEnd = (aFragment.mStart = mStart) + mLength; + return mStart + aOffset; + + case kPrevFragment: + case kNextFragment: + default: + return 0; + } + } +#endif +