ooo-build r11789 - in trunk: . patches/src680
- From: jonp svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11789 - in trunk: . patches/src680
- Date: Mon, 3 Mar 2008 21:12:23 +0000 (GMT)
Author: jonp
Date: Mon Mar 3 21:12:22 2008
New Revision: 11789
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11789&view=rev
Log:
* patches/src680/sc-paste-on-enter.diff: When pasting more than one cell, we
shouldn't clear the selection. This preserves in-selection navigation (with
ENTER and TAB) after the paste.
Modified:
trunk/ChangeLog
trunk/patches/src680/sc-paste-on-enter.diff
Modified: trunk/patches/src680/sc-paste-on-enter.diff
==============================================================================
--- trunk/patches/src680/sc-paste-on-enter.diff (original)
+++ trunk/patches/src680/sc-paste-on-enter.diff Mon Mar 3 21:12:22 2008
@@ -246,7 +246,7 @@
if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
{
SC_MOD()->EndReference();
-@@ -2961,9 +3006,31 @@ void __EXPORT ScGridWindow::KeyInput(con
+@@ -2961,9 +3006,37 @@ void __EXPORT ScGridWindow::KeyInput(con
return;
}
}
@@ -254,7 +254,13 @@
+ {
+ ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
+
-+ ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, IDF_SPECIAL_NOMARKAREA, FALSE );
++ ScDocument* pClipDoc = ScTransferObj::GetOwnClipboard(
++ pViewData->GetActiveWin() )->GetDocument();
++ SCCOL nX;
++ SCROW nY;
++ pClipDoc->GetClipArea( nX, nY, TRUE );
++ ScCellShell::PasteFromClipboard( pViewData, pTabViewShell,
++ nX == 0 && nY == 0 ? IDF_SPECIAL_NOMARKAREA : 0, FALSE );
+
+ uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard =
+ TransferableHelper::GetSystemClipboard();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]