diff options
| -rw-r--r-- | sc/source/ui/view/cellsh3.cxx | 22 | ||||
| -rw-r--r-- | sc/source/ui/view/colrowba.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/select.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview2.cxx | 11 |
4 files changed, 30 insertions, 15 deletions
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index f93d61d79d93..7e377e6c6e53 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsh3.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mba $ $Date: 2002-07-08 08:02:27 $ + * last change: $Author: nn $ $Date: 2002-08-30 18:42:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,10 +165,24 @@ void ScCellShell::Execute( SfxRequest& rReq ) } pTabViewShell->LockModifiers( nMode ); - rBindings.Invalidate( SID_STATUS_SELMODE ); + } + else + { + // no arguments (also executed by double click on the status bar controller): + // advance to next selection mode - rReq.Done(); + USHORT nModifiers = pTabViewShell->GetLockedModifiers(); + switch ( nModifiers ) + { + case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD + case KEY_MOD1: nModifiers = 0; break; // ADD -> STD + default: nModifiers = KEY_SHIFT; break; // STD -> EXT + } + pTabViewShell->LockModifiers( nModifiers ); } + + rBindings.Invalidate( SID_STATUS_SELMODE ); + rReq.Done(); break; // SID_STATUS_SELMODE_NORM wird nicht benutzt ??? diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index a83e393b425d..b6cf0cf5dad4 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -2,9 +2,9 @@ * * $RCSfile: colrowba.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2001-07-11 16:08:14 $ + * last change: $Author: nn $ $Date: 2002-08-30 18:42:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,7 +208,6 @@ void ScColBar::SetMarking( BOOL bSet ) pViewData->GetMarkData().SetMarking( bSet ); if (!bSet) { - pFuncSet->SetAnchorFlag(FALSE); pViewData->GetView()->UpdateAutoFillMark(); } } @@ -369,7 +368,6 @@ void ScRowBar::SetMarking( BOOL bSet ) pViewData->GetMarkData().SetMarking( bSet ); if (!bSet) { - pFuncSet->SetAnchorFlag(FALSE); pViewData->GetView()->UpdateAutoFillMark(); } } diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index e401fffd22e7..6b5e60102bee 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -2,9 +2,9 @@ * * $RCSfile: select.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-08-16 13:09:35 $ + * last change: $Author: nn $ $Date: 2002-08-30 18:42:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -797,7 +797,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B pView->AlignToCursor( nPosX, nPosY, SC_FOLLOW_LINE ); pView->SetCursor( nPosX, nPosY ); - if (!bAnchor) + if ( !bAnchor || !pView->IsBlockMode() ) { pView->DoneBlockMode( TRUE ); pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ??? diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 3d7761ce5273..4b9fb8ec169d 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2002-08-30 15:09:15 $ + * last change: $Author: nn $ $Date: 2002-08-30 18:42:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -259,9 +259,9 @@ void ScTabView::MarkCursor( USHORT nCurX, USHORT nCurY, USHORT nCurZ, BOOL bCols InitBlockMode( nCurX, nCurY, nCurZ, FALSE, bCols, bRows ); } - if (bBlockCols) + if (bCols) nCurY = MAXROW; - if (bBlockRows) + if (bRows) nCurX = MAXCOL; ScMarkData& rMark = aViewData.GetMarkData(); @@ -325,6 +325,9 @@ void ScTabView::MarkCursor( USHORT nCurX, USHORT nCurY, USHORT nCurZ, BOOL bCols aViewData.GetViewShell()->UpdateInputHandler(); // InvalidateAttribs(); } + + if ( !bCols && !bRows ) + aHdrFunc.SetAnchorFlag( FALSE ); } //! |