← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/sc-filters-fill-fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-05-26 18:00:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090526180000-t5otxzhj1rru5ovt
Tags: 1:3.1.0-3ubuntu2
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Correct path to splitgsi in convert2po.
* Disable gsi-export for Rosetta due to bug in localize.pl.
* Reenable building on sparc.
* Switch boost to 1.38.
* Resynchronise with ooo-build-3-1 (271b85e5ce6b601d75d0693b9c937d1eabd069dc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/sc-filters-fill-fix.diff
5
5
                                {
6
6
                                        for (rInner = nIMin; rInner <= nIMax; rInner++)
7
7
                                        {
8
 
+                                                if (pDocument->RowFiltered( rInner, nTab))
9
 
+                                                        continue;
 
8
+                        if (pDocument->RowFiltered( rInner, nTab))
 
9
+                            continue;
10
10
                                                ULONG nInd = nActFormCnt;
11
11
                                                FillFormula(nInd, bFirst, (ScFormulaCell*)pSrcCell,
12
12
                                                        static_cast<SCCOL>(nCol), nRow, (rInner == nIEnd) );
14
14
                                {
15
15
                                        for (rInner = nIMin; rInner <= nIMax; rInner++)
16
16
                                        {
17
 
+                                                if (pDocument->RowFiltered( rInner, nTab))
18
 
+                                                        continue;
 
17
+                        if (pDocument->RowFiltered( rInner, nTab))
 
18
+                            continue;
19
19
                         ScAddress aDestPos( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), nTab );
20
20
                         aCol[nCol].Insert( aDestPos.Row(), pSrcCell->CloneWithoutNote( *pDocument ) );
21
21
                                        }
27
27
        ULONG                   GetWeightedCount() const;       // Formeln und Edit staerker gewichtet
28
28
        ULONG                   GetCodeCount() const;           // RPN-Code in Formeln
29
29
        DECL_LINK( GetUserDefinedColor, USHORT * );
30
 
+       BOOL            RowFiltered( USHORT nRow, USHORT nTab ) const;  // FillInfo
31
 
+       BOOL            ColFiltered( USHORT nCol, USHORT nTab ) const;  // FillInfo
 
30
+    BOOL        RowFiltered( SCROW nRow, SCTAB nTab ) const;    // FillInfo
 
31
+    BOOL        ColFiltered( SCCOL nCol, SCTAB nTab ) const;    // FillInfo
32
32
                                                                                                                                // Numberformatter
33
33
 
34
34
 public:
36
36
     return pTab[nTab]->pRowHeight->GetValue(nRow);
37
37
 }
38
38
 
39
 
+inline BOOL ScDocument::ColFiltered( USHORT nCol, USHORT nTab ) const
 
39
+inline BOOL ScDocument::ColFiltered( SCCOL nCol, SCTAB nTab ) const
40
40
+{
41
 
+       return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
 
41
+    return ( pTab[nTab]->pColFlags[nCol] & CR_FILTERED) != 0;
42
42
+}
43
43
+
44
 
+inline BOOL ScDocument::RowFiltered( USHORT nRow, USHORT nTab ) const
 
44
+inline BOOL ScDocument::RowFiltered( SCROW nRow, SCTAB nTab ) const
45
45
+{
46
 
+       return pTab[nTab]->IsFiltered(nRow);
 
46
+    return pTab[nTab]->IsFiltered(nRow);
47
47
+}
48
48
+ 
49
49
 #endif