summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx20
-rw-r--r--formula/source/ui/dlg/formula.cxx130
-rw-r--r--formula/source/ui/dlg/funcpage.cxx6
-rw-r--r--formula/source/ui/dlg/funcutl.cxx201
4 files changed, 159 insertions, 198 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index c69763050e..7da397f8f1 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -59,7 +59,7 @@ namespace formula
};
}
//===================================================================
-// class FormulaHelper - statische Methoden
+// class FormulaHelper - static Method
//===================================================================
#define FUNC_NOTFOUND 0xffff
@@ -77,7 +77,7 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager)
}
BOOL FormulaHelper::GetNextFunc( const String& rFormula,
BOOL bBack,
- xub_StrLen& rFStart, // Ein- und Ausgabe
+ xub_StrLen& rFStart, // Input and output
xub_StrLen* pFEnd, // = NULL
const IFunctionDescription** ppFDesc, // = NULL
::std::vector< ::rtl::OUString>* pArgs ) const // = NULL
@@ -111,7 +111,7 @@ BOOL FormulaHelper::GetNextFunc( const String& rFormula,
*ppFDesc = pCurrent;
break;
}
- } // for(sal_uInt32 i = 0 ; i < nCount; ++i)
+ }// for(sal_uInt32 i = 0 ; i < nCount; ++i)
}
if ( *ppFDesc && pArgs )
{
@@ -146,7 +146,7 @@ void FormulaHelper::FillArgStrings( const String& rFormula,
{
nStart = GetArgStart( rFormula, nFuncPos, i );
- if ( i+1<nArgs ) // letztes Argument?
+ if ( i+1<nArgs ) // last argument?
{
nEnd = GetArgStart( rFormula, nFuncPos, i+1 );
@@ -263,11 +263,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
{
if ( IsFormulaText( m_pCharClass,rFormula, nFStart ) )
{
- // Funktion gefunden
+ // Function found
if ( pFuncName )
*pFuncName = rFormula.Copy( nFStart, nParPos-nFStart );
}
- else // Klammern ohne Funktion -> weitersuchen
+ else // Brackets without function -> keep searching
{
bRepeat = TRUE;
if ( !bBack )
@@ -278,7 +278,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String& rFormula,
bRepeat = FALSE;
}
}
- else // keine Klammern gefunden
+ else // No brackets found
{
nFStart = FUNC_NOTFOUND;
if ( pFuncName )
@@ -323,7 +323,7 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
else if ( nParCount < 0 )
{
bFound = TRUE;
- nStart--; // einen zu weit gelesen
+ nStart--; // read one too far
}
}
else if ( c == arrayOpen )
@@ -339,10 +339,10 @@ xub_StrLen FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
if ( !bInArray && nParCount == 0 )
{
bFound = TRUE;
- nStart--; // einen zu weit gelesen
+ nStart--; // read one too far
}
}
- nStart++; // hinter gefundene Position stellen
+ nStart++; // Set behind found position
}
return nStart;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index b9d4dfcf4b..d8e7fa9f5b 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -223,7 +223,7 @@ namespace formula
const String aTitle1;
const String aTitle2;
const String aTxtEnd;
- const String aTxtOk; // hinter aBtnEnd
+ const String aTxtOk; // behind aBtnEnd
FormulaHelper
m_aFormulaHelper;
@@ -295,9 +295,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pMEdit (NULL),
bUserMatrixFlag (FALSE),
//
- aTitle1 ( ModuleRes( STR_TITLE1 ) ), // lokale Resource
- aTitle2 ( ModuleRes( STR_TITLE2 ) ), // lokale Resource
- aTxtEnd ( ModuleRes( STR_END ) ), // lokale Resource
+ aTitle1 ( ModuleRes( STR_TITLE1 ) ), // local resource
+ aTitle2 ( ModuleRes( STR_TITLE2 ) ), // local resource
+ aTxtEnd ( ModuleRes( STR_END ) ), // local resource
aTxtOk ( aBtnEnd.GetText() ),
m_aFormulaHelper(_pFunctionMgr),
//
@@ -332,7 +332,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage);
aTabCtrl.SetTabPage( TP_STRUCT, pStructPage);
- nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1"
+ nOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1"
nOldUnique = pParent->GetUniqueId();
aFtResult.Show( _bSupportResult );
@@ -376,10 +376,10 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
{
aTimer.SetTimeoutHdl(Link());
aTimer.Stop();
- } // if(aTimer.IsActive())
- bIsShutDown=TRUE;// Setzen, damit PreNotify keinen GetFocus speichert.
+ }// if(aTimer.IsActive())
+ bIsShutDown=TRUE;// Set it in order to PreNotify not to save GetFocus.
FormEditData* pData = m_pHelper->getFormEditData();
- if (pData) // wird nicht ueber Close zerstoert;
+ if (pData) // it won't be destroyed over Close;
{
pData->SetFStart((xub_StrLen)pMEdit->GetSelection().Min());
pData->SetSelection(pMEdit->GetSelection());
@@ -427,7 +427,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
FormEditData* pData = m_pHelper->getFormEditData();
- if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert;
+ if (pData && !aTimer.IsActive()) // it won't be destroyed over Close;
{
pData->SetUniqueId(nActivWinId);
}
@@ -484,7 +484,7 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
xub_StrLen nTokPos=1;
xub_StrLen nOldTokPos=1;
- xub_StrLen nFuncPos=STRING_NOTFOUND; //@ Testweise
+ xub_StrLen nFuncPos=STRING_NOTFOUND; //@ Testwise
xub_StrLen nPrevFuncPos=1;
short nBracketCount=0;
BOOL bFlag=FALSE;
@@ -498,8 +498,6 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
const sheet::FormulaToken* pIter = m_aTokenList.getConstArray();
const sheet::FormulaToken* pEnd = pIter + m_aTokenList.getLength();
- //if ( pIter != pEnd && aFormString.GetChar(0) == '=' )
- // ++pIter;
try
{
while ( pIter != pEnd )
@@ -596,7 +594,7 @@ BOOL FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
if ( rStrExp.Len() > 0 )
{
- // nur, wenn keine Tastatureingabe mehr anliegt, den Wert berechnen:
+ // Only calculate the value when there isn't any more keyboard input:
if ( !Application::AnyInput( INPUT_KEYBOARD ) )
{
@@ -634,7 +632,7 @@ BOOL FormulaDlg_Impl::CalcStruct( const String& rStrExp)
if ( rStrExp.Len() > 0 && aOldFormula!=rStrExp && bStructUpdate)
{
- // nur, wenn keine Tastatureingabe mehr anliegt, den Wert berechnen:
+ // Only calculate the value when there isn't any more keyboard input:
if ( !Application::AnyInput( INPUT_KEYBOARD ) )
{
@@ -798,10 +796,10 @@ void FormulaDlg_Impl::FillDialog(BOOL nFlag)
// -----------------------------------------------------------------------------
void FormulaDlg_Impl::FillListboxes()
{
- // Umschalten zwischen den "Seiten"
+ // Switch between the "Pages"
FormEditData* pData = m_pHelper->getFormEditData();
String aNewTitle;
- // 1. Seite: Funktion auswaehlen
+ // 1. Page: select function
if ( pFuncDesc && pFuncDesc->getCategory() )
{
if( pFuncPage->GetCategory() != pFuncDesc->getCategory()->getNumber() + 1 )
@@ -818,27 +816,27 @@ void FormulaDlg_Impl::FillListboxes()
}
FuncSelHdl(NULL);
- // ResizeArgArr jetzt schon in UpdateFunctionDesc
+ // ResizeArgArr is now already in UpdateFunctionDesc
- m_pHelper->setDispatcherLock( TRUE);// Modal-Modus einschalten
+ m_pHelper->setDispatcherLock( TRUE);// Activate Modal-Mode
aNewTitle = aTitle1;
- // HelpId fuer 1. Seite ist die aus der Resource
+ // HelpId for 1. page is the one from the resource
m_pParent->SetHelpId( nOldHelp );
m_pParent->SetUniqueId( nOldUnique );
}
// -----------------------------------------------------------------------------
void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
{
- // Umschalten zwischen den "Seiten"
+ // Switch between the "Pages"
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData )
return;
String aNewTitle;
- // 2. Seite oder Editieren: ausgewaehlte Funktion anzeigen
+ // 2. Page or Edit: show selected function
xub_StrLen nFStart = pData->GetFStart();
String aFormula = m_pHelper->getCurrentFormula();
@@ -888,7 +886,7 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
USHORT nOffset = pData->GetOffset();
nEdFocus = pData->GetEdFocus();
- // Verkettung der Edit's fuer Focus-Kontrolle
+ // Concatenate the Edit's for Focus-Control
if(bTestFlag)
pParaWin->SetArgumentOffset(nOffset);
@@ -980,10 +978,10 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula)
void FormulaDlg_Impl::DoEnter(BOOL bOk)
{
- // Eingabe ins Dokument uebernehmen oder abbrechen
+ // Accept input to the document or cancel
if ( bOk)
{
- // ggf. Dummy-Argumente entfernen
+ // remove dummy arguments
String aInputFormula = m_pHelper->getCurrentFormula();
String aString = RepairFormula(pMEdit->GetText());
m_pHelper->setSelection(0, aInputFormula.Len());
@@ -993,10 +991,10 @@ void FormulaDlg_Impl::DoEnter(BOOL bOk)
m_pHelper->switchBack();
m_pHelper->dispatch(bOk,aBtnMatrix.IsChecked());
- // Daten loeschen
+ // Clear data
m_pHelper->deleteFormData();
- // Dialog schliessen
+ // Close dialog
m_pHelper->doClose(bOk);
}
// -----------------------------------------------------------------------------
@@ -1005,15 +1003,15 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
{
if ( pBtn == &aBtnCancel )
{
- DoEnter(FALSE); // schliesst den Dialog
+ DoEnter(FALSE); // closes the Dialog
}
else if ( pBtn == &aBtnEnd )
{
- DoEnter(TRUE); // schliesst den Dialog
+ DoEnter(TRUE); // closes the Dialog
}
else if ( pBtn == &aBtnForward )
{
- //@pMEdit->GrabFocus(); // Damit die Selektion auch angezeigt wird.
+ //@pMEdit->GrabFocus(); // In order to show the selection too
const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
@@ -1041,7 +1039,7 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
// --------------------------------------------------------------------------
-// Funktionen fuer 1. Seite
+// Functions for 1. Page
// --------------------------------------------------------------------------
void FormulaDlg_Impl::ResizeArgArr( const IFunctionDescription* pNewFunc )
@@ -1086,8 +1084,8 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
aFtFuncDesc.SetText( pDesc->getDescription() );
ResizeArgArr( pDesc );
- if ( !m_aArguments.empty() ) // noch Argumente da?
- aSig = pDesc->getFormula( m_aArguments ); // fuer Eingabezeile
+ if ( !m_aArguments.empty() ) // still arguments there?
+ aSig = pDesc->getFormula( m_aArguments ); // for input line
//@ m_pHelper->setCurrentFormula( aSig );
}
}
@@ -1102,7 +1100,7 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
}
// -----------------------------------------------------------------------------
-// Handler fuer Listboxen
+// Handler for Listboxes
IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
{
@@ -1139,13 +1137,13 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
// -----------------------------------------------------------------------------
// --------------------------------------------------------------------------
-// Funktionen fuer rechte Seite
+// Functions for right Page
// --------------------------------------------------------------------------
void FormulaDlg_Impl::SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd)
{
xub_StrLen nFEnd;
- // Selektion merken und neue setzen
+ // Notice and set new selection
m_pHelper->getSelection( nFStart, nFEnd );
m_pHelper->setSelection( nNextFStart, nNextFEnd );
if(!bEditFlag)
@@ -1323,10 +1321,10 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
{
if(pPtr==pParaWin)
{
- aBtnForward.Enable(TRUE); //@ Damit eine neue Fkt eingegeben werden kann.
+ aBtnForward.Enable(TRUE); //@ In order to be able to input another function.
aTabCtrl.SetCurPageId(TP_FUNCTION);
- String aUndoStr = m_pHelper->getCurrentFormula(); // bevor unten ein ";" eingefuegt wird
+ String aUndoStr = m_pHelper->getCurrentFormula(); // it will be added before a ";"
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData) return 0;
@@ -1349,7 +1347,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
ClearAllParas();
FillDialog(FALSE);
- pFuncPage->SetFocus(); //Da Parawin nicht mehr sichtbar
+ pFuncPage->SetFocus(); //There Parawin is not visible anymore
}
return 0;
}
@@ -1380,7 +1378,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
Selection aSel =pMEdit->GetSelection();
xub_StrLen nTest=0;
- if(aString.Len()==0) //falls alles geloescht wurde
+ if(aString.Len()==0) //in case everything was cleared
{
aString +='=';
pMEdit->SetText(aString);
@@ -1388,7 +1386,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
aSel .Max()=1;
pMEdit->SetSelection(aSel);
}
- else if(aString.GetChar(nTest)!='=') //falls ersetzt wurde;
+ else if(aString.GetChar(nTest)!='=') //in case it's replaced;
{
aString.Insert( (sal_Unicode)'=', 0 );
pMEdit->SetText(aString);
@@ -1652,7 +1650,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
{
pMEdit->GrabFocus();
xub_StrLen nLen = aFormula.Len();
- BOOL bMatrix = nLen > 3 // Matrix-Formel ?
+ BOOL bMatrix = nLen > 3 // Matrix-Formula ?
&& aFormula.GetChar(0) == '{'
&& aFormula.GetChar(1) == '='
&& aFormula.GetChar(nLen-1) == '}';
@@ -1672,41 +1670,6 @@ IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP )
bStructUpdate=FALSE;
if(pStructPage->IsVisible()) aBtnForward.Enable(FALSE); //@New
- if(pStructPage==pStruP)
- {
- /// TODO
- //ScToken* pSelToken = pStructPage->GetSelectedToken();
- // ScToken* pOrigToken = ((pSelToken && pSelToken->GetType() == svFAP) ?
- // pSelToken->GetFAPOrigToken() : pSelToken);
- //xub_StrLen nTokPos=1;
-
- //if(pScTokA!=NULL)
- //{
- // ScToken* pToken = pScTokA->First();
-
- // while(pToken!=NULL)
- // {
- // String aString;
- // if ( pToken == pOrigToken )
- // break;
- // pComp->CreateStringFromToken( aString,pToken);
- // nTokPos = sal::static_int_cast<xub_StrLen>( nTokPos + aString.Len() );
- // pToken=pScTokA->Next();
- // }
- // EditThisFunc(nTokPos);
- //}
-
- //if( pOrigToken )
- //{
- // String aStr;
- // pComp->CreateStringFromToken( aStr, pOrigToken );
- // String aEntryTxt=pStructPage->GetSelectedEntryText();
-
- // if(aEntryTxt!=aStr)
- // ShowReference(aEntryTxt);
- //}
-
- }
bStructUpdate=TRUE;
return 0;
}
@@ -1757,7 +1720,7 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection,const String& _
aEdRef.SetSelection( theSel );
//-------------------------------------
- // Manuelles Update der Ergebnisfelder:
+ // Manual Update of the results' fields:
//-------------------------------------
USHORT nPrivActiv = pParaWin->GetActiveLine();
pParaWin->SetArgument(nPrivActiv,aEdRef.GetText());
@@ -1993,7 +1956,7 @@ void FormulaModalDialog::SetEdSelection()
}
// --------------------------------------------------------------------------
-// Initialisierung / gemeinsaME Funktionen fuer Dialog
+// Initialisation / General functions for Dialog
// --------------------------------------------------------------------------
FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent
@@ -2008,10 +1971,9 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
,_pHelper,_pFunctionMgr,_pDlg))
{
FreeResource();
- if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId
- SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und
- //in eine UniqueId gewandelt wird, machen
- //wir das an dieser Stelle rueckgaengig.
+ if(GetHelpId()==0) //Hack which hides the HelpId for a model Dialog in SfxModelessDialog
+ SetHelpId(GetUniqueId()); //and will be changed in a UniqueId,
+ //at this point we reverse it.
SetText(m_pImpl->aTitle1);
}
@@ -2154,7 +2116,7 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
{
FormEditData* pData = m_pImpl->m_pHelper->getFormEditData();
- if (pData) // wird nicht ueber Close zerstoert;
+ if (pData) // won't be destroyed over Close;
{
m_pImpl->m_pHelper->setReferenceInput(pData);
ULONG nUniqueId=pData->GetUniqueId();
@@ -2196,7 +2158,7 @@ void FormEditData::RestoreValues()
if (pTemp)
{
*this = *pTemp;
- pTemp->pParent = NULL; // sonst wird der auch geloescht!
+ pTemp->pParent = NULL; // otherwise it would be cleared too!
delete pTemp;
}
}
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index d5e492893f..98534e1663 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -84,7 +84,7 @@ long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
inline USHORT Lb2Cat( USHORT nLbPos )
{
- // Kategorie 0 == LRU, sonst Categories == LbPos-1
+ // Category 0 == LRU, otherwise Categories == LbPos-1
if ( nLbPos > 0 )
nLbPos -= 1;
@@ -161,7 +161,7 @@ void FuncPage::UpdateFunctionList()
impl_addFunctions(pCategory);
}
}
- else // LRU-Liste
+ else // LRU-List
{
::std::vector< TFunctionDesc >::iterator aIter = aLRUList.begin();
::std::vector< TFunctionDesc >::iterator aEnd = aLRUList.end();
@@ -251,7 +251,7 @@ String FuncPage::GetSelFunctionName() const
}
const IFunctionDescription* FuncPage::GetFuncDesc( USHORT nPos ) const
{
- // nicht schoen, aber hoffentlich selten
+ // not pretty, but hopefully rare
return (const IFunctionDescription*) aLbFunction.GetEntryData(nPos);
}
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 57cb2823c2..e5deee9d5b 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -91,7 +91,7 @@ void ValWnd::SetValue( const String& rStrVal )
{
aStrValue = rStrVal;
DrawRect( aRectOut ); // alten Text loeschen
- Paint( aRectOut ); // und neu malen
+ Paint( aRectOut ); // and neu malen
}
}
@@ -121,7 +121,7 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
//----------------------------------------------------------------------------
-// Cursorsteuerung fuer EditFelder im Argument-Dialog
+// Cursor control for Edit Fields in Argument Dialog
void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
{
@@ -206,12 +206,12 @@ void __EXPORT ArgEdit::KeyInput( const KeyEvent& rKEvt )
/*************************************************************************
-#* Member: ArgInput Datum:13.01.97
+#* Member: ArgInput Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Konstruktor der Klasse ArgInput
+#* Function: ArgInput class constructor
#*
#* Input: ---
#*
@@ -228,12 +228,12 @@ ArgInput::ArgInput()
}
/*************************************************************************
-#* Member: InitArgInput Datum:13.01.97
+#* Member: InitArgInput Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Initialisiert die Pointer der Klasse
+#* Function: Initializes the class' Pointer
#*
#* Input: ---
#*
@@ -270,12 +270,12 @@ void ArgInput::InitArgInput(FixedText* pftArg,
}
/*************************************************************************
-#* Member: SetArgName Datum:13.01.97
+#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Setzt den Namen fuer das Argument
+#* Function: Sets the Name for the Argument
#*
#* Input: String
#*
@@ -288,12 +288,12 @@ void ArgInput::SetArgName(const String &aArg)
}
/*************************************************************************
-#* Member: GetArgName Datum:06.02.97
+#* Member: GetArgName Date:06.02.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Liefert den Namen fuer das Argument zurueck
+#* Function: Returns the Name for the Argument
#*
#* Input: String
#*
@@ -311,12 +311,12 @@ String ArgInput::GetArgName()
/*************************************************************************
-#* Member: SetArgName Datum:13.01.97
+#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Setzt den Namen fuer das Argument
+#* Function: Sets the Name for the Argument
#*
#* Input: String
#*
@@ -329,12 +329,12 @@ void ArgInput::SetArgNameFont (const Font &aFont)
}
/*************************************************************************
-#* Member: SetArgSelection Datum:13.01.97
+#* Member: SetArgSelection Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Stellt die Selection fuer die EditBox ein.
+#* Function: Sets up the Selection for the EditBox.
#*
#* Input: String
#*
@@ -347,12 +347,12 @@ void ArgInput::SetArgSelection (const Selection& rSel )
}
/*************************************************************************
-#* Member: SetArgSelection Datum:13.01.97
+#* Member: SetArgSelection Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Liefert die Selection fuer die EditBox zurueck.
+#* Function: Returns the Selection for the EditBox.
#*
#* Input: String
#*
@@ -367,12 +367,12 @@ Selection ArgInput::GetArgSelection ()
}
/*************************************************************************
-#* Member: SetArgSelection Datum:13.01.97
+#* Member: SetArgSelection Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Ersetzt die Selection in der EditBox.
+#* Function: Replaces the Selection in the EditBox.
#*
#* Input: String
#*
@@ -387,12 +387,12 @@ void ArgInput::ReplaceSelOfArg(const String& rStr )
/*************************************************************************
-#* Member: SetArgVal Datum:13.01.97
+#* Member: SetArgVal Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Setzt den Wert fuer das Argument
+#* Function: Sets the Value for the Argument
#*
#* Input: String
#*
@@ -408,12 +408,12 @@ void ArgInput::SetArgVal(const String &aVal)
}
/*************************************************************************
-#* Member: SetArgName Datum:13.01.97
+#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Liefert den Wert fuer das Argument
+#* Function: Returns the Value for the Argument
#*
#* Input: ---
#*
@@ -431,12 +431,12 @@ String ArgInput::GetArgVal()
}
/*************************************************************************
-#* Member: SetArgName Datum:13.01.97
+#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Versteckt die Controls
+#* Function: Hides the Controls
#*
#* Input: ---
#*
@@ -455,12 +455,12 @@ void ArgInput::Hide()
}
/*************************************************************************
-#* Member: SetArgName Datum:13.01.97
+#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Zaubert die Controls wieder hervor.
+#* Function: Casts the Controls again.
#*
#* Input: ---
#*
@@ -479,12 +479,12 @@ void ArgInput::Show()
}
/*************************************************************************
-#* Member: FxClick Datum:13.01.97
+#* Member: FxClick Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -497,12 +497,12 @@ void ArgInput::FxClick()
}
/*************************************************************************
-#* Member: RefClick Datum:13.01.97
+#* Member: RefClick Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -515,12 +515,12 @@ void ArgInput::RefClick()
}
/*************************************************************************
-#* Member: FxFocus Datum:13.01.97
+#* Member: FxFocus Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -533,12 +533,12 @@ void ArgInput::FxFocus()
}
/*************************************************************************
-#* Member: RefFocus Datum:13.01.97
+#* Member: RefFocus Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -551,12 +551,12 @@ void ArgInput::RefFocus()
}
/*************************************************************************
-#* Member: EdFocus Datum:13.01.97
+#* Member: EdFocus Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -569,12 +569,12 @@ void ArgInput::EdFocus()
}
/*************************************************************************
-#* Member: EdModify Datum:13.01.97
+#* Member: EdModify Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Gibt den Event weiter.
+#* Function: Forwards the Event.
#*
#* Input: ---
#*
@@ -587,12 +587,12 @@ void ArgInput::EdModify()
}
/*************************************************************************
-#* Handle: FxBtnHdl Datum:13.01.97
+#* Handle: FxBtnHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Click-Event.
+#* Function: Handle for Fx-Button Click-Event.
#*
#* Input: ---
#*
@@ -607,12 +607,12 @@ IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn )
}
/*************************************************************************
-#* Handle: RefBtnClickHdl Datum:13.01.97
+#* Handle: RefBtnClickHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Click-Event.
+#* Function: Handle for Fx-Button Click-Event.
#*
#* Input: ---
#*
@@ -627,12 +627,12 @@ IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn )
}
/*************************************************************************
-#* Handle: FxBtnFocusHdl Datum:13.01.97
+#* Handle: FxBtnFocusHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Focus-Event.
+#* Function: Handle for Fx-Button Focus-Event.
#*
#* Input: ---
#*
@@ -647,12 +647,12 @@ IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn )
}
/*************************************************************************
-#* Handle: RefBtnFocusHdl Datum:13.01.97
+#* Handle: RefBtnFocusHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Focus-Event.
+#* Function: Handle for Fx-Button Focus-Event.
#*
#* Input: ---
#*
@@ -667,12 +667,12 @@ IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn )
}
/*************************************************************************
-#* Handle: EdFocusHdl Datum:13.01.97
+#* Handle: EdFocusHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Focus-Event.
+#* Function: Handle for Fx-Button Focus-Event.
#*
#* Input: ---
#*
@@ -687,12 +687,12 @@ IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd )
}
/*************************************************************************
-#* Handle: RefBtnClickHdl Datum:13.01.97
+#* Handle: RefBtnClickHdl Date:13.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ArgInput
+#* Class: ArgInput
#*
-#* Funktion: Handle fuer Fx-Button Focus-Event.
+#* Function: Handle for Fx-Button Focus-Event.
#*
#* Input: ---
#*
@@ -707,12 +707,12 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
}
/*************************************************************************
-#* Member: EditBox Datum:20.01.97
+#* Member: EditBox Date:20.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Konstruktor der Klasse ArgInput
+#* Function: Constructor from Class ArgInput
#*
#* Input: Parent, Window-Style
#*
@@ -730,12 +730,12 @@ EditBox::EditBox( Window* pParent,WinBits nWinStyle)
}
/*************************************************************************
-#* Member: EditBox Datum:20.01.97
+#* Member: EditBox Date:20.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Konstruktor der Klasse ArgInput
+#* Function: Constructor from Class ArgInput
#*
#* Input: Parent, Resource
#*
@@ -771,13 +771,12 @@ EditBox::~EditBox()
delete pTheEdit;
}
/*************************************************************************
-#* Member: EditBox Datum:20.01.97
+#* Member: EditBox Date:20.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Wenn sich die Selektion geaendert hat, so wird
-#* diese Funktion aufgerufen.
+#* Function: When the seleccion is changed this function will be called
#*
#* Input: ---
#*
@@ -790,13 +789,13 @@ void EditBox::SelectionChanged()
}
/*************************************************************************
-#* Member: EditBox Datum:20.05.98
+#* Member: EditBox Date:20.05.98
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Wenn sich die Groesse geaendert hat, so muss
-#* auch der MultiLineEdit angepasst werden..
+#* Function: When the size is changed, MultiLineEdit must
+#* be adapted..
#*
#* Input: ---
#*
@@ -810,14 +809,14 @@ void EditBox::Resize()
}
/*************************************************************************
-#* Member: GetFocus Datum:26.05.98
+#* Member: GetFocus Date:26.05.98
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Wenn der Control aktiviert wird, so wird
-#* die Selection aufgehoben und der Cursor ans
-#* Ende gesetzt.
+#* Function: When the Control is activated,
+#* the Selection is repealed and the Cursor set
+#* at the end.
#*
#* Input: ---
#*
@@ -835,13 +834,13 @@ void EditBox::GetFocus()
/*************************************************************************
-#* Member: EditBox Datum:20.01.97
+#* Member: EditBox Date:20.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Wenn ein Event ausgeloest wird, so wird diese Routine
-#* zuerst aufgerufen und ein PostUserEvent verschickt.
+#* Function: When an Event is cleared, this Routine is
+#* first called and a PostUserEvent is sent.
#*
#* Input: Notify-Event
#*
@@ -884,13 +883,13 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
}
/*************************************************************************
-#* Member: EditBox Datum:21.01.97
+#* Member: EditBox Date:21.01.97
#*------------------------------------------------------------------------
#*
-#* Klasse: EditBox
+#* Class: EditBox
#*
-#* Funktion: Wenn ein Event ausgeloest wurde, so wird diese Routine
-#* zuerst aufgerufen.
+#* Function: When an Event cleared wurde, this routine is
+#* first called.
#*
#* Input: Key-Event
#*