applied_patches/0120-sc-filters-fill-fix.diff

   1 diff -u -r ../../../sc.bak/source/core/data/table4.cxx sc/source/core/data/table4.cxx
   2 --- ../../../sc.bak/source/core/data/table4.cxx 2004-12-22 14:05:08.000000000 +0530
   3 +++ sc/source/core/data/table4.cxx      2005-01-07 12:21:07.726010848 +0530
   4 @@ -1296,6 +1296,8 @@
   5                                 {
   6                                         for (rInner = nIMin; rInner <= nIMax; rInner++)
   7                                         {
   8 +                        if (pDocument->RowFiltered( rInner, nTab))
   9 +                            continue;
  10                                                 ULONG nInd = nActFormCnt;
  11                                                 FillFormula(nInd, bFirst, (ScFormulaCell*)pSrcCell,
  12                                                         static_cast<SCCOL>(nCol), nRow, (rInner == nIEnd) );
  13 @@ -1307,6 +1309,8 @@
  14                                 {
  15                                         for (rInner = nIMin; rInner <= nIMax; rInner++)
  16                                         {
  17 +                        if (pDocument->RowFiltered( rInner, nTab))
  18 +                            continue;
  19                          ScAddress aDestPos( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), nTab );
  20                          aCol[nCol].Insert( aDestPos.Row(), pSrcCell->CloneWithoutNote( *pDocument ) );
  21                                         }
  22 Index: sc/inc/document.hxx
  23 ===================================================================
  24 --- sc/inc/document.hxx.orig    2004-11-26 13:35:38.064526880 +0000
  25 +++ sc/inc/document.hxx 2004-11-26 17:10:55.795733240 +0000
  26 @@ -508,6 +508,8 @@ public:
  27         ULONG                   GetWeightedCount() const;       // Formeln und Edit staerker gewichtet
  28         ULONG                   GetCodeCount() const;           // RPN-Code in Formeln
  29         DECL_LINK( GetUserDefinedColor, USHORT * );
  30 +    BOOL        RowFiltered( SCROW nRow, SCTAB nTab ) const;    // FillInfo
  31 +    BOOL        ColFiltered( SCCOL nCol, SCTAB nTab ) const;    // FillInfo
  32                                                                                                                                 // Numberformatter
  33
  34  public:
  35 @@ -1698,6 +1700,16 @@ inline BOOL ScDocument::RowHidden( USHOR
  36      return pTab[nTab]->pRowHeight->GetValue(nRow);
  37  }
  38
  39 +inline BOOL ScDocument::ColFiltered( SCCOL nCol, SCTAB nTab ) const
  40 +{
  41 +    return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
  42 +}
  43 +
  44 +inline BOOL ScDocument::RowFiltered( SCROW nRow, SCTAB nTab ) const
  45 +{
  46 +    return pTab[nTab]->IsFiltered(nRow);
  47 +}
  48 +
  49  #endif
  50
  51