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

[jonp svn gnome org]

Author: jonp
Date: Wed Mar  5 19:25:18 2008
New Revision: 11814
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11814&view=rev

Log:
	* patches/src680/sc-extra-cell-margins.diff: Reduce the extra padding.
	* patches/src680/sc-paste-on-enter.diff: Cleanup: remove the hackish
	  IDF_SPECIAL_NOMARKAREA flag; allow TAB after a single-cell Paste to move
	  the current cell (instead of "eating" it, as was previously the case).


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-extra-cell-margins.diff
   trunk/patches/src680/sc-paste-on-enter.diff

Modified: trunk/patches/src680/sc-extra-cell-margins.diff
==============================================================================
--- trunk/patches/src680/sc-extra-cell-margins.diff	(original)
+++ trunk/patches/src680/sc-extra-cell-margins.diff	Wed Mar  5 19:25:18 2008
@@ -11,8 +11,8 @@
      ppPoolDefaults[ ATTR_BORDER_BLTR     - ATTR_STARTINDEX ] = new SvxLineItem( ATTR_BORDER_BLTR );
 -    ppPoolDefaults[ ATTR_MARGIN          - ATTR_STARTINDEX ] = new SvxMarginItem( ATTR_MARGIN );
 +    SvxMarginItem* pItem = new SvxMarginItem( ATTR_MARGIN );
-+    pItem->SetTopMargin( 35 );
-+    pItem->SetBottomMargin( 35 );
++    pItem->SetTopMargin( 30 );
++    pItem->SetBottomMargin( 30 );
 +    ppPoolDefaults[ ATTR_MARGIN          - ATTR_STARTINDEX ] = pItem;
  	ppPoolDefaults[	ATTR_MERGE			 - ATTR_STARTINDEX ] = new ScMergeAttr;
  	ppPoolDefaults[	ATTR_MERGE_FLAG		 - ATTR_STARTINDEX ] = new ScMergeFlagAttr;

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	Wed Mar  5 19:25:18 2008
@@ -1,18 +1,3 @@
-Index: sc/inc/global.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/global.hxx,v
-retrieving revision 1.51
-diff -u -p -r1.51 global.hxx
---- sc/inc/global.hxx	26 Nov 2007 14:40:56 -0000	1.51
-+++ sc/inc/global.hxx	21 Feb 2008 02:17:32 -0000
-@@ -236,6 +236,7 @@ const BYTE   CR_MANUALSIZE  = 32;
- #define CR_SAVEMASK		( ~CR_PAGEBREAK )
- 
- 									// Insert-/Delete-Flags
-+#define IDF_SPECIAL_NOMARKAREA  0x2000
- #define IDF_VALUE			0x0001
- #define IDF_DATETIME		0x0002
- #define IDF_STRING			0x0004
 Index: sc/source/ui/inc/cellsh.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/inc/cellsh.hxx,v
@@ -32,7 +17,7 @@
  	void		ExecuteMove( SfxRequest& rReq );
  	void		GetStateCursor( SfxItemSet& rSet );
  
-+	static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, USHORT nExtraFlags, BOOL bShowDialog );
++	static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog );
  };
  
  #endif
@@ -124,7 +109,7 @@
 -                    WaitObject aWait( GetViewData()->GetDialogParent() );
 -                    pTabViewShell->PasteFromSystem();
 -                }
-+				PasteFromClipboard ( GetViewData(), pTabViewShell, 0, TRUE );
++				PasteFromClipboard ( GetViewData(), pTabViewShell, TRUE );
  				rReq.Done();
  			}
 -			pTabViewShell->CellContentChanged();		// => PasteFromSystem() ???
@@ -135,7 +120,7 @@
      return 0;
  }
  
-+void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, USHORT nExtraFlags, BOOL bShowDialog )
++void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog )
 +{
 +    Window* pWin = pViewData->GetActiveWin();
 +    ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
@@ -170,7 +155,7 @@
 +        if (!pOwnClip)
 +            pTabViewShell->PasteFromSystem();
 +        else {
-+            pTabViewShell->PasteFromClip( IDF_ALL | nExtraFlags, pOwnClip->GetDocument(),
++            pTabViewShell->PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
 +                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
 +                    bShowDialog );		// allow warning dialog
 +        }
@@ -201,25 +186,6 @@
  	aLogicMode	= pRef->aLogicMode;
  
  	SetGridMode		( pRef->IsGridMode() );
-Index: sc/source/ui/view/viewfun3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/viewfun3.cxx,v
-retrieving revision 1.37
-diff -u -p -r1.37 viewfun3.cxx
---- sc/source/ui/view/viewfun3.cxx	23 Oct 2007 14:46:56 -0000	1.37
-+++ sc/source/ui/view/viewfun3.cxx	21 Feb 2008 02:32:15 -0000
-@@ -1038,7 +1053,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT n
- 		DoneBlockMode();
- 		InitOwnBlockMode();
- 	}
--	rMark.SetMarkArea( aUserRange );
-+
-+	if (!(nFlags & IDF_SPECIAL_NOMARKAREA)) {
-+		rMark.SetMarkArea( aUserRange );
-+	}
- 
- 	HideCursor();							// Cursor aendert sich !
- 
 Index: sc/source/ui/view/gridwin.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
@@ -235,7 +201,24 @@
  
  // #114409#
  #ifndef _SV_SALBTYPE_HXX
-@@ -2944,9 +2989,9 @@ void ScGridWindow::SelectForContextMenu(
+@@ -2941,12 +2986,26 @@ void ScGridWindow::SelectForContextMenu(
+     }
+ }
+ 
++static void ClearSingleSelection( ScViewData* pViewData )
++{
++	SCCOL nX;
++	SCROW nY;
++	ScDocument* pClipDoc = ScTransferObj::GetOwnClipboard( 
++			pViewData->GetActiveWin() )->GetDocument();
++	pClipDoc->GetClipArea( nX, nY, TRUE );
++	if (nX == 0 && nY == 0)
++	{
++		ScTabView* pView = pViewData->GetView();
++		pView->Unmark();
++	}
++}
++
  void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
  {
      // #96965# Cursor control for ref input dialog
@@ -246,7 +229,7 @@
          if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
          {
              SC_MOD()->EndReference();
-@@ -2961,9 +3006,37 @@ void __EXPORT ScGridWindow::KeyInput(con
+@@ -2961,9 +3020,40 @@ void __EXPORT ScGridWindow::KeyInput(con
              return;
          }
      }
@@ -254,13 +237,8 @@
 +	{
 +		ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
 +
-+		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 );
++		ScCellShell::PasteFromClipboard( pViewData, pTabViewShell, FALSE );
++		ClearSingleSelection( pViewData );
 +
 +		uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard = 
 +			TransferableHelper::GetSystemClipboard();
@@ -281,6 +259,14 @@
 +		if (!rKeyCode.GetModifier() && 
 +				(nGroup == KEYGROUP_NUM || nGroup == KEYGROUP_ALPHA))
 +			pViewData->SetPasteMode( FALSE );
++		else if( rKeyCode.GetCode() == KEY_TAB )
++		{
++			ScMarkData& rMark = pViewData->GetMarkData();
++			if( rMark.IsMarked() || rMark.IsMultiMarked() )
++			{
++				ClearSingleSelection( pViewData );
++			}
++		}
  		//	query for existing note marker before calling ViewShell's keyboard handling
  		//	which may remove the marker
  		BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );