GNOME.org
 

ooo-build r12418 - in trunk: . patches/dev300

Author: jonp
Date: Thu May  1 21:33:17 2008
New Revision: 12418
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12418&view=rev

Log:
    * patches/dev300/sc-paste-on-enter.diff,
      patches/dev300/sc-copy-source-border.diff: Don't show a border around
      the source cells on Cut (Ctrl+X).


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-copy-source-border.diff
   trunk/patches/dev300/sc-paste-on-enter.diff

Modified: trunk/patches/dev300/sc-copy-source-border.diff
==============================================================================
--- trunk/patches/dev300/sc-copy-source-border.diff	(original)
+++ trunk/patches/dev300/sc-copy-source-border.diff	Thu May  1 21:33:17 2008
@@ -68,7 +68,7 @@
 +
 +void ScGridWindow::UpdateCopySourceOverlay( const MapMode& rDrawMode )
 +{
-+    if (!pViewData->IsPasteMode())
++    if (!pViewData->ShowPasteSource())
 +        return;
 +    ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
 +    if (!pOverlayManager)

Modified: trunk/patches/dev300/sc-paste-on-enter.diff
==============================================================================
--- trunk/patches/dev300/sc-paste-on-enter.diff	(original)
+++ trunk/patches/dev300/sc-paste-on-enter.diff	Thu May  1 21:33:17 2008
@@ -1,11 +1,11 @@
 Index: sc/source/ui/inc/cellsh.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/inc/cellsh.hxx,v
-retrieving revision 1.8
-diff -u -p -r1.8 cellsh.hxx
---- sc/source/ui/inc/cellsh.hxx	27 Feb 2007 13:20:11 -0000	1.8
-+++ sc/source/ui/inc/cellsh.hxx	21 Feb 2008 01:29:22 -0000
-@@ -60,6 +60,7 @@ class SvxClipboardFmtItem;
+retrieving revision 1.9
+diff -u -p -r1.9 cellsh.hxx
+--- sc/source/ui/inc/cellsh.hxx	10 Apr 2008 22:43:12 -0000	1.9
++++ sc/source/ui/inc/cellsh.hxx	1 May 2008 20:04:42 -0000
+@@ -42,6 +42,7 @@ class SvxClipboardFmtItem;
  class TransferableDataHelper;
  class TransferableClipboardListener;
  class AbstractScLinkedAreaDlg;
@@ -13,7 +13,7 @@
  
  struct CellShell_Impl
  {
-@@ -120,6 +121,7 @@ public:
+@@ -102,6 +103,7 @@ public:
  	void		ExecuteMove( SfxRequest& rReq );
  	void		GetStateCursor( SfxItemSet& rSet );
  
@@ -24,55 +24,71 @@
 Index: sc/source/ui/inc/viewdata.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/inc/viewdata.hxx,v
-retrieving revision 1.21
-diff -u -p -r1.21 viewdata.hxx
---- sc/source/ui/inc/viewdata.hxx	21 Nov 2007 19:10:07 -0000	1.21
-+++ sc/source/ui/inc/viewdata.hxx	21 Feb 2008 01:29:22 -0000
-@@ -208,6 +212,7 @@ private:
- 	BOOL				bDelMarkValid;				// nur gueltig bei SC_REFTYPE_FILL
- 	BYTE				nFillMode;					// Modus
- 	BOOL				bPagebreak;					// Seitenumbruch-Vorschaumodus
-+	BOOL				bPasteMode;
+retrieving revision 1.24
+diff -u -p -r1.24 viewdata.hxx
+--- sc/source/ui/inc/viewdata.hxx	18 Apr 2008 11:36:48 -0000	1.24
++++ sc/source/ui/inc/viewdata.hxx	1 May 2008 20:04:42 -0000
+@@ -89,6 +89,13 @@ enum ScMarkType
+ #endif
+ };
  
- 	BOOL				bSelCtrlMouseClick;         // special selection handling for ctrl-mouse-click
++enum ScPasteFlags
++{
++    SC_PASTE_NONE   = 0,    // No flags specified
++    SC_PASTE_MODE   = 1,    // Enable paste-mode
++    SC_PASTE_BORDER = 2,    // Show a border around the source cells
++};
++
+ class ScDocShell;
+ class ScDocument;
+ class ScDBFunc;
+@@ -210,6 +219,8 @@ private:
+ 	SCCOL				nTabStartCol;				// fuer Enter nach Tab
+ 	ScRange				aDelRange;					// fuer AutoFill-Loeschen
  
-@@ -286,6 +291,7 @@ public:
++	ScPasteFlags        nPasteFlags;
++
+     ScSplitPos          eEditActivePart;            // the part that was active when edit mode was started
+ 	BOOL				bEditActive[4];				// aktiv?
+ 	BOOL				bActive;					// aktives Fenster ?
+@@ -295,6 +306,8 @@ public:
  	SCCOL			GetFixPosX() const						{ return pThisTab->nFixPosX; }
  	SCROW			GetFixPosY() const						{ return pThisTab->nFixPosY; }
  	BOOL			IsPagebreakMode() const					{ return bPagebreak; }
-+	BOOL			IsPasteMode() const                     { return bPasteMode; }
++	BOOL			IsPasteMode() const                     { return nPasteFlags & SC_PASTE_MODE; }
++	BOOL			ShowPasteSource() const                 { return nPasteFlags & SC_PASTE_BORDER; }
  
  	void			SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
  	void			SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
-@@ -300,6 +306,7 @@ public:
+@@ -309,6 +322,7 @@ public:
  	void			SetFixPosX( SCCOL nPos )						{ pThisTab->nFixPosX = nPos; }
  	void			SetFixPosY( SCROW nPos )						{ pThisTab->nFixPosY = nPos; }
  	void			SetPagebreakMode( BOOL bSet );
-+	void			SetPasteMode ( BOOL bSet )          { bPasteMode = bSet; }
++	void			SetPasteMode ( ScPasteFlags nFlags )            { nPasteFlags = nFlags; }
  
      void            SetZoomType( SvxZoomType eNew, BOOL bAll );
      void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
 Index: sc/source/ui/view/cellsh1.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/cellsh1.cxx,v
-retrieving revision 1.48
-diff -u -p -r1.48 cellsh1.cxx
---- sc/source/ui/view/cellsh1.cxx	26 Nov 2007 15:20:42 -0000	1.48
-+++ sc/source/ui/view/cellsh1.cxx	21 Feb 2008 01:29:30 -0000
-@@ -1176,6 +1184,8 @@ void ScCellShell::ExecuteEdit( SfxReques
+retrieving revision 1.51
+diff -u -p -r1.51 cellsh1.cxx
+--- sc/source/ui/view/cellsh1.cxx	18 Apr 2008 11:40:55 -0000	1.51
++++ sc/source/ui/view/cellsh1.cxx	1 May 2008 20:04:42 -0000
+@@ -1168,6 +1178,8 @@ void ScCellShell::ExecuteEdit( SfxReques
  				WaitObject aWait( GetViewData()->GetDialogParent() );
  				pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
  				rReq.Done();
-+				GetViewData()->SetPasteMode( TRUE );
++				GetViewData()->SetPasteMode( (ScPasteFlags) (SC_PASTE_MODE | SC_PASTE_BORDER) );
 +				pTabViewShell->ShowCursor();
  			}
  			break;
  
-@@ -1184,46 +1193,15 @@ void ScCellShell::ExecuteEdit( SfxReques
+@@ -1176,46 +1188,15 @@ void ScCellShell::ExecuteEdit( SfxReques
  				WaitObject aWait( GetViewData()->GetDialogParent() );
  				pTabViewShell->CutToClip( NULL, TRUE );
  				rReq.Done();
-+				GetViewData()->SetPasteMode( TRUE );
++				GetViewData()->SetPasteMode( SC_PASTE_MODE );
  			}
  			break;
  
@@ -117,7 +133,7 @@
  			break;
  
  		case SID_CLIPBOARD_FORMAT_ITEMS:
-@@ -2270,3 +2248,46 @@ IMPL_LINK( ScCellShell, DialogClosed, Ab
+@@ -2264,3 +2245,46 @@ IMPL_LINK( ScCellShell, DialogClosed, Ab
      return 0;
  }
  
@@ -167,42 +183,42 @@
 Index: sc/source/ui/view/viewdata.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/viewdata.cxx,v
-retrieving revision 1.61
-diff -u -p -r1.61 viewdata.cxx
---- sc/source/ui/view/viewdata.cxx	12 Dec 2007 13:22:01 -0000	1.61
-+++ sc/source/ui/view/viewdata.cxx	21 Feb 2008 01:29:34 -0000
-@@ -344,6 +327,7 @@ ScViewData::ScViewData( ScDocShell* pDoc
+retrieving revision 1.65
+diff -u -p -r1.65 viewdata.cxx
+--- sc/source/ui/view/viewdata.cxx	18 Apr 2008 12:01:29 -0000	1.65
++++ sc/source/ui/view/viewdata.cxx	1 May 2008 20:04:43 -0000
+@@ -313,6 +321,7 @@ ScViewData::ScViewData( ScDocShell* pDoc
  		bDelMarkValid( FALSE ),
  		nFillMode	( SC_FILL_NONE ),
  		bPagebreak	( FALSE ),
-+		bPasteMode ( FALSE ),
++		nPasteFlags ( SC_PASTE_NONE ),
  		bSelCtrlMouseClick( FALSE )
  {
  
-@@ -472,6 +456,7 @@ void ScViewData::InitFrom( const ScViewD
+@@ -441,6 +450,7 @@ void ScViewData::InitFrom( const ScViewD
      aDefPageZoomX = pRef->aDefPageZoomX;
      aDefPageZoomY = pRef->aDefPageZoomY;
  	bPagebreak	= pRef->bPagebreak;
-+	bPasteMode  = pRef->bPasteMode;
++	nPasteFlags = pRef->nPasteFlags;
  	aLogicMode	= pRef->aLogicMode;
  
  	SetGridMode		( pRef->IsGridMode() );
 Index: sc/source/ui/view/gridwin.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
-retrieving revision 1.88
-diff -u -p -r1.88 gridwin.cxx
---- sc/source/ui/view/gridwin.cxx	12 Dec 2007 13:21:19 -0000	1.88
-+++ sc/source/ui/view/gridwin.cxx	21 Feb 2008 12:49:09 -0000
-@@ -142,6 +146,7 @@
+retrieving revision 1.94
+diff -u -p -r1.94 gridwin.cxx
+--- sc/source/ui/view/gridwin.cxx	18 Apr 2008 11:47:50 -0000	1.94
++++ sc/source/ui/view/gridwin.cxx	1 May 2008 20:04:44 -0000
+@@ -135,6 +139,7 @@
  #include "userdat.hxx"
  #include "drwlayer.hxx"
  #include "attrib.hxx"
 +#include "cellsh.hxx"
  
  // #114409#
- #ifndef _SV_SALBTYPE_HXX
-@@ -2941,12 +2986,30 @@ void ScGridWindow::SelectForContextMenu(
+ #include <vcl/salbtype.hxx>		// FRound
+@@ -2924,12 +2971,30 @@ void ScGridWindow::SelectForContextMenu(
      }
  }
  
@@ -234,7 +250,7 @@
          if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
          {
              SC_MOD()->EndReference();
-@@ -2963,9 +3028,43 @@ void __EXPORT ScGridWindow::KeyInput(con
+@@ -2944,9 +3009,43 @@ void __EXPORT ScGridWindow::KeyInput(con
              return;
          }
      }
@@ -255,7 +271,7 @@
 +		}
 +
 +		// hide the border around the copy source
-+		pViewData->SetPasteMode( FALSE );
++		pViewData->SetPasteMode( SC_PASTE_NONE );
 +		UpdateCursorOverlay();
 +		return;
 +	}
@@ -264,7 +280,7 @@
  	{
 +		if (rKeyCode.GetCode() == KEY_ESCAPE)
 +		{
-+			pViewData->SetPasteMode( FALSE );
++			pViewData->SetPasteMode( SC_PASTE_NONE );
 +			UpdateCursorOverlay();
 +		}
 +		if (rKeyCode.GetCode() == KEY_TAB)
@@ -281,30 +297,30 @@
 Index: sc/source/ui/app/inputhdl.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/app/inputhdl.cxx,v
-retrieving revision 1.74.90.1
-diff -u -p -r1.74.90.1 inputhdl.cxx
---- sc/source/ui/app/inputhdl.cxx	18 Jan 2008 11:52:55 -0000	1.74.90.1
-+++ sc/source/ui/app/inputhdl.cxx	21 Mar 2008 02:40:54 -0000
-@@ -1703,6 +1703,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, vo
+retrieving revision 1.77
+diff -u -p -r1.77 inputhdl.cxx
+--- sc/source/ui/app/inputhdl.cxx	10 Apr 2008 21:45:27 -0000	1.77
++++ sc/source/ui/app/inputhdl.cxx	1 May 2008 20:04:44 -0000
+@@ -1699,6 +1699,7 @@ IMPL_LINK( ScInputHandler, ModifyHdl, vo
  
  BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand )		// return TRUE = new view created
  {
-+	pActiveViewSh->GetViewData()->SetPasteMode( FALSE );
++	pActiveViewSh->GetViewData()->SetPasteMode( SC_PASTE_NONE );
  	bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
  
  	if ( eMode == SC_INPUT_NONE )
 Index: sc/source/ui/view/viewfunc.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
-retrieving revision 1.38
-diff -u -p -r1.38 viewfunc.cxx
---- sc/source/ui/view/viewfunc.cxx	2 Oct 2007 15:22:22 -0000	1.38
-+++ sc/source/ui/view/viewfunc.cxx	21 Mar 2008 02:43:14 -0000
-@@ -1787,6 +1788,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows
+retrieving revision 1.44
+diff -u -p -r1.44 viewfunc.cxx
+--- sc/source/ui/view/viewfunc.cxx	18 Apr 2008 11:50:48 -0000	1.44
++++ sc/source/ui/view/viewfunc.cxx	1 May 2008 20:04:44 -0000
+@@ -1785,6 +1799,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows
  
  void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
  {
-+	GetViewData()->SetPasteMode( FALSE );
++	GetViewData()->SetPasteMode( SC_PASTE_NONE );
  	// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
  	BOOL bOnlyNotBecauseOfMatrix;
  	BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]