View | Details | Raw Unified | Return to issue 95834
Collapse All | Expand All

(-)OOO310_m1.orig/formula/source/ui/dlg/formula.cxx (-8 / +12 lines)
Lines 131-137 Link Here
131
	    void			UpdateFunctionDesc();
131
	    void			UpdateFunctionDesc();
132
	    void			ResizeArgArr( const IFunctionDescription* pNewFunc );
132
	    void			ResizeArgArr( const IFunctionDescription* pNewFunc );
133
	    void			FillListboxes();
133
	    void			FillListboxes();
134
	    void			FillControls();
134
	    void			FillControls(BOOL &rbNext, BOOL &rbPrev);
135
135
136
        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
136
        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
137
        void            SetMeText(const String& _sText);
137
        void            SetMeText(const String& _sText);
Lines 756-764 Link Here
756
756
757
void FormulaDlg_Impl::FillDialog(BOOL nFlag)
757
void FormulaDlg_Impl::FillDialog(BOOL nFlag)
758
{
758
{
759
	if ( nFlag ) 
759
	BOOL bNext=TRUE, bPrev=TRUE;
760
        FillControls();
760
	if(nFlag)
761
		FillControls(bNext, bPrev);
761
	FillListboxes();
762
	FillListboxes();
763
	if(nFlag)
764
	{
765
		aBtnBackward.Enable(bPrev);
766
		aBtnForward.Enable(bNext);
767
	}
762
768
763
	String aStrResult;
769
	String aStrResult;
764
770
Lines 806-812 Link Here
806
	m_pParent->SetUniqueId( nOldUnique );
812
	m_pParent->SetUniqueId( nOldUnique );
807
}
813
}
808
// -----------------------------------------------------------------------------
814
// -----------------------------------------------------------------------------
809
void FormulaDlg_Impl::FillControls()
815
void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
810
{
816
{
811
	//	Umschalten zwischen den "Seiten"
817
	//	Umschalten zwischen den "Seiten"
812
    FormEditData* pData = m_pHelper->getFormEditData();
818
    FormEditData* pData = m_pHelper->getFormEditData();
Lines 902-913 Link Here
902
		//	Test, ob vorne/hinten noch mehr Funktionen sind
908
		//	Test, ob vorne/hinten noch mehr Funktionen sind
903
909
904
	xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
910
	xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
905
	BOOL bNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
911
	rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
906
	nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
912
	nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
907
	pData->SetFStart(nTempStart);
913
	pData->SetFStart(nTempStart);
908
	BOOL bPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
914
	rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
909
	aBtnBackward.Enable(bPrev);
910
	aBtnForward.Enable(bNext);
911
}
915
}
912
// -----------------------------------------------------------------------------
916
// -----------------------------------------------------------------------------
913
917

Return to issue 95834