diff options
| author | Niklas Nebel <nn@openoffice.org> | 2010-03-17 12:18:14 +0100 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2010-03-17 12:18:14 +0100 |
| commit | ea9452e6a4dae23aacf56954fd9d2fc02398dc20 (patch) | |
| tree | 68ca377b0da21036b4126295eb6153d93f35e221 /sc/inc/column.hxx | |
| parent | 90621cf951d23564d0d954faf6a35519070b2437 (diff) | |
| parent | f2cf0b3fde3d8577260c8b12e380d23a27dbae17 (diff) | |
dr73: merge with DEV300_m75
Diffstat (limited to 'sc/inc/column.hxx')
| -rw-r--r-- | sc/inc/column.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index a7f0637b8135..b009ec705f0e 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: column.hxx,v $ - * $Revision: 1.21.128.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -114,7 +111,7 @@ private: friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator; -friend class ScQueryValueIterator; +friend class ScDBQueryDataIterator; friend class ScColumnIterator; friend class ScQueryCellIterator; friend class ScMarkedDataIter; @@ -161,7 +158,7 @@ public: 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; |