[Libreoffice-commits] core.git: formula/source include/formula
Tomaž Vajngerl
quikee at gmail.com
Sun Dec 1 04:08:41 PST 2013
formula/source/ui/dlg/funcutl.cxx | 447 +++-----------------------------------
include/formula/funcutl.hxx | 92 ++++---
2 files changed, 86 insertions(+), 453 deletions(-)
New commits:
commit bd77c4d178db1cd12bff48ea826e1fdd2510511e
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Dec 1 13:07:25 2013 +0100
Remove useless comments in funcutil.
Change-Id: I2a5f70a45e1101c72a9dc973e1a783f716400ad2
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 9b7be4c..0d4eb16 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -31,10 +31,8 @@
namespace formula
{
-//============================================================================
-// class ValWnd
-//----------------------------------------------------------------------------
+// class ValWnd
ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
{
Font aFnt( GetFont() );
@@ -65,15 +63,11 @@ ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::LABEL );
}
-//----------------------------------------------------------------------------
-
void ValWnd::Paint( const Rectangle& )
{
DrawText( aRectOut.TopLeft(), aStrValue );
}
-//----------------------------------------------------------------------------
-
void ValWnd::SetValue( const OUString& rStrVal )
{
if ( aStrValue != rStrVal )
@@ -84,9 +78,7 @@ void ValWnd::SetValue( const OUString& rStrVal )
}
}
-//============================================================================
// class ArgEdit
-//----------------------------------------------------------------------------
ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
: RefEdit( pParent, NULL, NULL, rResId ),
@@ -97,8 +89,6 @@ ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
{
}
-//----------------------------------------------------------------------------
-
void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
ScrollBar& rArgSlider, sal_uInt16 nArgCount )
{
@@ -108,10 +98,7 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
nArgs = nArgCount;
}
-//----------------------------------------------------------------------------
-
// Cursor control for Edit Fields in Argument Dialog
-
void ArgEdit::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aCode = rKEvt.GetKeyCode();
@@ -187,23 +174,7 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
RefEdit::KeyInput( rKEvt );
}
-
-
-
-/*************************************************************************
-#* Member: ArgInput Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: ArgInput class constructor
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
+// class ArgInput
ArgInput::ArgInput()
{
pFtArg=NULL;
@@ -212,24 +183,8 @@ ArgInput::ArgInput()
pRefBtn=NULL;
}
-/*************************************************************************
-#* Member: InitArgInput Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Initializes the class' Pointer
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
-void ArgInput::InitArgInput(FixedText* pftArg,
- ImageButton* pbtnFx,
- ArgEdit* pedArg,
- RefButton* prefBtn)
+void ArgInput::InitArgInput( FixedText* pftArg, ImageButton* pbtnFx,
+ ArgEdit* pedArg, RefButton* prefBtn)
{
pFtArg =pftArg;
pBtnFx =pbtnFx;
@@ -254,37 +209,13 @@ void ArgInput::InitArgInput(FixedText* pftArg,
}
-/*************************************************************************
-#* Member: SetArgName Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Sets the Name for the Argument
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
+// Sets the Name for the Argument
void ArgInput::SetArgName(const OUString &aArg)
{
if(pFtArg !=NULL) pFtArg->SetText(aArg );
}
-/*************************************************************************
-#* Member: GetArgName Date:06.02.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Returns the Name for the Argument
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
+// Returns the Name for the Argument
OUString ArgInput::GetArgName()
{
OUString aPrivArgName;
@@ -294,56 +225,19 @@ OUString ArgInput::GetArgName()
return aPrivArgName;
}
-/*************************************************************************
-#* Member: SetArgName Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Sets the Name for the Argument
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//Sets the Name for the Argument
void ArgInput::SetArgNameFont (const Font &aFont)
{
if(pFtArg !=NULL) pFtArg->SetFont(aFont);
}
-/*************************************************************************
-#* Member: SetArgSelection Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Sets up the Selection for the EditBox.
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//Sets up the Selection for the EditBox.
void ArgInput::SetArgSelection (const Selection& rSel )
{
if(pEdArg !=NULL) pEdArg ->SetSelection(rSel );
}
-
-/*************************************************************************
-#* Member: SetArgVal Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Sets the Value for the Argument
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//Sets the Value for the Argument
void ArgInput::SetArgVal(const OUString &rVal)
{
if(pEdArg !=NULL)
@@ -352,19 +246,7 @@ void ArgInput::SetArgVal(const OUString &rVal)
}
}
-/*************************************************************************
-#* Member: SetArgName Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Returns the Value for the Argument
-#*
-#* Input: ---
-#*
-#* Output: String
-#*
-#************************************************************************/
+//Returns the Value for the Argument
OUString ArgInput::GetArgVal()
{
OUString aResult;
@@ -375,19 +257,7 @@ OUString ArgInput::GetArgVal()
return aResult;
}
-/*************************************************************************
-#* Member: SetArgName Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Hides the Controls
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//Hides the Controls
void ArgInput::Hide()
{
if ( pFtArg && pBtnFx && pEdArg && pRefBtn)
@@ -399,19 +269,7 @@ void ArgInput::Hide()
}
}
-/*************************************************************************
-#* Member: SetArgName Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Casts the Controls again.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//Casts the Controls again.
void ArgInput::Show()
{
if ( pFtArg && pBtnFx && pEdArg && pRefBtn)
@@ -437,247 +295,85 @@ void ArgInput::UpdateAccessibleNames()
pRefBtn->SetAccessibleName(aName);
}
-/*************************************************************************
-#* Member: FxClick Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::FxClick()
{
aFxClickLink.Call(this);
}
-/*************************************************************************
-#* Member: RefClick Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::RefClick()
{
aRefClickLink.Call(this);
}
-/*************************************************************************
-#* Member: FxFocus Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::FxFocus()
{
aFxFocusLink.Call(this);
}
-/*************************************************************************
-#* Member: RefFocus Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::RefFocus()
{
aRefFocusLink.Call(this);
}
-/*************************************************************************
-#* Member: EdFocus Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::EdFocus()
{
aEdFocusLink.Call(this);
}
-/*************************************************************************
-#* Member: EdModify Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Forwards the Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
void ArgInput::EdModify()
{
aEdModifyLink.Call(this);
}
-/*************************************************************************
-#* Handle: FxBtnHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Click-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn )
{
- if(pBtn==pBtnFx) FxClick();
+ if(pBtn == pBtnFx)
+ FxClick();
return 0;
}
-/*************************************************************************
-#* Handle: RefBtnClickHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Click-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn )
{
- if(pRefBtn==pBtn) RefClick();
+ if(pRefBtn == pBtn)
+ RefClick();
return 0;
}
-/*************************************************************************
-#* Handle: FxBtnFocusHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Focus-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn )
{
- if(pBtn==pBtnFx) FxFocus();
+ if(pBtn == pBtnFx)
+ FxFocus();
return 0;
}
-/*************************************************************************
-#* Handle: RefBtnFocusHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Focus-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, RefBtnFocusHdl,RefButton*, pBtn )
{
- if(pRefBtn==pBtn) RefFocus();
+ if(pRefBtn == pBtn)
+ RefFocus();
return 0;
}
-/*************************************************************************
-#* Handle: EdFocusHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Focus-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, EdFocusHdl, ArgEdit*, pEd )
{
- if(pEd==pEdArg) EdFocus();
+ if(pEd == pEdArg)
+ EdFocus();
return 0;
}
-/*************************************************************************
-#* Handle: RefBtnClickHdl Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Handle for Fx-Button Focus-Event.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
{
- if(pEd==pEdArg) EdModify();
+ if(pEd == pEdArg)
+ EdModify();
return 0;
}
-/*************************************************************************
-#* Member: EditBox Date:20.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: Constructor from Class ArgInput
-#*
-#* Input: Parent, Resource
-#*
-#* Output: ---
-#*
-#************************************************************************/
+// class EditBox
EditBox::EditBox( Window* pParent, const ResId& rResId )
:Control(pParent,rResId),
bMouseFlag(sal_False)
@@ -706,59 +402,22 @@ EditBox::~EditBox()
pMEdit=NULL;
delete pTheEdit;
}
-/*************************************************************************
-#* Member: EditBox Date:20.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: When the seleccion is changed this function will be called
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
+
+// When the selection is changed this function will be called
void EditBox::SelectionChanged()
{
aSelChangedLink.Call(this);
}
-/*************************************************************************
-#* Member: EditBox Date:20.05.98
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: When the size is changed, MultiLineEdit must
-#* be adapted..
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
+// When the size is changed, MultiLineEdit must be adapted..
void EditBox::Resize()
{
Size aSize=GetOutputSizePixel();
if(pMEdit!=NULL) pMEdit->SetOutputSizePixel(aSize);
}
-/*************************************************************************
-#* Member: GetFocus Date:26.05.98
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: When the Control is activated,
-#* the Selection is repealed and the Cursor set
-#* at the end.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
+// When the Control is activated, the Selection is repealed
+// and the Cursor set at the end.
void EditBox::GetFocus()
{
if(pMEdit!=NULL)
@@ -767,22 +426,8 @@ void EditBox::GetFocus()
}
}
-
-
-/*************************************************************************
-#* Member: EditBox Date:20.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: When an Event is cleared, this Routine is
-#* first called and a PostUserEvent is sent.
-#*
-#* Input: Notify-Event
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//When an Event is cleared, this Routine is
+//first called and a PostUserEvent is sent.
long EditBox::PreNotify( NotifyEvent& rNEvt )
{
long nResult=sal_True;
@@ -818,20 +463,8 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
return nResult;
}
-/*************************************************************************
-#* Member: EditBox Date:21.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: EditBox
-#*
-#* Function: When an Event cleared wurde, this routine is
-#* first called.
-#*
-#* Input: Key-Event
-#*
-#* Output: ---
-#*
-#************************************************************************/
+//When an Event cleared wurde, this routine is
+//first called.
IMPL_LINK_NOARG(EditBox, ChangedHdl)
{
if(pMEdit!=NULL)
@@ -855,11 +488,8 @@ void EditBox::UpdateOldSel()
if (pMEdit)
aOldSel = pMEdit->GetSelection();
}
-//----------------------------------------------------------------------------
-//============================================================================
-// class RefEdit
-//----------------------------------------------------------------------------
+// class RefEdit
#define SC_ENABLE_TIME 100
@@ -976,10 +606,8 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl)
return 0;
}
+//class RefButton
-//============================================================================
-// class RefButton
-//----------------------------------------------------------------------------
RefButton::RefButton( Window* _pParent, const ResId& rResId) :
ImageButton( _pParent, rResId ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
@@ -1039,8 +667,6 @@ void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit )
pRefEdit = pEdit;
}
-//----------------------------------------------------------------------------
-
void RefButton::Click()
{
if( pAnyRefDlg )
@@ -1070,7 +696,6 @@ void RefButton::LoseFocus()
pRefEdit->Modify();
}
-
} // formula
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 49800ac..ecd2ace 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -32,74 +32,82 @@ class IControlReferenceHandler;
class FORMULA_DLLPUBLIC RefEdit : public Edit
{
private:
- Timer aTimer;
- IControlReferenceHandler* pAnyRefDlg; // parent dialog
- Window* pLabelWidget;
+ Timer aTimer;
+ IControlReferenceHandler* pAnyRefDlg; // parent dialog
+ Window* pLabelWidget;
DECL_LINK( UpdateHdl, void* );
protected:
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void GetFocus();
+ virtual void LoseFocus();
public:
- RefEdit( Window* _pParent,IControlReferenceHandler* pParent,
- Window* pShrinkModeLabel, const ResId& rResId );
- RefEdit( Window* _pParent, Window* pShrinkModeLabel,
- WinBits nStyle = WB_BORDER );
- virtual ~RefEdit();
+ RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId );
+ RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER );
- void SetRefString( const OUString& rStr );
+ virtual ~RefEdit();
+
+ void SetRefString( const OUString& rStr );
/**
* Flag reference valid or invalid, which in turn changes the visual
* appearance of the control accordingly.
*/
- void SetRefValid(bool bValid);
+ void SetRefValid(bool bValid);
using Edit::SetText;
- void SetText( const OUString& rStr );
- virtual void Modify();
- void StartUpdateData();
+ void SetText( const OUString& rStr );
+ virtual void Modify();
- void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget );
- IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; }
- Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; }
-};
+ void StartUpdateData();
+ void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget );
+
+ IControlReferenceHandler* GetRefDialog()
+ {
+ return pAnyRefDlg;
+ }
+
+ Window* GetLabelWidgetForShrinkMode()
+ {
+ return pLabelWidget;
+ }
+};
-//============================================================================
class FORMULA_DLLPUBLIC RefButton : public ImageButton
{
private:
- Image aImgRefStart; /// Start reference input
- Image aImgRefDone; /// Stop reference input
- OUString aShrinkQuickHelp;
- OUString aExpandQuickHelp;
- IControlReferenceHandler* pAnyRefDlg; // parent dialog
- RefEdit* pRefEdit; // zugeordnetes Edit-Control
+ Image aImgRefStart; // Start reference input
+ Image aImgRefDone; // Stop reference input
+ OUString aShrinkQuickHelp;
+ OUString aExpandQuickHelp;
+ IControlReferenceHandler* pAnyRefDlg; // parent dialog
+ RefEdit* pRefEdit; // zugeordnetes Edit-Control
protected:
- virtual void Click();
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual void Click();
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void GetFocus();
+ virtual void LoseFocus();
public:
- RefButton(Window* _pParent, const ResId& rResId);
- RefButton(Window* _pParent, WinBits nStyle = 0);
- RefButton(Window* _pParent, const ResId& rResId,
- RefEdit* pEdit, IControlReferenceHandler* pDlg);
-
- void SetReferences( IControlReferenceHandler* pDlg,
- RefEdit* pEdit );
-
- void SetStartImage();
- void SetEndImage();
- void DoRef() { Click(); }
+ RefButton(Window* _pParent, const ResId& rResId);
+ RefButton(Window* _pParent, WinBits nStyle = 0);
+ RefButton(Window* _pParent, const ResId& rResId,
+ RefEdit* pEdit, IControlReferenceHandler* pDlg);
+
+ void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit );
+
+ void SetStartImage();
+ void SetEndImage();
+ void DoRef()
+ {
+ Click();
+ }
};
} // formula
More information about the Libreoffice-commits
mailing list