rpms/openoffice.org/devel openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch, NONE, 1.1 openoffice.org.spec, 1.1685, 1.1686

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch 
Log Message:
Resolves: rhbz#469630 openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch

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

--- NEW FILE openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch ---
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 @@
 
 void ScFormulaDlg::FillDialog(BOOL nFlag)
 {
-	if(nFlag) FillControls();
+    BOOL bNext=TRUE, bPrev=TRUE;
+	if(nFlag) FillControls(bNext, bPrev);
 	FillListboxes();
+	if(nFlag)
+    {
+	    aBtnBackward.Enable(bPrev);
+	    aBtnForward.Enable(bNext);
+    }
 
 	String aStrResult;
 
@@ -498,7 +504,7 @@
 	SetUniqueId( nOldUnique );
 
 }
-void ScFormulaDlg::FillControls()
+void ScFormulaDlg::FillControls(BOOL &rbNext, BOOL &rbPrev)
 {
 	//	Umschalten zwischen den "Seiten"
 
@@ -593,12 +599,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 );
 	nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
 	pData->SetFStart(nTempStart);
-	BOOL bPrev = ScFormulaUtil::GetNextFunc( aFormula, TRUE, nTempStart );
-	aBtnBackward.Enable(bPrev);
-	aBtnForward.Enable(bNext);
+	rbPrev = ScFormulaUtil::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.1685
retrieving revision 1.1686
diff -u -r1.1685 -r1.1686
--- openoffice.org.spec	4 Nov 2008 08:14:20 -0000	1.1685
+++ openoffice.org.spec	4 Nov 2008 15:41:22 -0000	1.1686
@@ -126,6 +126,7 @@
 Patch53: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 Patch54: openoffice.org-3.0.0.ooo95341.cppcanvas.patch
 Patch55: openoffice.org-3.0.0.ooo95793.goodies.met.patch
+Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1376,6 +1377,7 @@
 %patch53 -p1 -b .ooo95533.sw.safertableexport.patch
 %patch54 -p1 -b .ooo95341.cppcanvas.patch
 %patch55 -p1 -b .ooo95793.goodies.met.patch
+%patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3741,8 +3743,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Nov 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.8
+* Tue Nov 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.8
 - Resolves: rhbz#469804 openoffice.org-3.0.0.ooo95793.goodies.met.patch
+- Resolves: rhbz#469630 openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 
 * Wed Oct 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.7
 - Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch