strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanups.

Browse source
This commit is contained in:
Kohei Yoshida 2011-03-11 19:38:19 -05:00
parent 65f4809a0a
commit 4b6758383c
2 changed files with 3 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sc/source/ui/inc/namedlg.hxx
View file

@ -79,7 +79,6 @@ private:
const ScAddress theCursorPos;
Selection theCurSel;
#ifdef _NAMEDLG_CXX
private:
void Init();
void UpdateChecks();
@ -94,7 +93,6 @@ private:
DECL_LINK( EdModifyHdl, Edit * );
DECL_LINK( NameSelectHdl, void * );
DECL_LINK( AssignGetFocusHdl, void * );
#endif
protected:

54
sc/source/ui/namedlg/namedlg.cxx
View file

@ -42,10 +42,8 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "namedlg.hrc"
#define _NAMEDLG_CXX
#include "namedlg.hxx"
#undef _NAMEDLG_CXX
#include <vcl/msgbox.hxx>
@ -159,17 +157,11 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
FreeResource();
}
//----------------------------------------------------------------------------
ScNameDlg::~ScNameDlg()
{
DELETEZ( pSaveObj );
}
//----------------------------------------------------------------------------
void ScNameDlg::Init()
{
String aAreaStr;
@ -223,7 +215,6 @@ void ScNameDlg::Init()
//SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
//----------------------------------------------------------------------------
BOOL ScNameDlg::IsRefInputMode() const
{
return aEdAssign.IsEnabled();
@ -252,25 +243,17 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
}
}
//----------------------------------------------------------------------------
BOOL ScNameDlg::Close()
{
return DoClose( ScNameDlgWrapper::GetChildWindowId() );
}
//----------------------------------------------------------------------------
void ScNameDlg::SetActive()
{
aEdAssign.GrabFocus();
RefInputDone();
}
//----------------------------------------------------------------------------
void ScNameDlg::UpdateChecks()
{
const ScRangeData* pData = aLocalRangeName.findByName(aEdName.GetText());
@ -311,9 +294,6 @@ void ScNameDlg::UpdateChecks()
}
}
//----------------------------------------------------------------------------
void ScNameDlg::UpdateNames()
{
aEdName.SetUpdateMode( FALSE );
@ -343,9 +323,6 @@ void ScNameDlg::UpdateNames()
aEdName.Invalidate();
}
//----------------------------------------------------------------------------
void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
{
if ( pRangeData )
@ -360,11 +337,6 @@ void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
}
}
//----------------------------------------------------------------------------
// Handler:
// ========
IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
{
if ( aBtnAdd.IsEnabled() )
@ -380,18 +352,11 @@ IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
return 0;
}
//----------------------------------------------------------------------------
IMPL_LINK_INLINE_START( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
{
Close();
return 0;
}
IMPL_LINK_INLINE_END( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
//----------------------------------------------------------------------------
IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
{
@ -481,9 +446,6 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
return bAdded;
}
//----------------------------------------------------------------------------
IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
{
const String aStrEntry = aEdName.GetText();
@ -513,9 +475,6 @@ IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
return 0;
}
//----------------------------------------------------------------------------
IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG )
{
ScRangeData* pData = aLocalRangeName.findByName(aEdName.GetText());
@ -532,9 +491,6 @@ IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG )
return 0;
}
//----------------------------------------------------------------------------
IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
{
String theName = aEdName.GetText();
@ -614,14 +570,10 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
return 0;
}
//------------------------------------------------------------------------
IMPL_LINK_INLINE_START( ScNameDlg, AssignGetFocusHdl, void *, EMPTYARG )
IMPL_LINK( ScNameDlg, AssignGetFocusHdl, void *, EMPTYARG )
{
EdModifyHdl( &aEdAssign );
return 0;
}
IMPL_LINK_INLINE_END( ScNameDlg, AssignGetFocusHdl, void *, EMPTYARG )
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */