applied_patches/0385-range-listBox-compare.diff

   1 diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
   2 index 25adf15..cbd2fad 100644
   3 --- basic/source/runtime/step0.cxx
   4 +++ basic/source/runtime/step0.cxx
   5 @@ -109,19 +109,24 @@ void SbiRuntime::StepCompare( SbxOperato
   6         // values ( and type ) set as appropriate
   7         SbxDataType p1Type = p1->GetType();
   8         SbxDataType p2Type = p2->GetType();
   9 +       if ( p1Type == SbxEMPTY )
  10 +       {
  11 +               p1->Broadcast( SBX_HINT_DATAWANTED );
  12 +               p1Type = p1->GetType();
  13 +       }
  14 +       if ( p2Type == SbxEMPTY )
  15 +       {
  16 +               p2->Broadcast( SBX_HINT_DATAWANTED );
  17 +               p2Type = p2->GetType();
  18 +       }
  19         if ( p1Type == p2Type )
  20         {
  21 -               if ( p1Type == SbxEMPTY )
  22 -               {
  23 -                       p1->Broadcast( SBX_HINT_DATAWANTED );
  24 -                       p2->Broadcast( SBX_HINT_DATAWANTED );
  25 -               }
  26                 // if both sides are an object and have default props
  27                 // then we need to use the default props
  28                 // we don't need to worry if only one side ( lhs, rhs ) is an
  29                 // object ( object side will get coerced to correct type in
  30                 // Compare )
  31 -               else if ( p1Type ==  SbxOBJECT )
  32 +               if ( p1Type ==  SbxOBJECT )
  33                 {
  34                         SbxVariable* pDflt = getDefaultProp( p1 );
  35                         if ( pDflt )