rpms/openoffice.org/devel workspace.calc50.patch, NONE, 1.1 openoffice.org.spec, 1.1908, 1.1909 openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue May 5 15:58:07 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27264/devel
Modified Files:
openoffice.org.spec
Added Files:
workspace.calc50.patch
Removed Files:
openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
Log Message:
track as upstream workspace
workspace.calc50.patch:
--- NEW FILE workspace.calc50.patch ---
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 FormulaDlg_Impl::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;
@@ -806,7 +812,7 @@
m_pParent->SetUniqueId( nOldUnique );
}
// -----------------------------------------------------------------------------
-void FormulaDlg_Impl::FillControls()
+void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
{
// Umschalten zwischen den "Seiten"
FormEditData* pData = m_pHelper->getFormEditData();
@@ -902,12 +908,10 @@
// Test, ob vorne/hinten noch mehr Funktionen sind
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 = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
- aBtnBackward.Enable(bPrev);
- aBtnForward.Enable(bNext);
+ rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
}
// -----------------------------------------------------------------------------
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1908
retrieving revision 1.1909
diff -u -p -r1.1908 -r1.1909
--- openoffice.org.spec 5 May 2009 13:36:12 -0000 1.1908
+++ openoffice.org.spec 5 May 2009 15:57:37 -0000 1.1909
@@ -102,7 +102,7 @@ Patch26: openoffice.org-3.0.0.ooo91924.s
Patch27: workspace.mhu17.patch
Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
Patch29: workspace.gtkmenuimages.patch
-Patch30: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch30: workspace.calc50.patch
Patch31: workspace.mav46.patch
Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
Patch33: workspace.transogl03redux.patch
@@ -1601,7 +1601,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch27 -p1 -b .workspace.mhu17.patch
%patch28 -p1 -b .ooo95018.sal.fdwarnings.patch
%patch29 -p0 -b .workspace.gtkmenuimages.patch
-%patch30 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch30 -p1 -b .workspace.calc50.patch
%patch31 -p1 -b .workspace.mav46.patch
%patch32 -p1
%patch33 -p0 -b .workspace.transogl03redux.patch
--- openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch DELETED ---
More information about the scm-commits
mailing list