ooo-build r11527 - in trunk: . patches/src680

[jonp svn gnome org]

Author: jonp
Date: Thu Feb  7 18:40:58 2008
New Revision: 11527
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11527&view=rev

Log:
	* patches/src680/sc-paste-on-enter.diff: Cleanup clipboard clearing code.
	* patches/src680/apply: sc-paste-on-enter.diff is also i#28535.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/sc-paste-on-enter.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Feb  7 18:40:58 2008
@@ -660,7 +660,7 @@
 sc-r1c1.diff, i#20857, jody
 
 # Paste clipboard when ENTER is pressed, then clear clipboard.
-sc-paste-on-enter.diff, n#358545, jonp
+sc-paste-on-enter.diff, n#358545, i#28535, jonp
 
 [ CalcFixes < ooh680-m4 ]
 # Add named range support for INDIRECT and INDIRECT_XL

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	Thu Feb  7 18:40:58 2008
@@ -206,7 +206,7 @@
          if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
          {
              SC_MOD()->EndReference();
-@@ -2961,6 +3007,26 @@ void __EXPORT ScGridWindow::KeyInput(con
+@@ -2961,6 +3006,18 @@ void __EXPORT ScGridWindow::KeyInput(con
              return;
          }
      }
@@ -216,17 +216,9 @@
 +
 +		ScCellShell::PasteFromClipboard( pViewData, pTabViewShell );
 +
-+		// Copy an empty cell to the clipboard.
-+		ScDocument* pDoc = new ScDocument ();
-+		BOOL b = pDoc->InsertTab( SC_TAB_APPEND, String::CreateFromAscii ( "Temp" ) );
-+		ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-+		pDoc->CopyToClip( 1, 1, 1, 1, FALSE, pClipDoc, FALSE );
-+		TransferableObjectDescriptor aObjDesc;
-+		pViewData->GetDocShell()->FillTransferableObjectDescriptor( aObjDesc );
-+		ScTransferObj* pTransferObj = new ScTransferObj( pClipDoc, aObjDesc );
-+		pTransferObj->CopyToClipboard( pViewData->GetActiveWin() );
-+		SC_MOD()->SetClipObject( pTransferObj, NULL );
-+		delete pDoc;
++		TransferableHelper::GetSystemClipboard()->setContents(
++				uno::Reference<datatransfer::XTransferable>(),
++				uno::Reference<datatransfer::clipboard::XClipboardOwner>());
 +
 +		pViewData->SetPasteMode( FALSE );
 +	}