Kaydet (Commit) 51ab4a09 authored tarafından Niklas Nebel's avatar Niklas Nebel Kaydeden (comit) Michael Meeks

calc66: #i114511# don't count cursor movement or clipboard copy

as modification when editing a cell

Conflicts:
	sc/source/ui/app/inputhdl.cxx
	sc/source/ui/inc/inputhdl.hxx
	sc/source/ui/view/editsh.cxx
üst cad75705
......@@ -2185,7 +2185,7 @@ bool ScInputHandler::DataChanging( sal_Unicode cTyped, bool bFromCommand )
return false;
}
void ScInputHandler::DataChanged( bool bFromTopNotify )
void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified )
{
ImplCreateEditEngine();
......@@ -2204,7 +2204,8 @@ void ScInputHandler::DataChanged( bool bFromTopNotify )
pTopView->ShowCursor();
}
bModified = true;
if (bSetModified)
bModified = true;
bSelIsRef = false;
if ( pRangeFindList && !bInRangeUpdate )
......@@ -3324,7 +3325,9 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false
}
}
DataChanged(); // ruft auch UpdateParenthesis()
// #i114511# don't count cursor keys as modification
sal_Bool bSetModified = !bCursorKey;
DataChanged(sal_False, bSetModified); // also calls UpdateParenthesis()
InvalidateAttribs(); //! in DataChanged ?
}
}
......
......@@ -223,7 +223,7 @@ public:
EditView* GetTopView() { return pTopView; }
bool DataChanging( sal_Unicode cTyped = 0, bool bFromCommand = false );
void DataChanged( bool bFromTopNotify = false );
void DataChanged( bool bFromTopNotify = false, bool bSetModified = true );
bool TakesReturn() const { return ( nTipVisible != 0 ); }
......
......@@ -187,6 +187,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
pHdl->DataChanging();
sal_Bool bSetSelIsRef = false;
bool bSetModified = true;
switch ( nSlot )
{
......@@ -222,7 +223,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
case SID_COPY:
pTableView->Copy();
return;
bSetModified = false;
break;
case SID_CUT:
pTableView->Cut();
......@@ -319,6 +321,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
if (pTopView)
pTopView->SetSelection(ESelection(0,0,nPar-1,nLen));
}
bSetModified = sal_False;
}
return;
......@@ -617,7 +620,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
break;
}
pHdl->DataChanged();
pHdl->DataChanged(sal_False, bSetModified);
if (bSetSelIsRef)
pHdl->SetSelIsRef(sal_True);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment