GNOME.org
 

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

Author: kyoshida
Date: Tue Jan 27 20:47:00 2009
New Revision: 15176
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15176&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-overwrite-char-font-attrs-m39.diff:
	* patches/dev300/sc-overwrite-char-font-attrs.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/sc-overwrite-char-font-attrs-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-overwrite-char-font-attrs.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 20:47:00 2009
@@ -991,7 +991,11 @@
 # overwrite character level font attributes when changing them at cell level.
 sc-overwrite-char-font-attrs-m37.diff, n#374580, i#53545, i#96853, kohei
 
-[ CalcFixes >= dev300-m38 ]
+[ CalcFixes >= dev300-m38 <= dev300-m39 ]
+# overwrite character level font attributes when changing them at cell level.
+sc-overwrite-char-font-attrs-m39.diff, n#374580, i#53545, i#96853, kohei
+
+[ CalcFixes > dev300-m39 ]
 # overwrite character level font attributes when changing them at cell level.
 sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
 

Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	(original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff	Tue Jan 27 20:47:00 2009
@@ -35,7 +35,7 @@
  								const SvxBorderLine* pLine, BOOL bColorOnly );
  
 diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index b2917c7..1b4e162 100644
+index 95d8e1b..eaf6f7b 100644
 --- sc/inc/cell.hxx
 +++ sc/inc/cell.hxx
 @@ -34,6 +34,9 @@
@@ -48,8 +48,8 @@
  #include <tools/mempool.hxx>
  #include <svtools/listener.hxx>
  #include "global.hxx"
-@@ -58,6 +61,7 @@ class ScCodeArray;
- class ScTokenArray;
+@@ -58,6 +61,7 @@ class SvtBroadcaster;
+ class ScCodeArray;
  class ScProgress;
  class ScPostIt;
 +class ScPatternAttr;
@@ -115,7 +115,7 @@
      MM_NONE      = 0,                   // No matrix formula
      MM_FORMULA   = 1,                   // Upper left matrix formula cell
 diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 4cc04d5..d968c30 100644
+index 48b44af..e6ea2d4 100644
 --- sc/inc/column.hxx
 +++ sc/inc/column.hxx
 @@ -56,6 +56,7 @@ class ScAttrIterator;
@@ -146,10 +146,10 @@
  
  	void		ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
 diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 872bcf7..44f2e07 100644
+index dea8da9..840762f 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -368,6 +368,7 @@ private:
+@@ -369,6 +369,7 @@ private:
  	// kein Broadcast, keine Listener aufbauen waehrend aus einem anderen
  	// Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad
  	BOOL				bInsertingFromOtherDoc;
@@ -157,17 +157,17 @@
  	BOOL				bImportingXML;		// special handling of formula text
      BOOL                bXMLFromWrapper;    // distinguish ScXMLImportWrapper from external component
  	BOOL				bCalcingAfterLoad;				// in CalcAfterLoad TRUE
-@@ -1107,7 +1108,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() const;
+@@ -1105,7 +1106,8 @@ public:
  									const ScPatternAttr& rAttr );
- 	void			ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
+ 	SC_DLLPUBLIC void			ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  										SCCOL nEndCol, SCROW nEndRow,
 -										const ScMarkData& rMark, const ScPatternAttr& rAttr );
-+										const ScMarkData& rMark, const ScPatternAttr& rAttr,
-+                                      ScEditDataArray* pDataArray = NULL );
- 	void			ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
++                                        const ScMarkData& rMark, const ScPatternAttr& rAttr,
++                                        ScEditDataArray* pDataArray = NULL );
+ 	SC_DLLPUBLIC void			ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
  											SCCOL nEndCol, SCROW nEndRow, SCTAB nTab,
  											const ScPatternAttr& rAttr );
-@@ -1169,7 +1171,8 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() const;
+@@ -1167,7 +1169,8 @@ public:
  							SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
  							const String& sValStr, double& nX);
  
@@ -177,7 +177,7 @@
  	void			DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
  	void			DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark );
  
-@@ -1426,6 +1429,8 @@ SC_DLLPUBLIC	SvNumberFormatter*	GetFormatTable() const;
+@@ -1422,6 +1425,8 @@ public:
  	BOOL			GetNoSetDirty() const { return bNoSetDirty; }
  	void			SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; }
  	BOOL			IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
@@ -187,7 +187,7 @@
  	BOOL			IsImportingXML() const { return bImportingXML; }
  	void			SetXMLFromWrapper( BOOL bVal );
 diff --git sc/inc/table.hxx sc/inc/table.hxx
-index 5d8539f..a74c8ef 100644
+index 216a876..21fca34 100644
 --- sc/inc/table.hxx
 +++ sc/inc/table.hxx
 @@ -57,6 +57,7 @@ class ScAutoFormatData;
@@ -304,7 +304,7 @@
  				}
  				else
 diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index 55c5431..a7ae2a8 100644
+index 8bf0018..b744d84 100644
 --- sc/source/core/data/cell2.cxx
 +++ sc/source/core/data/cell2.cxx
 @@ -50,6 +50,8 @@
@@ -314,9 +314,9 @@
 +#include "scitems.hxx" 
 +#include "patattr.hxx" 
  
- // STATIC DATA -----------------------------------------------------------
+ using namespace formula;
  
-@@ -141,6 +143,28 @@ void ScEditCell::GetString( String& rString ) const
+@@ -143,6 +145,28 @@ void ScEditCell::GetString( String& rString ) const
          rString.Erase();
  }
  
@@ -345,7 +345,7 @@
  void ScEditCell::SetTextObject( const EditTextObject* pObject,
              const SfxItemPool* pFromPool )
  {
-@@ -176,6 +200,76 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject,
+@@ -178,6 +202,76 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject,
          pData = NULL;
  }
  
@@ -423,7 +423,7 @@
  
  BOOL ScFormulaCell::IsEmpty()
 diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
-index df502e6..f4555dc 100644
+index bc0fc1d..31a43d4 100644
 --- sc/source/core/data/column.cxx
 +++ sc/source/core/data/column.cxx
 @@ -385,7 +385,7 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
@@ -460,7 +460,7 @@
  
  
 diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index 9db90f4..e4e9354 100644
+index 9e7e602..04cbc7e 100644
 --- sc/source/core/data/documen2.cxx
 +++ sc/source/core/data/documen2.cxx
 @@ -188,6 +188,7 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
@@ -493,10 +493,10 @@
  {
  	bImportingXML = bVal;
 diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 9de1ce5..cfd819d 100644
+index bf0afb3..bac8627 100644
 --- sc/source/core/data/document.cxx
 +++ sc/source/core/data/document.cxx
-@@ -3105,12 +3105,13 @@ void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatte
+@@ -3111,12 +3111,13 @@ void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatte
  void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
  						SCCOL nEndCol, SCROW nEndRow,
  						const ScMarkData& rMark,
@@ -512,7 +512,7 @@
  }
  
  
-@@ -4042,7 +4043,7 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
+@@ -4048,7 +4049,7 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
  }
  
  
@@ -521,7 +521,7 @@
  {
  	const SfxItemSet* pSet = &rAttr.GetItemSet();
  	BOOL bSet = FALSE;
-@@ -4059,7 +4060,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
+@@ -4065,7 +4066,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
  			ScRange aRange;
  			rMark.GetMarkArea( aRange );
  			ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(),
@@ -530,7 +530,7 @@
  		}
  		else
  		{
-@@ -4067,7 +4068,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
+@@ -4073,7 +4074,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
              for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
                  if (pTab[nTab])
                      if (rMark.GetTableSelect(nTab))
@@ -540,7 +540,7 @@
  	}
  }
 diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index d60d337..1aad7a0 100644
+index d448214..33fcc3a 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
 @@ -1654,14 +1654,14 @@ void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr )
@@ -575,10 +575,10 @@
  
  
 diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 257f21b..d8c30de 100644
+index 12ab184..d01cca3 100644
 --- sc/source/ui/docshell/docsh.cxx
 +++ sc/source/ui/docshell/docsh.cxx
-@@ -430,10 +430,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
+@@ -431,10 +431,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
      return bRet;
  }
  
@@ -611,7 +611,7 @@
  	ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
  
  	//	only the latin script language is loaded
-@@ -772,7 +793,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
+@@ -773,7 +794,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
  BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
  {
  	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" );
@@ -620,7 +620,7 @@
  	ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
  
  	WaitObject aWait( GetActiveDialogParent() );
-@@ -799,6 +820,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
+@@ -800,6 +821,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
  BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
  {
  	RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
@@ -629,7 +629,7 @@
  	BOOL bRet = FALSE;				// FALSE heisst Benutzerabbruch !!
  									// bei Fehler: Fehler am Stream setzen!!
 diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx
-index b48a051..d65bfa2 100644
+index 44c3a61..25634dd 100644
 --- sc/source/ui/inc/undoblk.hxx
 +++ sc/source/ui/inc/undoblk.hxx
 @@ -35,6 +35,10 @@
@@ -829,10 +829,10 @@
  }
  
 diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx
-index ef0e0a0..94aa94d 100644
+index 92de1bf..bb01659 100644
 --- sc/source/ui/view/viewfunc.cxx
 +++ sc/source/ui/view/viewfunc.cxx
-@@ -1297,6 +1297,8 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1298,6 +1298,8 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
  		SCROW nEndRow = aMarkRange.aEnd.Row();
  		SCTAB nEndTab = aMarkRange.aEnd.Tab();
  
@@ -841,7 +841,7 @@
  		if (bRecord)
  		{
  			ScRange aCopyRange = aMarkRange;
-@@ -1313,15 +1315,14 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1314,15 +1316,14 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
  
  			aFuncMark.MarkToMulti();
  
@@ -863,7 +863,7 @@
  
  		pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
  						   nEndCol,   nEndRow,   nEndTab,
-@@ -1335,6 +1336,19 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1336,6 +1337,19 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
  		SCCOL nCol = pViewData->GetCurX();
  		SCROW nRow = pViewData->GetCurY();
  		SCTAB nTab = pViewData->GetTabNo();
@@ -883,7 +883,7 @@
  		ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab ));
  
  		pDoc->ApplyPattern( nCol, nRow, nTab, rAttr );
-@@ -1343,11 +1357,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
+@@ -1344,11 +1358,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
  
  		if (bRecord)
  		{
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]