summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2002-04-11 15:00:16 +0000
committerFrank Schönheit <fs@openoffice.org>2002-04-11 15:00:16 +0000
commit3171496cdffb772d624b97668bfed7d6def9b39b (patch)
tree104b8d6ab5b1b156f493b5c44bc69ed5a4b966d1 /svtools
parent6c6b87e779274a8852aa4d26cca1fe1e2138f8a2 (diff)
#98483# FirstSelectedColumn/NextSelectedColumn
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx31
1 files changed, 25 insertions, 6 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 0d80924a86d8..41d1b69f8ed9 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: brwbox1.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2002-04-09 07:24:53 $
+ * last change: $Author: fs $ $Date: 2002-04-11 16:00:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1812,9 +1812,15 @@ void BrowseBox::SelectRow( long nRow, BOOL _bSelect, BOOL bExpand )
}
// set new selection
- if ( !bHideSelect &&
- ( (bMultiSelection && uRow.pSel->GetTotalRange().Max() >= nRow && uRow.pSel->Select(nRow,_bSelect)) ||
- (!bMultiSelection && ( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION ) ) )
+ if ( !bHideSelect
+ && ( ( bMultiSelection
+ && uRow.pSel->GetTotalRange().Max() >= nRow
+ && uRow.pSel->Select( nRow, _bSelect )
+ )
+ || ( !bMultiSelection
+ && ( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION )
+ )
+ )
{
// Handle-Column nicht highlighten
BrowserColumn *pFirstCol = pCols->GetObject(0);
@@ -1883,7 +1889,7 @@ void BrowseBox::SelectColumnPos( USHORT nNewColPos, BOOL _bSelect, BOOL bMakeVis
uRow.nSel = BROWSER_ENDOFSELECTION;
pColSel->SelectAll(FALSE);
- if ( pColSel->Select( nNewColPos ) )
+ if ( pColSel->Select( nNewColPos, _bSelect ) )
{
// GoToColumnId( pCols->GetObject(nNewColPos)->GetId(), bMakeVisible );
@@ -1923,6 +1929,18 @@ USHORT BrowseBox::GetSelectColumnCount() const
}
//-------------------------------------------------------------------
+USHORT BrowseBox::FirstSelectedColumn( ) const
+{
+ return pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
+}
+
+//-------------------------------------------------------------------
+USHORT BrowseBox::NextSelectedColumn( ) const
+{
+ return pColSel ? pColSel->NextSelected() : BROWSER_ENDOFSELECTION;
+}
+
+//-------------------------------------------------------------------
long BrowseBox::FirstSelectedRow( BOOL bInverse )
{
@@ -2312,6 +2330,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
bHideSelect = ((nMode & BROWSER_HIDESELECT) == BROWSER_HIDESELECT);
bHideCursor = ((nMode & BROWSER_HIDECURSOR) == BROWSER_HIDECURSOR);
+
m_bFocusOnlyCursor = ((nMode & BROWSER_CURSOR_WO_FOCUS) == 0);
bHLines = ( nMode & BROWSER_HLINESFULL ) == BROWSER_HLINESFULL;