applied_patches/0858-calc-perf-ods-import-properties.diff

   1 diff --git sc/inc/attarray.hxx sc/inc/attarray.hxx
   2 index 2a8c515..82ea003 100644
   3 --- sc/inc/attarray.hxx
   4 +++ sc/inc/attarray.hxx
   5 @@ -39,6 +39,7 @@ class ScEditDataArray;
   6  class ScMarkArray;
   7  class ScPatternAttr;
   8  class ScStyleSheet;
   9 +class ScFlatBoolRowSegments;
  10
  11  class Rectangle;
  12  class SfxItemPoolCache;
  13 @@ -162,7 +163,7 @@ public:
  14                                                                 BOOL bRefresh, BOOL bAttrs );
  15         BOOL    RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
  16
  17 -       void    FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
  18 +       void    FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
  19         BOOL    IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
  20
  21         void    DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow);
  22 diff --git sc/inc/column.hxx sc/inc/column.hxx
  23 index babda9e..0f9586e 100644
  24 --- sc/inc/column.hxx
  25 +++ sc/inc/column.hxx
  26 @@ -71,7 +71,7 @@ class ScPostIt;
  27  struct ScFunctionData;
  28  struct ScLineFlags;
  29  struct ScMergePatternState;
  30 -
  31 +class ScFlatBoolRowSegments;
  32
  33  #define COLUMN_DELTA   4
  34
  35 @@ -341,7 +341,7 @@ public:
  36         const ScStyleSheet*     GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
  37         const ScStyleSheet*     GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
  38
  39 -       void            FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset );
  40 +       void            FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
  41         BOOL            IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
  42
  43                  /// May return -1 if not found
  44 diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
  45 index c02d595..a5f3607 100644
  46 --- sc/source/core/data/attarray.cxx
  47 +++ sc/source/core/data/attarray.cxx
  48 @@ -57,6 +57,7 @@
  49  #include "rechead.hxx"
  50  #include "globstr.hrc"
  51  #include "cell.hxx"
  52 +#include "segmenttree.hxx"
  53
  54  #undef DBG_INVALIDATE
  55  #define DBGOUTPUT(s) \
  56 @@ -1749,8 +1750,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const
  57         return nRet;
  58  }
  59
  60 -
  61 -void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
  62 +void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
  63  {
  64         SCROW nStart = 0;
  65         SCSIZE nPos = 0;
  66 @@ -1762,7 +1762,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pU
  67  //                     for (SCROW nRow = nStart; nRow <= nEnd; nRow++)
  68  //                             pUsed[nRow] = TRUE;
  69
  70 -                       memset( &pUsed[nStart], TRUE, nEnd-nStart+1 );
  71 +                       rUsedRows.setTrue(nStart, nEnd);
  72
  73                         if (bReset)
  74                         {
  75 diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
  76 index 39061a7..374606a 100644
  77 --- sc/source/core/data/column.cxx
  78 +++ sc/source/core/data/column.cxx
  79 @@ -620,13 +620,11 @@ const ScStyleSheet*       ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo
  80         return bEqual ? pStyle : NULL;
  81  }
  82
  83 -
  84 -void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset )
  85 +void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset )
  86  {
  87 -       pAttrArray->FindStyleSheet( pStyleSheet, pUsed, bReset );
  88 +       pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
  89  }
  90
  91 -
  92  BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
  93  {
  94         return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
  95 diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
  96 index 8cb6f7a..5a78469 100644
  97 --- sc/source/core/data/table2.cxx
  98 +++ sc/source/core/data/table2.cxx
  99 @@ -60,6 +60,7 @@
 100  #include "bcaslot.hxx"
 101  #include "postit.hxx"
 102  #include "globstr.hrc"
 103 +#include "segmenttree.hxx"
 104
 105  #include <math.h>
 106
 107 @@ -1830,36 +1831,24 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRem
 108                                                                 double nPPTX, double nPPTY,
 109                                                                 const Fraction& rZoomX, const Fraction& rZoomY )
 110  {
 111 -       BOOL* pUsed = new BOOL[MAXROWCOUNT];
 112 -    memset( pUsed, 0, sizeof(BOOL) * (MAXROWCOUNT) );
 113 +    ScFlatBoolRowSegments aUsedRows;
 114 +    for (SCCOL i = 0; i <= MAXCOL; ++i)
 115 +        aCol[i].FindStyleSheet(pStyleSheet, aUsedRows, bRemoved);
 116
 117 -       SCCOL nCol;
 118 -       for (nCol=0; nCol<=MAXCOL; nCol++)
 119 -               aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved );
 120 +    SCROW nRow = 0;
 121 +    while (nRow <= MAXROW)
 122 +    {
 123 +        ScFlatBoolRowSegments::RangeData aData;
 124 +        if (!aUsedRows.getRangeData(nRow, aData))
 125 +            // search failed!
 126 +            return;
 127
 128 -       BOOL bFound = FALSE;
 129 -       SCROW nStart = 0, nEnd = 0;
 130 -       for (SCROW i=0; i<=MAXROW; i++)
 131 -       {
 132 -               if (pUsed[i])
 133 -               {
 134 -                       if (!bFound)
 135 -                       {
 136 -                               nStart = i;
 137 -                               bFound = TRUE;
 138 -                       }
 139 -                       nEnd = i;
 140 -               }
 141 -               else if (bFound)
 142 -               {
 143 -                       SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
 144 -                       bFound = FALSE;
 145 -               }
 146 -       }
 147 -       if (bFound)
 148 -               SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE );
 149 +        SCROW nEndRow = aData.mnRow2;
 150 +        if (aData.mbValue)
 151 +                       SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE);
 152
 153 -       delete[] pUsed;
 154 +        nRow = nEndRow + 1;
 155 +    }
 156  }
 157
 158