rpms/openoffice.org/devel openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch, 1.1, 1.2 openoffice.org.spec, 1.1807, 1.1808

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8228

Modified Files:
	openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch 
	openoffice.org.spec 
Log Message:
update dontset-nonfunctional-forward for new locations

openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch:

Index: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch	4 Nov 2008 15:41:22 -0000	1.1
+++ openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch	17 Feb 2009 09:10:41 -0000	1.2
@@ -1,63 +1,54 @@
-Index: source/ui/inc/formula.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/formula.hxx,v
-retrieving revision 1.5
-diff -u -r1.5 formula.hxx
---- openoffice.org.orig/sc/source/ui/inc/formula.hxx	10 Apr 2008 22:56:36 -0000	1.5
-+++ openoffice.org/sc/source/ui/inc/formula.hxx	4 Nov 2008 15:27:26 -0000
-@@ -195,7 +195,7 @@
- 	void			UpdateFunctionDesc();
- 	void			ResizeArgArr( const ScFuncDesc* pNewFunc );
- 	void			FillListboxes();
--	void			FillControls();
-+	void			FillControls(BOOL &rbNext, BOOL &rbPrev);
- 
- 	xub_StrLen		GetFunctionPos(xub_StrLen nPos);
- 	void			UpdateTokenArray( const String& rStrExp);
-Index: source/ui/formdlg/formula.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/formdlg/formula.cxx,v
-retrieving revision 1.19
-diff -u -r1.19 formula.cxx
---- openoffice.org/sc/source/ui/formdlg/formula.cxx	14 May 2008 09:58:05 -0000	1.19
-+++ openoffice.org/sc/source/ui/formdlg/formula.cxx	4 Nov 2008 15:27:26 -0000
-@@ -439,8 +439,14 @@
+diff -ru OOO310_m1/formula/source/ui/dlg/formula.cxx OOO310_m1/formula/source/ui/dlg/formula.cxx
+--- OOO310_m1.orig/formula/source/ui/dlg/formula.cxx	2009-02-17 09:00:06.000000000 +0000
++++ OOO310_m1/formula/source/ui/dlg/formula.cxx	2009-02-17 09:06:18.000000000 +0000
+@@ -131,7 +131,7 @@
+ 	    void			UpdateFunctionDesc();
+ 	    void			ResizeArgArr( const IFunctionDescription* pNewFunc );
+ 	    void			FillListboxes();
+-	    void			FillControls();
++	    void			FillControls(BOOL &rbNext, BOOL &rbPrev);
+ 
+         FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+         void            SetMeText(const String& _sText);
+@@ -756,9 +756,15 @@
  
- void ScFormulaDlg::FillDialog(BOOL nFlag)
+ void FormulaDlg_Impl::FillDialog(BOOL nFlag)
  {
--	if(nFlag) FillControls();
-+    BOOL bNext=TRUE, bPrev=TRUE;
-+	if(nFlag) FillControls(bNext, bPrev);
+-	if ( nFlag ) 
+-        FillControls();
++	BOOL bNext=TRUE, bPrev=TRUE;
++	if(nFlag)
++		FillControls(bNext, bPrev);
  	FillListboxes();
 +	if(nFlag)
-+    {
-+	    aBtnBackward.Enable(bPrev);
-+	    aBtnForward.Enable(bNext);
-+    }
++	{
++		aBtnBackward.Enable(bPrev);
++		aBtnForward.Enable(bNext);
++	}
  
  	String aStrResult;
  
-@@ -498,7 +504,7 @@
- 	SetUniqueId( nOldUnique );
- 
+@@ -806,7 +812,7 @@
+ 	m_pParent->SetUniqueId( nOldUnique );
  }
--void ScFormulaDlg::FillControls()
-+void ScFormulaDlg::FillControls(BOOL &rbNext, BOOL &rbPrev)
+ // -----------------------------------------------------------------------------
+-void FormulaDlg_Impl::FillControls()
++void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
  {
  	//	Umschalten zwischen den "Seiten"
- 
-@@ -593,12 +599,10 @@
+     FormEditData* pData = m_pHelper->getFormEditData();
+@@ -902,12 +908,10 @@
  		//	Test, ob vorne/hinten noch mehr Funktionen sind
  
- 	xub_StrLen nTempStart = ScFormulaUtil::GetArgStart( aFormula, nFStart, 0 );
--	BOOL bNext = ScFormulaUtil::GetNextFunc( aFormula, FALSE, nTempStart );
-+	rbNext = ScFormulaUtil::GetNextFunc( aFormula, FALSE, nTempStart );
+ 	xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
+-	BOOL bNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
++	rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
  	nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
  	pData->SetFStart(nTempStart);
--	BOOL bPrev = ScFormulaUtil::GetNextFunc( aFormula, TRUE, nTempStart );
+-	BOOL bPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
 -	aBtnBackward.Enable(bPrev);
 -	aBtnForward.Enable(bNext);
-+	rbPrev = ScFormulaUtil::GetNextFunc( aFormula, TRUE, nTempStart );
++	rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
  }
+ // -----------------------------------------------------------------------------
  
- void ScFormulaDlg::ClearAllParas()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1807
retrieving revision 1.1808
diff -u -r1.1807 -r1.1808
--- openoffice.org.spec	17 Feb 2009 08:52:50 -0000	1.1807
+++ openoffice.org.spec	17 Feb 2009 09:10:41 -0000	1.1808
@@ -102,8 +102,7 @@
 Patch30: workspace.mhu17.patch
 Patch31: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
 Patch32: workspace.gtkmenuimages.patch
-# review to see if fixed in new impl
-# Patch33: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch33: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 Patch34: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch35: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch36: workspace.transogl03redux.patch
@@ -1555,8 +1554,7 @@
 %patch30 -p1 -b .workspace.mhu17.patch
 %patch31 -p1 -b .ooo95018.sal.fdwarnings.patch
 %patch32 -p0 -b .workspace.gtkmenuimages.patch
-# review to see if fixed in new impl
-# %patch33 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch33 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 %patch34 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch35 -p1
 %patch36 -p0 -b .workspace.transogl03redux.patch