[ooo-build-commit] patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Tue Sep 8 06:42:01 PDT 2009


 patches/dev300/calc-autofilter-shrink-selection.diff |   34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

New commits:
commit 93f7d4341a93113b8dc790c4bdc80494ef2c5fbe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 8 16:38:21 2009 +0300

    Fix build error
    
    * patches/dev300/calc-autofilter-shrink-selection.diff: Reintroduce
      ScColumn::GetFirstDataPos() which was commented out with
      //UNUSED2009-05, but which is used by code added in this patch.

diff --git a/patches/dev300/calc-autofilter-shrink-selection.diff b/patches/dev300/calc-autofilter-shrink-selection.diff
index 2b5d023..1f7f143 100644
--- a/patches/dev300/calc-autofilter-shrink-selection.diff
+++ b/patches/dev300/calc-autofilter-shrink-selection.diff
@@ -62,6 +62,40 @@ index 4274be7..7907caa 100644
  }
  
  void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -164,7 +164,7 @@
+     SCSIZE	    GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
+     BOOL		HasDataAt(SCROW nRow) const;
+     BOOL		HasVisibleDataAt(SCROW nRow) const;
+-//UNUSED2009-05 SCROW		GetFirstDataPos() const;
++    SCROW		GetFirstDataPos() const;
+     SCROW		GetLastDataPos() const;
+     SCROW		GetLastVisDataPos(BOOL bNotes) const;				// ohne Broadcaster
+     SCROW		GetFirstVisDataPos(BOOL bNotes) const;
+--- sc/source/core/data/column2.cxx
++++ sc/source/core/data/column2.cxx
+@@ -1380,13 +1380,13 @@
+     return nLines;
+ }
+ 
+-//UNUSED2009-05 SCROW ScColumn::GetFirstDataPos() const
+-//UNUSED2009-05 {
+-//UNUSED2009-05     if (nCount)
+-//UNUSED2009-05         return pItems[0].nRow;
+-//UNUSED2009-05     else
+-//UNUSED2009-05         return 0;
+-//UNUSED2009-05 }
++SCROW ScColumn::GetFirstDataPos() const
++{
++    if (nCount)
++        return pItems[0].nRow;
++    else
++        return 0;
++}
+ 
+ SCROW ScColumn::GetLastDataPos() const
+ {
 diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
 index 3f25558..8dfafd9 100644
 --- sc/source/ui/inc/dbfunc.hxx


More information about the ooo-build-commit mailing list