GNOME.org
 

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

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

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

	* patches/dev300/sc-cellformat-icon-toggle-m39.diff:
	* patches/dev300/sc-cellformat-icon-toggle.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/sc-cellformat-icon-toggle-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/sc-cellformat-icon-toggle.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-cellformat-icon-toggle.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 20:28:47 2009
@@ -977,6 +977,12 @@
 # Have cell background paint over the gridlines.
 sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
 
+[ CalcFixes <= dev300-m39 ]
+# Make cell number format toolbar icons togglable & remove the standard format
+# button.
+sc-cellformat-icon-toggle-m39.diff, n#358548, i#86377, kohei
+
+[ CalcFixes > dev300-m39 ]
 # Make cell number format toolbar icons togglable & remove the standard format
 # button.
 sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei

Modified: trunk/patches/dev300/sc-cellformat-icon-toggle.diff
==============================================================================
--- trunk/patches/dev300/sc-cellformat-icon-toggle.diff	(original)
+++ trunk/patches/dev300/sc-cellformat-icon-toggle.diff	Tue Jan 27 20:28:47 2009
@@ -1,8 +1,8 @@
 diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 5a1a771..f274736 100644
+index 26e4a45..48b44af 100644
 --- sc/inc/column.hxx
 +++ sc/inc/column.hxx
-@@ -296,6 +296,7 @@ public:
+@@ -298,6 +298,7 @@ public:
      const ScPatternAttr*    GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
  
  	ULONG		GetNumberFormat( SCROW nRow ) const;
@@ -11,22 +11,22 @@
  	void		MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const;
  	void		MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const;
 diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 905244d..35fd858 100644
+index b4844a1..dea8da9 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -751,6 +751,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() const;
- 	double			RoundValueAsShown( double fVal, ULONG nFormat );
- 	void			GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
+@@ -736,6 +736,7 @@ public:
+ 	SC_DLLPUBLIC double			RoundValueAsShown( double fVal, ULONG nFormat );
+ 	SC_DLLPUBLIC void			GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
  									 sal_uInt32& rFormat );
 +    sal_uInt32      GetNumberFormat( const ScRange& rRange ) const;
- 	sal_uInt32		GetNumberFormat( const ScAddress& ) const;
+ 	SC_DLLPUBLIC sal_uInt32		GetNumberFormat( const ScAddress& ) const;
                      /** If no number format attribute is set and the cell
                          pointer passed is of type formula cell, the calculated
 diff --git sc/inc/table.hxx sc/inc/table.hxx
-index 932de72..924e3ef 100644
+index 2378728..216a876 100644
 --- sc/inc/table.hxx
 +++ sc/inc/table.hxx
-@@ -435,6 +435,7 @@ public:
+@@ -433,6 +433,7 @@ public:
  	ULONG					GetNumberFormat( const ScAddress& rPos ) const
  								{ return aCol[rPos.Col()].GetNumberFormat( rPos.Row() ); }
  	ULONG					GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
@@ -35,10 +35,10 @@
  												const ScMarkData& rMark, BOOL bDeep ) const;
  	void					MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
 diff --git sc/sdi/formatsh.sdi sc/sdi/formatsh.sdi
-index 9bac9d3..71f78f7 100644
+index a7bd57a..ed57de4 100644
 --- sc/sdi/formatsh.sdi
 +++ sc/sdi/formatsh.sdi
-@@ -119,11 +119,11 @@ interface FormatForSelection
+@@ -120,11 +120,11 @@ interface FormatForSelection
      SID_ATTR_NUMBERFORMAT_VALUE       [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;]
      SID_NUMBER_FORMAT       [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;]
  	SID_NUMBER_TWODEC		[ ExecMethod = ExecuteNumFormat;]
@@ -56,11 +56,11 @@
  	SID_NUMBER_INCDEC		[ ExecMethod = ExecuteNumFormat;]
  	SID_NUMBER_DECDEC		[ ExecMethod = ExecuteNumFormat;]
 diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
-index fbc613b..96c7377 100644
+index b714fec..bc0fc1d 100644
 --- sc/source/core/data/column.cxx
 +++ sc/source/core/data/column.cxx
-@@ -361,6 +361,22 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
- 	return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
+@@ -362,6 +362,22 @@ const ScPatternAttr* ScColumn::GetMostUsedPattern( SCROW nStartRow, SCROW nEndRo
+     return pMaxPattern;
  }
  
 +sal_uInt32 ScColumn::GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const
@@ -80,13 +80,13 @@
 +}
 +
  
- SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray )
+ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
  {
 diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 8d182c4..a94a264 100644
+index 5844fa0..bf0afb3 100644
 --- sc/source/core/data/document.cxx
 +++ sc/source/core/data/document.cxx
-@@ -2306,6 +2306,32 @@ void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
+@@ -2276,6 +2276,32 @@ void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
  	rFormat = 0;
  }
  
@@ -120,10 +120,10 @@
  sal_uInt32 ScDocument::GetNumberFormat( const ScAddress& rPos ) const
  {
 diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 26a6d8b..9bcc2b7 100644
+index 678b7a0..d448214 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
-@@ -1096,6 +1096,14 @@ ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
+@@ -1104,6 +1104,14 @@ ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
  		return 0;
  }
  
@@ -139,10 +139,10 @@
  const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const
  {
 diff --git sc/source/ui/inc/formatsh.hxx sc/source/ui/inc/formatsh.hxx
-index ac7d7ea..94feaba 100644
+index c67f110..5bbece4 100644
 --- sc/source/ui/inc/formatsh.hxx
 +++ sc/source/ui/inc/formatsh.hxx
-@@ -76,6 +76,9 @@ public:
+@@ -77,6 +77,9 @@ public:
  
      void        ExecFormatPaintbrush( SfxRequest& rReq );
      void        StateFormatPaintbrush( SfxItemSet& rSet );
@@ -153,7 +153,7 @@
  
  #endif
 diff --git sc/source/ui/view/formatsh.cxx sc/source/ui/view/formatsh.cxx
-index bcb1304..037620b 100644
+index d36a262..72db244 100644
 --- sc/source/ui/view/formatsh.cxx
 +++ sc/source/ui/view/formatsh.cxx
 @@ -58,6 +58,7 @@
@@ -235,7 +235,7 @@
  			rReq.Done();
  			break;
  		case SID_NUMBER_STANDARD:
-@@ -1974,9 +2003,8 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet )
+@@ -1975,9 +2004,8 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet )
  void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
  {
  	ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
@@ -247,7 +247,7 @@
  
  	SfxWhichIter aIter(rSet);
  	USHORT nWhich = aIter.FirstWhich();
-@@ -2003,7 +2031,21 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
+@@ -2004,7 +2032,21 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
  					rSet.Put( SfxStringItem( nWhich, aFormatCode ) );
  				}
  				break;
@@ -270,7 +270,7 @@
  		}
  		nWhich = aIter.NextWhich();
  	}
-@@ -2154,3 +2196,68 @@ void ScFormatShell::StateFormatPaintbrush( SfxItemSet& rSet )
+@@ -2155,3 +2197,68 @@ void ScFormatShell::StateFormatPaintbrush( SfxItemSet& rSet )
          rSet.Put( SfxBoolItem( SID_FORMATPAINTBRUSH, pViewData->GetView()->HasPaintBrush() ) );
  }
  
@@ -340,10 +340,10 @@
 +}
 +
 diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index 674f310..25bba3a 100644
+index f2c10c8..edf4c95 100644
 --- sc/source/ui/view/tabview3.cxx
 +++ sc/source/ui/view/tabview3.cxx
-@@ -269,6 +269,13 @@ void ScTabView::InvalidateAttribs()
+@@ -267,6 +267,13 @@ void ScTabView::InvalidateAttribs()
      rBindings.Invalidate( SID_ALIGN_ANY_VCENTER );
      rBindings.Invalidate( SID_ALIGN_ANY_BOTTOM );
  
@@ -358,7 +358,7 @@
  //	rBindings.Invalidate( SID_RANGE_FORMULA );
  }
 diff --git sc/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml
-index 22f023d..773befc 100644
+index 13b6abc..49c31d7 100644
 --- sc/uiconfig/scalc/toolbar/formatobjectbar.xml
 +++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml
 @@ -33,7 +33,7 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]