ooo-build r12830 - in branches/ooo-build-2-4-1: . patches/src680

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12830 - in branches/ooo-build-2-4-1: . patches/src680
Date: Sat, 7 Jun 2008 01:57:27 +0000 (UTC)
Author: kyoshida
Date: Sat Jun  7 01:57:27 2008
New Revision: 12830
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12830&view=rev

Log:
2008-06-06  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-toggle-merge-center.diff: fixed it; it was not 
	centering the content (n#398243, lp#236378).


Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/sc-toggle-merge-center.diff

Modified: branches/ooo-build-2-4-1/patches/src680/sc-toggle-merge-center.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/sc-toggle-merge-center.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/sc-toggle-merge-center.diff	Sat Jun  7 01:57:27 2008
@@ -1,6 +1,8 @@
---- sc/source/ui/docshell/docfunc.cxx	2006-06-22 12:26:48.000000000 +0000
-+++ sc/source/ui/docshell/docfunc.cxx	2006-07-03 13:11:54.000000000 +0000
-@@ -3424,7 +3424,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRang
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index 5a8f68c..34720ec 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -3436,7 +3436,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
  
  //------------------------------------------------------------------------
  
@@ -9,7 +11,7 @@
  {
  	ScDocShellModificator aModificator( rDocShell );
  
-@@ -3468,7 +3468,7 @@ BOOL ScDocFunc::MergeCells( const ScRang
+@@ -3480,7 +3480,7 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
  	if (bRecord)
  	{
  		ScDocument* pUndoDoc = NULL;
@@ -18,7 +20,7 @@
  		{
  			pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
  			pUndoDoc->InitUndo( pDoc, nTab, nTab );
-@@ -3478,17 +3478,23 @@ BOOL ScDocFunc::MergeCells( const ScRang
+@@ -3490,17 +3490,23 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
  		rDocShell.GetUndoManager()->AddUndoAction(
  			new ScUndoMerge( &rDocShell,
  							nStartCol, nStartRow, nTab,
@@ -32,8 +34,8 @@
 +	
 +	if (bCenter)
 +	{
-+		pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER ) );
-+		pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER ) );
++		pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
++		pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
 +	}
  
  	if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) )
@@ -44,9 +46,11 @@
  		pDoc->SetDirty( rRange );
  	aModificator.SetDocumentModified();
  
---- sc/source/ui/inc/docfunc.hxx	2006-06-22 12:26:48.000000000 +0000
-+++ sc/source/ui/inc/docfunc.hxx	2006-06-30 13:10:21.000000000 +0000
-@@ -165,7 +165,7 @@ public:
+diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
+index b2b7a57..be2a7e5 100644
+--- sc/source/ui/inc/docfunc.hxx
++++ sc/source/ui/inc/docfunc.hxx
+@@ -169,7 +169,7 @@ public:
  	BOOL			ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
  
  	BOOL			MergeCells( const ScRange& rRange, BOOL bContents,
@@ -55,9 +59,11 @@
  	BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
  
  	BOOL			SetNote( const ScAddress& rPos, const ScPostIt& rNote, BOOL bApi );
---- sc/source/ui/inc/undoblk.hxx	2006-06-22 12:26:48.000000000 +0000
-+++ sc/source/ui/inc/undoblk.hxx	2006-06-30 12:54:17.000000000 +0000
-@@ -457,7 +457,8 @@ public:
+diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
+index 42b4097..06c1feb 100644
+--- sc/source/ui/inc/undoblk.hxx
++++ sc/source/ui/inc/undoblk.hxx
+@@ -464,7 +464,8 @@ public:
  					ScUndoMerge( ScDocShell* pNewDocShell,
  								 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
  								 SCCOL nEndX,   SCROW nEndY,   SCTAB nEndZ,
@@ -67,7 +73,7 @@
  	virtual 		~ScUndoMerge();
  
  	virtual void	Undo();
-@@ -471,6 +472,7 @@ private:
+@@ -478,6 +479,7 @@ private:
  	ScRange			aRange;
  	BOOL			bDoMerge;				// Merge oder aufheben
  	ScDocument*		pUndoDoc;				// wenn Daten zusammengefasst
@@ -75,9 +81,11 @@
  
  	void			DoChange( const BOOL bUndo ) const;
  };
---- sc/source/ui/inc/viewfunc.hxx	2006-04-07 16:27:09.000000000 +0000
-+++ sc/source/ui/inc/viewfunc.hxx	2006-06-30 13:12:46.000000000 +0000
-@@ -240,7 +240,7 @@ public:
+diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
+index 43288de..71ed0d0 100644
+--- sc/source/ui/inc/viewfunc.hxx
++++ sc/source/ui/inc/viewfunc.hxx
+@@ -249,7 +249,7 @@ public:
  	BOOL			TestMergeCells();
  	BOOL			TestRemoveMerge();
  
@@ -86,9 +94,11 @@
  	BOOL			RemoveMerge( BOOL bRecord = TRUE );
  
  	void			FillSimple( FillDir eDir, BOOL bRecord = TRUE );
---- sc/source/ui/undo/undoblk3.cxx	2006-05-02 15:51:13.000000000 +0000
-+++ sc/source/ui/undo/undoblk3.cxx	2006-06-30 13:02:05.000000000 +0000
-@@ -43,6 +43,7 @@
+diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx
+index d0a5c5e..8e35362 100644
+--- sc/source/ui/undo/undoblk3.cxx
++++ sc/source/ui/undo/undoblk3.cxx
+@@ -39,6 +39,7 @@
  // INCLUDE -------------------------------------------------------------------
  
  #include "scitems.hxx"
@@ -96,7 +106,7 @@
  #include <svx/boxitem.hxx>
  #include <svx/srchitem.hxx>
  #include <svx/linkmgr.hxx>
-@@ -775,13 +776,15 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(
+@@ -812,13 +813,15 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
  ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
  							SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
  							SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -114,7 +124,7 @@
  {
  }
  
-@@ -828,9 +831,20 @@ void ScUndoMerge::DoChange( const BOOL b
+@@ -865,9 +868,20 @@ void ScUndoMerge::DoChange( const BOOL bUndo ) const
  			pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
  		}
  		else
@@ -126,18 +136,20 @@
 +			{
 +				pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
 +								 aRange.aStart.Tab(),
-+								 SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER ) );
++								 SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
 +				pDoc->ApplyAttr( aRange.aStart.Col(), aRange.aStart.Row(),
 +								 aRange.aStart.Tab(),
-+								 SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER ) );
++								 SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) );
 +			}
 +		}
  
  	BOOL bDidPaint = FALSE;
  	ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
---- sc/source/ui/unoobj/cellsuno.cxx	2006-05-05 09:47:19.000000000 +0000
-+++ sc/source/ui/unoobj/cellsuno.cxx	2006-06-30 13:36:26.000000000 +0000
-@@ -5243,7 +5243,7 @@ void SAL_CALL ScCellRangeObj::merge( sal
+diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
+index 930cf19..e825ea9 100644
+--- sc/source/ui/unoobj/cellsuno.cxx
++++ sc/source/ui/unoobj/cellsuno.cxx
+@@ -5360,7 +5360,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
  	{
  		ScDocFunc aFunc(*pDocSh);
  		if ( bMerge )
@@ -146,9 +158,11 @@
  		else
  			aFunc.UnmergeCells( aRange, TRUE, TRUE );
  
---- sc/source/ui/view/cellsh3.cxx	2006-05-02 15:51:36.000000000 +0000
-+++ sc/source/ui/view/cellsh3.cxx	2006-07-03 13:13:06.000000000 +0000
-@@ -779,6 +779,7 @@ void ScCellShell::Execute( SfxRequest& r
+diff --git sc/source/ui/view/cellsh3.cxx sc/source/ui/view/cellsh3.cxx
+index d0431c6..7cc1eb4 100644
+--- sc/source/ui/view/cellsh3.cxx
++++ sc/source/ui/view/cellsh3.cxx
+@@ -758,6 +758,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
              {
                  // test whether to merge or to split
                  bool bMerge = false;
@@ -156,7 +170,7 @@
                  switch( nSlot )
                  {
                      case FID_MERGE_ON:
-@@ -789,6 +790,7 @@ void ScCellShell::Execute( SfxRequest& r
+@@ -768,6 +769,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                      break;
                      case FID_MERGE_TOGGLE:
                      {
@@ -164,7 +178,7 @@
                          SfxPoolItem* pItem = 0;
                          if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT )
                              bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue();
-@@ -809,7 +811,7 @@ void ScCellShell::Execute( SfxRequest& r
+@@ -788,7 +790,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                          bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
                      }
  
@@ -173,9 +187,11 @@
                      {
                          if (!bApi && bMoveContents)             // "ja" im Dialog geklickt
                              rReq.AppendItem( SfxBoolItem( nSlot, bMoveContents ) );
---- sc/source/ui/view/viewfun2.cxx	2006-05-02 15:53:53.000000000 +0000
-+++ sc/source/ui/view/viewfun2.cxx	2006-06-30 13:13:59.000000000 +0000
-@@ -762,7 +762,7 @@ BOOL ScViewFunc::TestMergeCells()			// V
+diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
+index 3e123c4..b1c289b 100644
+--- sc/source/ui/view/viewfun2.cxx
++++ sc/source/ui/view/viewfun2.cxx
+@@ -1086,7 +1086,7 @@ BOOL ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
  
  //----------------------------------------------------------------------------
  
@@ -184,7 +200,7 @@
  {
  	//	Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
  	//	damit dann nicht die Inhalte-QueryBox kommt
-@@ -830,7 +830,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, 
+@@ -1154,7 +1154,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
  	if (bOk)
  	{
  		HideCursor();
@@ -193,9 +209,11 @@
  		ShowCursor();
  
  		if (bOk)
---- sc/uiconfig/scalc/menubar/menubar.xml	2006-06-22 12:26:48.000000000 +0000
-+++ sc/uiconfig/scalc/menubar/menubar.xml	2006-07-03 13:11:34.000000000 +0000
-@@ -213,7 +213,13 @@
+diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+index 5bced00..db8ace6 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -217,7 +217,13 @@
                      <menu:menuitem menu:id=".uno:SheetRightToLeft"/>
                  </menu:menupopup>
              </menu:menu>
@@ -210,7 +228,6 @@
              <menu:menuseparator/>
              <menu:menuitem menu:id=".uno:PageFormatDialog"/>
              <menu:menu menu:id=".uno:PrintRangesMenu">
-dummy line to avoid confusing diff-mode
 --- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2006-07-03 14:43:29.000000000 +0200
 +++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2006-07-03 16:44:14.000000000 +0200
 @@ -1009,7 +1009,7 @@
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]