View | Details | Raw Unified | Return to issue 99564
Collapse All | Expand All

(-)a/inc/pam.hxx (+2 lines)
Lines 256-261 public: Link Here
256 
    { return *Start() <= rPos && rPos <= *End(); }
 256 
    { return *Start() <= rPos && rPos <= *End(); }
257
257
258 
    static BOOL Overlap(const SwPaM & a, const SwPaM & b);
 258 
    static BOOL Overlap(const SwPaM & a, const SwPaM & b);
259
260 
    static BOOL LessThan(const SwPaM & a, const SwPaM & b);
259 

          261
          

        

        

          260
          
	DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);

          262
          
	DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);

        

        

          261
          

          263
          

        



(-)a/source/core/crsr/pam.cxx
      (+5 lines)




  

    
      
            Lines 1154-1156
          BOOL SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
      
      
        Link Here
      
    
  

        

          1154
          
{

          1154
          
{

        

        

          1155
          
    return !(*b.End() <= *a.Start() || *a.End() <= *b.End());

          1155
          
    return !(*b.End() <= *a.Start() || *a.End() <= *b.End());

        

        

          1156
          
}

          1156
          
}

        

            

              
              
              1157
              

            

            

              1158
              
BOOL SwPaM::LessThan(const SwPaM & a, const SwPaM & b)

            

            

              1159
              
{

            

            

              1160
              
    return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End()); 

            

            

              1161
              
}

            



(-)a/source/filter/ww8/ww8par2.cxx
      (-2 / +5 lines)




  

    
      
            Lines 3532-3539
          void SwWW8ImplReader::TabCellEnd()
      
      
        Link Here
      
    
  

        

          3532
          
    {

          3532
          
    {

        

        

          3533
          
        pTableDesc->TableCellEnd();

          3533
          
        pTableDesc->TableCellEnd();

        

        

          3534
          

          3534
          

        

          
            

              3535
              
        if (bReadTable &&  pWFlyPara == NULL && mpTableEndPaM.get() != NULL && 


              3535
              
        if (bReadTable 

            

            

              3536
              
            ! SwPaM::Overlap(*pPaM, *mpTableEndPaM))


              3536
              
            && pWFlyPara == NULL 

            

            

              
              

              3537
              
            && mpTableEndPaM.get() != NULL 

            

            


              3538
              
            && (! SwPaM::Overlap(*pPaM, *mpTableEndPaM))

            

            


              3539
              
            && SwPaM::LessThan(*mpTableEndPaM, *pPaM))

            

        

          3537
          
        {

          3540
          
        {

        

        

          3538
          
            if (mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode())

          3541
          
            if (mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode())

        

        

          3539
          
            {

          3542
          
            {

        






  

  Return to issue 99564