applied_patches/0201-svx-speed-editeng.diff

   1 diff -u -r /opt/OpenOffice/svn-HEAD/build/ooo310-m4/svx/source/editeng/editdoc2.cxx svx/source/editeng/editdoc2.cxx
   2 --- svx/source/editeng/editdoc2.cxx
   3 +++ svx/source/editeng/editdoc2.cxx
   4 @@ -324,10 +324,42 @@
   5         DBG_ASSERT( aLineList[ aLineList.Count()-1 ]->GetEnd() == pNode->Len(), "CorrectLines: Ende stimmt nicht!" );
   6  }
   7
   8 +// Shared reverse lookup acceleration pieces ...
   9 +
  10 +static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
  11 +                                                 VoidPtr pPtr, USHORT &rLastPos )
  12 +{
  13 +  // Through certain filter code-paths we do a lot of appends, which in
  14 +  // turn call GetPos - creating some N^2 nightmares. If we have a
  15 +  // non-trivially large list, do a few checks from the end first.
  16 +  if( rLastPos > 16 )
  17 +    {
  18 +      USHORT nEnd;
  19 +      if (rLastPos > nPtrArrayLen - 2)
  20 +               nEnd = nPtrArrayLen;
  21 +      else
  22 +               nEnd = rLastPos + 2;
  23 +
  24 +      for( USHORT nIdx = rLastPos - 2; nIdx < nEnd; nIdx++ )
  25 +               {
  26 +                 if( pPtrArray[ nIdx ] == pPtr )
  27 +                       {
  28 +                         rLastPos = nIdx;
  29 +                         return nIdx;
  30 +                       }
  31 +               }
  32 +    }
  33 +  // The world's lamest linear search from svarray ...
  34 +  for( USHORT nIdx = 0; nIdx < nPtrArrayLen; nIdx++ )
  35 +       if (pPtrArray[ nIdx ] == pPtr )
  36 +         return rLastPos = nIdx;
  37 +  return USHRT_MAX;
  38 +}
  39 +
  40  \f// -------------------------------------------------------------------------
  41  // class ParaPortionList
  42  // -------------------------------------------------------------------------
  43 -ParaPortionList::ParaPortionList()
  44 +ParaPortionList::ParaPortionList() : nLastCache( 0 )
  45  {
  46  }
  47
  48 @@ -336,6 +368,20 @@
  49         Reset();
  50  }
  51
  52 +USHORT ParaPortionList::GetPos( const ParaPortionPtr &rPtr ) const
  53 +{
  54 +       return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
  55 +                                          Count(), static_cast<VoidPtr>( rPtr ),
  56 +                                          ((ParaPortionList *)this)->nLastCache );
  57 +}
  58 +
  59 +USHORT ContentList::GetPos( const ContentNodePtr &rPtr ) const
  60 +{
  61 +    return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
  62 +                                          Count(), static_cast<VoidPtr>( rPtr ),
  63 +                                          ((ContentList *)this)->nLastCache );
  64 +}
  65 +
  66  void ParaPortionList::Reset()
  67  {
  68         for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
  69 diff -u -r /opt/OpenOffice/svn-HEAD/build/ooo310-m4/svx/source/editeng/editdoc.cxx svx/source/editeng/editdoc.cxx
  70 --- /opt/OpenOffice/svn-HEAD/build/ooo310-m4/svx/source/editeng/editdoc.cxx     2009-02-26 08:39:48.000000000 +0000
  71 +++ svx/source/editeng/editdoc.cxx      2009-04-06 14:04:09.000000000 +0100
  72 @@ -258,7 +258,7 @@
  73         4035, 4036, 4037, 4038
  74  };
  75
  76 -SV_IMPL_PTRARR( ContentList, ContentNode* );
  77 +SV_IMPL_PTRARR( DummyContentList, ContentNode* );
  78  SV_IMPL_VARARR( ScriptTypePosInfos, ScriptTypePosInfo );
  79  SV_IMPL_VARARR( WritingDirectionInfos, WritingDirectionInfo );
  80  // SV_IMPL_VARARR( ExtraCharInfos, ExtraCharInfo );
  81 diff -u -r /opt/OpenOffice/svn-HEAD/build/ooo310-m4/svx/source/editeng/editdoc.hxx svx/source/editeng/editdoc.hxx
  82 --- /opt/OpenOffice/svn-HEAD/build/ooo310-m4/svx/source/editeng/editdoc.hxx     2009-02-26 08:39:48.000000000 +0000
  83 +++ svx/source/editeng/editdoc.hxx      2009-04-06 14:03:23.000000000 +0100
  84 @@ -285,7 +285,15 @@
  85  };
  86
  87  typedef ContentNode* ContentNodePtr;
  88 -SV_DECL_PTRARR( ContentList, ContentNodePtr, 0, 4 )
  89 +SV_DECL_PTRARR( DummyContentList, ContentNodePtr, 0, 4 )
  90 +
  91 +class ContentList : public DummyContentList
  92 +{
  93 +  USHORT nLastCache;
  94 +public:
  95 +  ContentList() : DummyContentList( 0, 4 ), nLastCache(0) {}
  96 +  USHORT GetPos( const ContentNodePtr &rPtr ) const;
  97 +};
  98
  99  // -------------------------------------------------------------------------
 100  // class EditPaM
 101 @@ -612,6 +620,7 @@
 102  // -------------------------------------------------------------------------
 103  class ParaPortionList : public DummyParaPortionList
 104  {
 105 +       USHORT nLastCache;
 106  public:
 107                                         ParaPortionList();
 108                                         ~ParaPortionList();
 109 @@ -623,6 +632,8 @@
 110         inline ParaPortion*     SaveGetObject( USHORT nPos ) const
 111                 { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
 112
 113 +       USHORT                  GetPos( const ParaPortionPtr &rPtr ) const;
 114 +
 115         // temporaer:
 116         void                    DbgCheck( EditDoc& rDoc );
 117  };