Attachment #16594 for issue #3875

View | Details | Raw Unified | Return to issue 3875
Collapse All | Expand All

Lines 54-60 Link Here

(-)sc/source/ui/inc/viewdata.hxx (-1 / +7 lines)
54	*	54	*
55	* All Rights Reserved.	55	* All Rights Reserved.
56	*	56	*
57	* Contributor(s): _______________________________________	57	* Contributor(s): Kohei Yoshida__________________________
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
Lines 219-224 Link Here
219	BYTE nFillMode; // Modus	219	BYTE nFillMode; // Modus
220	BOOL bPagebreak; // Seitenumbruch-Vorschaumodus	220	BOOL bPagebreak; // Seitenumbruch-Vorschaumodus
221		221
		222	BOOL bMod1KeyDown;
		223
222	DECL_LINK (EmptyEditHdl, EditStatus*);	224	DECL_LINK (EmptyEditHdl, EditStatus*);
223	DECL_LINK (EditEngineHdl, EditStatus*);	225	DECL_LINK (EditEngineHdl, EditStatus*);
224		226
Lines 308-313 Link Here
308		310
309	void SetZoom( const Fraction& rNewX, const Fraction& rNewY );	311	void SetZoom( const Fraction& rNewX, const Fraction& rNewY );
310		312
		313	void SetMod1KeyStatus( BOOL bDown ) { bMod1KeyDown = bDown; }
		314
311	const Fraction& GetZoomX() const { return bPagebreak ? aPageZoomX : aZoomX; }	315	const Fraction& GetZoomX() const { return bPagebreak ? aPageZoomX : aZoomX; }
312	const Fraction& GetZoomY() const { return bPagebreak ? aPageZoomY : aZoomY; }	316	const Fraction& GetZoomY() const { return bPagebreak ? aPageZoomY : aZoomY; }
313		317
Lines 467-472 Link Here
467	const Size& GetScenButSize() const { return aScenButSize; }	471	const Size& GetScenButSize() const { return aScenButSize; }
468	void SetScenButSize(const Size& rNew) { aScenButSize = rNew; }	472	void SetScenButSize(const Size& rNew) { aScenButSize = rNew; }
469		473
		474	BOOL IsMod1KeyDown() { return bMod1KeyDown; }
		475
470	static inline long ToPixel( USHORT nTwips, double nFactor );	476	static inline long ToPixel( USHORT nTwips, double nFactor );
471	};	477	};
472		478

Lines 54-60 Link Here

(-)sc/source/ui/view/gridwin.cxx (-2 / +6 lines)
54	*	54	*
55	* All Rights Reserved.	55	* All Rights Reserved.
56	*	56	*
57	* Contributor(s): _______________________________________	57	* Contributor(s): Kohei Yoshida__________________________
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
Lines 1491-1496 Link Here
1491	SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0;	1491	SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0;
1492	#endif	1492	#endif
1493		1493
		1494	pViewData->SetMod1KeyStatus( rMEvt.IsMod1() );
		1495
1494	ClickExtern(); // loescht FilterBox, wenn vorhanden	1496	ClickExtern(); // loescht FilterBox, wenn vorhanden
1495		1497
1496	HideNoteMarker(); // Notiz-Anzeige	1498	HideNoteMarker(); // Notiz-Anzeige
Lines 2928-2937 Link Here
2928		2930
2929	void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)	2931	void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
2930	{	2932	{
		2933	const KeyCode& rKeyCode = rKEvt.GetKeyCode();
		2934	pViewData->SetMod1KeyStatus( rKeyCode.IsMod1() );
		2935
2931	// #96965# Cursor control for ref input dialog	2936	// #96965# Cursor control for ref input dialog
2932	if( SC_MOD()->IsRefDialogOpen() )	2937	if( SC_MOD()->IsRefDialogOpen() )
2933	{	2938	{
2934	const KeyCode& rKeyCode = rKEvt.GetKeyCode();
2935	if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )	2939	if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
2936	{	2940	{
2937	SC_MOD()->EndReference();	2941	SC_MOD()->EndReference();

Lines 54-60 Link Here

(-)sc/source/ui/view/select.cxx (-1 / +16 lines)
54	*	54	*
55	* All Rights Reserved.	55	* All Rights Reserved.
56	*	56	*
57	* Contributor(s): _______________________________________	57	* Contributor(s): Kohei Yoshida__________________________
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
Lines 588-593 Link Here
588	else	588	else
589	{	589	{
590	ScMarkData& rMark = pViewData->GetMarkData();	590	ScMarkData& rMark = pViewData->GetMarkData();
		591	SCCOL nOldX = pViewData->GetCurX();
		592	SCROW nOldY = pViewData->GetCurY();
591	if (rMark.IsMarked() \|\| rMark.IsMultiMarked())	593	if (rMark.IsMarked() \|\| rMark.IsMultiMarked())
592	{	594	{
593	pView->DoneBlockMode(TRUE);	595	pView->DoneBlockMode(TRUE);
Lines 597-602 Link Here
597	aAnchorPos.Set( nPosX, nPosY, nTab );	599	aAnchorPos.Set( nPosX, nPosY, nTab );
598	bStarted = TRUE;	600	bStarted = TRUE;
599	}	601	}
		602	// #i3875# When a new cell is Ctrl-clicked with no selection present, it
		603	// highlights that new cell as well as the old cell where the cursor is.
		604	else if ( pViewData->IsMod1KeyDown() && ( nOldX != nPosX \|\| nOldY != nPosY ) )
		605	{
		606	pView->InitBlockMode( nOldX, nOldY, nTab, TRUE );
		607	pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab );
		608	pView->DoneBlockMode( TRUE );
		609	pView->InitBlockMode( nPosX, nPosY, nTab, TRUE );
		610	pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab );
		611
		612	aAnchorPos.Set( nPosX, nPosY, nTab );
		613	bStarted = TRUE;
		614	}
600	}	615	}
601		616
602	pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );	617	pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY );




 *
 *  All Rights Reserved.
 *
 *  Contributor(s): Kohei Yoshida__________________________
 *
 *
 ************************************************************************/

		bDelMarkValid( FALSE ),
		bActive		( TRUE ),					//! wie initialisieren?
		bPagebreak	( FALSE ),
		pSpellingView ( NULL ),
		bMod1KeyDown( FALSE )
{

	SetGridMode		( TRUE );

		bDelMarkValid( FALSE ),
		bActive		( TRUE ),								//! wie initialisieren?
		bPagebreak	( rViewData.bPagebreak ),
		pSpellingView ( rViewData.pSpellingView ),
		bMod1KeyDown( rViewData.bMod1KeyDown )
{

	SetGridMode		( rViewData.IsGridMode() );

Return to issue 3875

Lines 54-60 Link Here

(-)sc/source/ui/view/viewdata.cxx (-3 / +5 lines)
54	*	54	*
55	* All Rights Reserved.	55	* All Rights Reserved.
56	*	56	*
57	* Contributor(s): _______________________________________	57	* Contributor(s): Kohei Yoshida__________________________
58	*	58	*
59	*	59	*
60	************************************************************************/	60	************************************************************************/
Lines 326-332 Link Here
326	bDelMarkValid( FALSE ),	326	bDelMarkValid( FALSE ),
327	bActive ( TRUE ), //! wie initialisieren?	327	bActive ( TRUE ), //! wie initialisieren?
328	bPagebreak ( FALSE ),	328	bPagebreak ( FALSE ),
329	pSpellingView ( NULL )	329	pSpellingView ( NULL ),
		330	bMod1KeyDown( FALSE )
330	{	331	{
331		332
332	SetGridMode ( TRUE );	333	SetGridMode ( TRUE );
Lines 391-397 Link Here
391	bDelMarkValid( FALSE ),	392	bDelMarkValid( FALSE ),
392	bActive ( TRUE ), //! wie initialisieren?	393	bActive ( TRUE ), //! wie initialisieren?
393	bPagebreak ( rViewData.bPagebreak ),	394	bPagebreak ( rViewData.bPagebreak ),
394	pSpellingView ( rViewData.pSpellingView )	395	pSpellingView ( rViewData.pSpellingView ),
		396	bMod1KeyDown( rViewData.bMod1KeyDown )
395	{	397	{
396		398
397	SetGridMode ( rViewData.IsGridMode() );	399	SetGridMode ( rViewData.IsGridMode() );