ooo-build r14397 - in branches/ooo-build-3-0: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Oct 22 19:49:40 2008
New Revision: 14397
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14397&view=rev

Log:
2008-10-22  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-no-apply-pattern-for-cursor.diff: removed.
	
	* patches/dev300/calc-multiline-pattern-fix.diff: added to replace the 
	above patch.
	
	* patches/dev300/apply: added & removed the patches.


Added:
   branches/ooo-build-3-0/patches/dev300/calc-multiline-pattern-fix.diff
Removed:
   branches/ooo-build-3-0/patches/dev300/sc-no-apply-pattern-for-cursor.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Oct 22 19:49:40 2008
@@ -687,7 +687,7 @@
 
 # For multi-line cell contents, bolding the first line shouldn't bold the
 # entire cell.
-sc-no-apply-pattern-for-cursor.diff, n#359690, jonp
+calc-multiline-pattern-fix.diff, n#359690, n#437137, kohei
 
 # Add extra padding so that the cell height is larger -- increases legibility.
 sc-extra-cell-margins.diff, n#361358, jonp

Added: branches/ooo-build-3-0/patches/dev300/calc-multiline-pattern-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/calc-multiline-pattern-fix.diff	Wed Oct 22 19:49:40 2008
@@ -0,0 +1,33 @@
+diff --git sc/source/ui/app/inputhdl.cxx sc/source/ui/app/inputhdl.cxx
+index 7a4e452..90bd8e3 100644
+--- sc/source/ui/app/inputhdl.cxx
++++ sc/source/ui/app/inputhdl.cxx
+@@ -2108,13 +2108,27 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
+ 		USHORT nParCnt = pEngine->GetParagraphCount();
+ 		if ( nParCnt == 0 )
+ 			nParCnt = 1;
++
++        bool bUniformAttribs = true;
++        SfxItemSet aPara1Attribs = pEngine->GetAttribs(0, 0, pEngine->GetTextLen(0));
++        for (USHORT nPara = 1; nPara < nParCnt; ++nPara)
++        {
++            SfxItemSet aPara2Attribs = pEngine->GetAttribs(nPara, 0, pEngine->GetTextLen(nPara));
++            if (!(aPara1Attribs == aPara2Attribs))
++            {    
++                // paragraph format different from that of the 1st paragraph.
++                bUniformAttribs = false;
++                break;
++            }
++        }
++
+ 		ESelection aSel( 0, 0, nParCnt-1, pEngine->GetTextLen(nParCnt-1) );
+ 		SfxItemSet aOldAttribs = pEngine->GetAttribs( aSel );
+ 		const SfxPoolItem* pItem = NULL;
+ 
+ 		//	find common (cell) attributes before RemoveAdjust
+ 
+-		if ( pActiveViewSh )
++		if ( pActiveViewSh && bUniformAttribs )
+ 		{
+ 			SfxItemSet* pCommonAttrs = NULL;
+ 			for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END; nId++)