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

Use data member and member methods instead of global and macros...

Browse source
This commit is contained in:
Kohei Yoshida 2011-03-11 20:22:38 -05:00
parent 4b6758383c
commit f0a0ac5106
2 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@
class ScViewData;
class ScDocument;
struct ScNameDlgImpl;
//==================================================================
@ -79,12 +79,17 @@ private:
const ScAddress theCursorPos;
Selection theCurSel;
ScNameDlgImpl* mpImpl;
private:
void Init();
void UpdateChecks();
void UpdateNames();
void CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData );
void SaveData();
void RestoreData();
// Handler:
DECL_LINK( OkBtnHdl, void * );
DECL_LINK( CancelBtnHdl, void * );
@ -95,10 +100,8 @@ private:
DECL_LINK( AssignGetFocusHdl, void * );
protected:
virtual void RefInputDone( BOOL bForced = FALSE );
public:
ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScViewData* ptrViewData,

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

@ -62,9 +62,9 @@
// Hilfsklasse: Merken der aktuellen Bereichsoptionen,
// wenn ein Name in der ComboBox gefunden wird.
struct SaveData
struct ScNameDlgImpl
{
SaveData()
ScNameDlgImpl()
: bCriteria(FALSE),bPrintArea(FALSE),
bColHeader(FALSE),bRowHeader(FALSE),
bDirty(FALSE) {}
@ -85,27 +85,6 @@ struct SaveData
BOOL bDirty:1;
};
static SaveData* pSaveObj = NULL;
#define SAVE_DATA() \
pSaveObj->aStrSymbol = aEdAssign.GetText(); \
pSaveObj->bCriteria = aBtnCriteria.IsChecked(); \
pSaveObj->bPrintArea = aBtnPrintArea.IsChecked(); \
pSaveObj->bColHeader = aBtnColHeader.IsChecked(); \
pSaveObj->bRowHeader = aBtnRowHeader.IsChecked(); \
pSaveObj->bDirty = TRUE;
#define RESTORE_DATA() \
if ( pSaveObj->bDirty ) \
{ \
aEdAssign.SetText( pSaveObj->aStrSymbol ); \
aBtnCriteria.Check( pSaveObj->bCriteria ); \
aBtnPrintArea.Check( pSaveObj->bPrintArea ); \
aBtnColHeader.Check( pSaveObj->bColHeader ); \
aBtnRowHeader.Check( pSaveObj->bRowHeader ); \
pSaveObj->bDirty = FALSE; \
}
#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
@ -150,16 +129,16 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
theCursorPos ( aCursorPos ) // zum Berechnen der Referenzen
theCursorPos ( aCursorPos ),
mpImpl(new ScNameDlgImpl)
{
pSaveObj = new SaveData;
Init();
FreeResource();
}
ScNameDlg::~ScNameDlg()
{
DELETEZ( pSaveObj );
delete mpImpl;
}
void ScNameDlg::Init()
@ -209,7 +188,7 @@ void ScNameDlg::Init()
EdModifyHdl( 0 );
bSaved=TRUE;
SAVE_DATA()
SaveData();
//@BugID 54702
//SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
@ -337,6 +316,29 @@ void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
}
}
void ScNameDlg::SaveData()
{
mpImpl->aStrSymbol = aEdAssign.GetText();
mpImpl->bCriteria = aBtnCriteria.IsChecked();
mpImpl->bPrintArea = aBtnPrintArea.IsChecked();
mpImpl->bColHeader = aBtnColHeader.IsChecked();
mpImpl->bRowHeader = aBtnRowHeader.IsChecked();
mpImpl->bDirty = true;
}
void ScNameDlg::RestoreData()
{
if ( mpImpl->bDirty )
{
aEdAssign.SetText( mpImpl->aStrSymbol );
aBtnCriteria.Check( mpImpl->bCriteria );
aBtnPrintArea.Check( mpImpl->bPrintArea );
aBtnColHeader.Check( mpImpl->bColHeader );
aBtnRowHeader.Check( mpImpl->bRowHeader );
mpImpl->bDirty = false;
}
}
IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
{
if ( aBtnAdd.IsEnabled() )
@ -405,14 +407,14 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
aLocalRangeName.erase(*pData);
}
else
pSaveObj->Clear();
mpImpl->Clear();
if ( !aLocalRangeName.insert( pNewEntry ) )
delete pNewEntry;
UpdateNames();
bSaved=FALSE;
RESTORE_DATA()
RestoreData();
aEdName.SetText(EMPTY_STRING);
aEdName.GrabFocus();
UpdateChecks();
@ -465,7 +467,7 @@ IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
UpdateNames();
UpdateChecks();
bSaved=FALSE;
RESTORE_DATA()
RestoreData();
theCurSel = Selection( 0, SELECTION_MAX );
aBtnAdd.SetText( aStrAdd );
aBtnAdd.Disable();
@ -524,7 +526,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
if(!bSaved)
{
bSaved=TRUE;
SAVE_DATA()
SaveData();
}
NameSelectHdl( 0 );
}
@ -535,7 +537,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
aBtnRemove.Disable();
bSaved=FALSE;
RESTORE_DATA()
RestoreData();
}
theSymbol = aEdAssign.GetText();