diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2015-01-22 13:27:33 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2015-01-22 13:35:43 +0100 |
| commit | c6a02b40aa57bc63dc3a11b72f52dda80449843e (patch) | |
| tree | c5a09ab06a8889e1efefb8b464e057959a62cc22 /svtools | |
| parent | cc376d87859a478b6cab348f0c96ea9fa7fe7a9a (diff) | |
Revert "fdo#88475 BrowseBox/grid: reposition data cursor to current row after paint"
(and its later fixup)
This reverts commits
e8a68c1f50f32a0f9d8bcdf16c1270c319910baa
e60b589952985edff12b1a28392ce6fa0ca8d9be
It was a work-around for the real underlying issue, which was that the
result of dbaccess::ResultSet::isFirst() et al were clobbered by moves
made by its clones.
The BrowseBox has two different cursors:
1) One for data to edit (which is kept on the current/active row)
2) One for data to *paint*
The second is a clone of the first.
The real underlying issue is fixed by:
commit d7c9a1d9d65fe8b1a56c5c280d2ca6640a549d2f
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Thu Jan 22 10:49:42 2015 +0100
fdo#88475 RowSetBase: reposition cache before interrogating it
Change-Id: I28d62673fdf10ee6507d38bb7c79c08e4b40902f
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/brwbox2.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index a3fe78ca1f44..b64b7c4d70a4 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -888,7 +888,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool Color aDelimiterLineColor( ::svtools::ColorConfig().GetColorValue( ::svtools::CALCGRID ).nColor ); // redraw the invalid fields - bool paint_seeked(false); for ( sal_uLong nRelRow = nRelTopRow; nRelRow <= nRelBottomRow && (sal_uLong)nTopRow+nRelRow < (sal_uLong)nRowCount; ++nRelRow, aPos.Y() += nDataRowHeigt ) @@ -901,7 +900,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool // prepare row sal_uLong nRow = nTopRow+nRelRow; - paint_seeked = true; if ( !SeekRow( nRow) ) { OSL_FAIL("BrowseBox::ImplPaintData: SeekRow failed"); } @@ -1034,11 +1032,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool } } - if (paint_seeked && !SeekRow(nCurRow)) - { - SAL_WARN("svtools.brwbox", "BrowseBox::ImplPaintData could not seek back to current row after paint"); - } - if (aPos.Y() > aOverallAreaBRPos.Y() + 1) aPos.Y() = aOverallAreaBRPos.Y() + 1; // needed for some of the following drawing |