From 78be598983abe090c2aad8291c37317ea2feba75 Mon Sep 17 00:00:00 2001 From: "davidmc%netscape.com" Date: Tue, 20 Apr 1999 23:52:38 +0000 Subject: [PATCH] also permit zero scope to be okay as column scope for value oids inside metainfo cells. git-svn-id: svn://10.0.0.236/trunk@28377 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/db/mork/src/morkBuilder.cpp | 3 ++- mozilla/mailnews/db/mork/src/morkBuilder.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/db/mork/src/morkBuilder.cpp b/mozilla/db/mork/src/morkBuilder.cpp index 0d4bd9bf03a..93f59f22a78 100644 --- a/mozilla/db/mork/src/morkBuilder.cpp +++ b/mozilla/db/mork/src/morkBuilder.cpp @@ -779,7 +779,8 @@ morkBuilder::OnValueMid(morkEnv* ev, const morkSpan& inSpan, mork_token* metaSlot = mBuilder_MetaTokenSlot; if ( metaSlot ) { - if ( valOid->mOid_Scope == morkStore_kColumnSpaceScope ) + mork_scope valScope = valOid->mOid_Scope; + if ( !valScope || valScope == morkStore_kColumnSpaceScope ) { if ( ev->Good() && valMid.HasSomeId() ) { diff --git a/mozilla/mailnews/db/mork/src/morkBuilder.cpp b/mozilla/mailnews/db/mork/src/morkBuilder.cpp index 0d4bd9bf03a..93f59f22a78 100644 --- a/mozilla/mailnews/db/mork/src/morkBuilder.cpp +++ b/mozilla/mailnews/db/mork/src/morkBuilder.cpp @@ -779,7 +779,8 @@ morkBuilder::OnValueMid(morkEnv* ev, const morkSpan& inSpan, mork_token* metaSlot = mBuilder_MetaTokenSlot; if ( metaSlot ) { - if ( valOid->mOid_Scope == morkStore_kColumnSpaceScope ) + mork_scope valScope = valOid->mOid_Scope; + if ( !valScope || valScope == morkStore_kColumnSpaceScope ) { if ( ev->Good() && valMid.HasSomeId() ) {