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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Oct 21 19:45:06 2008
New Revision: 14376
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14376&view=rev

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

	* patches/dev300/sc-cellformat-icon-toggle.diff: revive the standard 
	button, but make it invisible by default (i#86377).


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-cellformat-icon-toggle.diff

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 Oct 21 19:45:06 2008
@@ -1,8 +1,8 @@
 diff --git sc/inc/column.hxx sc/inc/column.hxx
-index 3621d78..d68e4e6 100644
+index 5a1a771..f274736 100644
 --- sc/inc/column.hxx
 +++ sc/inc/column.hxx
-@@ -306,6 +306,7 @@ public:
+@@ -296,6 +296,7 @@ public:
      const ScPatternAttr*    GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
  
  	ULONG		GetNumberFormat( SCROW nRow ) const;
@@ -11,10 +11,10 @@
  	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 6d361ae..80fc25c 100644
+index 905244d..35fd858 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -764,6 +764,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() const;
+@@ -751,6 +751,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollection() const;
  	double			RoundValueAsShown( double fVal, ULONG nFormat );
  	void			GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
  									 sal_uInt32& rFormat );
@@ -23,10 +23,10 @@
                      /** 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 570bdd3..af9d62b 100644
+index 932de72..924e3ef 100644
 --- sc/inc/table.hxx
 +++ sc/inc/table.hxx
-@@ -440,6 +440,7 @@ public:
+@@ -435,6 +435,7 @@ public:
  	ULONG					GetNumberFormat( const ScAddress& rPos ) const
  								{ return aCol[rPos.Col()].GetNumberFormat( rPos.Row() ); }
  	ULONG					GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
@@ -56,10 +56,10 @@
  	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 67f0b70..474da0f 100644
+index fbc613b..96c7377 100644
 --- sc/source/core/data/column.cxx
 +++ sc/source/core/data/column.cxx
-@@ -368,6 +368,22 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
+@@ -361,6 +361,22 @@ ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
  	return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
  }
  
@@ -83,10 +83,10 @@
  SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray )
  {
 diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index c5dc8b8..886156d 100644
+index 8d182c4..a94a264 100644
 --- sc/source/core/data/document.cxx
 +++ sc/source/core/data/document.cxx
-@@ -2291,6 +2291,32 @@ void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
+@@ -2306,6 +2306,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 6a55cb5..243a9c1 100644
+index 26a6d8b..9bcc2b7 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
-@@ -1106,6 +1106,14 @@ ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
+@@ -1096,6 +1096,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 a214685..2f99aa8 100644
+index ac7d7ea..94feaba 100644
 --- sc/source/ui/inc/formatsh.hxx
 +++ sc/source/ui/inc/formatsh.hxx
-@@ -79,6 +79,9 @@ public:
+@@ -76,6 +76,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 0651b18..7b93eef 100644
+index bcb1304..037620b 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:
-@@ -1983,9 +2012,8 @@ void ScFormatShell::GetBckColState( SfxItemSet& rSet )
+@@ -1974,9 +2003,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();
-@@ -2012,7 +2040,21 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
+@@ -2003,7 +2031,21 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
  					rSet.Put( SfxStringItem( nWhich, aFormatCode ) );
  				}
  				break;
@@ -270,7 +270,7 @@
  		}
  		nWhich = aIter.NextWhich();
  	}
-@@ -2163,3 +2205,68 @@ void ScFormatShell::StateFormatPaintbrush( SfxItemSet& rSet )
+@@ -2154,3 +2196,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 153a407..04796f5 100644
+index 674f310..25bba3a 100644
 --- sc/source/ui/view/tabview3.cxx
 +++ sc/source/ui/view/tabview3.cxx
-@@ -356,6 +356,13 @@ void ScTabView::InvalidateAttribs()
+@@ -269,6 +269,13 @@ void ScTabView::InvalidateAttribs()
      rBindings.Invalidate( SID_ALIGN_ANY_VCENTER );
      rBindings.Invalidate( SID_ALIGN_ANY_BOTTOM );
  
@@ -358,14 +358,15 @@
  //	rBindings.Invalidate( SID_RANGE_FORMULA );
  }
 diff --git sc/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml
-index 22f023d..3654ce5 100644
+index 22f023d..773befc 100644
 --- sc/uiconfig/scalc/toolbar/formatobjectbar.xml
 +++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml
-@@ -33,7 +33,6 @@
+@@ -33,7 +33,7 @@
   <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent" toolbar:helpid="helpid:26046"  />
   <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:helpid="helpid:26053"  toolbar:visible="false" />
   <toolbar:toolbaritem xlink:href=".uno:NumberFormatScientific" toolbar:helpid="helpid:26055"  toolbar:visible="false" />
 - <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:helpid="helpid:26052"  />
++ <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:helpid="helpid:26052"  toolbar:visible="false" />
   <toolbar:toolbaritem xlink:href=".uno:NumberFormatIncDecimals" toolbar:helpid="helpid:26057"  />
   <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecDecimals" toolbar:helpid="helpid:26058"  />
   <toolbar:toolbarseparator/>