Kaydet (Commit) 14914835 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

split the cond format entry code a bit up

Change-Id: Ib066c18d54ac40c24b51ca5c399d09482897709f
üst 5240022f
...@@ -330,6 +330,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ ...@@ -330,6 +330,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/cctrl/tbinsert \ sc/source/ui/cctrl/tbinsert \
sc/source/ui/cctrl/tbzoomsliderctrl \ sc/source/ui/cctrl/tbzoomsliderctrl \
sc/source/ui/condformat/condformatdlg \ sc/source/ui/condformat/condformatdlg \
sc/source/ui/condformat/condformatdlgentry \
sc/source/ui/condformat/condformathelper \ sc/source/ui/condformat/condformathelper \
sc/source/ui/condformat/colorformat \ sc/source/ui/condformat/colorformat \
sc/source/ui/dbgui/asciiopt \ sc/source/ui/dbgui/asciiopt \
......
This diff is collapsed.
...@@ -47,6 +47,7 @@ class ScConditionalFormat; ...@@ -47,6 +47,7 @@ class ScConditionalFormat;
class ScFormatEntry; class ScFormatEntry;
class ScConditionalFormat; class ScConditionalFormat;
struct ScDataBarFormatData; struct ScDataBarFormatData;
class ScCondFrmtEntry;
namespace condformat { namespace condformat {
...@@ -64,104 +65,6 @@ enum ScCondFormatDialogType ...@@ -64,104 +65,6 @@ enum ScCondFormatDialogType
} }
class ScCondFrmtEntry : public Control
{
private:
bool mbActive;
ScCondFormatEntryType meType;
Link maClickHdl;
//general ui elements
ListBox maLbType;
FixedText maFtCondNr;
FixedText maFtCondition;
//cond format ui elements
ListBox maLbCondType;
Edit maEdVal1;
Edit maEdVal2;
FixedText maFtStyle;
ListBox maLbStyle;
SvxFontPrevWindow maWdPreview;
//color format ui elements
ListBox maLbColorFormat;
//color scale ui elements
ListBox maLbColScale2;
ListBox maLbColScale3;
ListBox maLbEntryTypeMin;
ListBox maLbEntryTypeMiddle;
ListBox maLbEntryTypeMax;
Edit maEdMin;
Edit maEdMiddle;
Edit maEdMax;
ColorListBox maLbColMin;
ColorListBox maLbColMiddle;
ColorListBox maLbColMax;
//data bar ui elements
ListBox maLbDataBarMinType;
ListBox maLbDataBarMaxType;
Edit maEdDataBarMin;
Edit maEdDataBarMax;
PushButton maBtOptions;
boost::scoped_ptr<ScDataBarFormatData> mpDataBarData;
//
void SetCondType();
void SetColorScaleType();
void SetDataBarType();
void SetFormulaType();
void HideCondElements();
void HideColorScaleElements();
void HideDataBarElements();
void SwitchToType(ScCondFormatEntryType eType);
void SetHeight();
void Init();
ScFormatEntry* createConditionEntry() const;
ScFormatEntry* createColorscaleEntry() const;
ScFormatEntry* createDatabarEntry() const;
ScFormatEntry* createFormulaEntry() const;
ScDocument* mpDoc;
ScAddress maPos;
sal_Int32 mnIndex;
rtl::OUString maStrCondition;
DECL_LINK( TypeListHdl, void*);
DECL_LINK( ColFormatTypeHdl, void*);
DECL_LINK( StyleSelectHdl, void* );
DECL_LINK( OptionBtnHdl, void* );
DECL_LINK( DataBarTypeSelectHdl, void* );
DECL_LINK( ConditionTypeSelectHdl, void* );
DECL_LINK( EntryTypeHdl, ListBox* );
DECL_LINK( EdModifyHdl, Edit* );
public:
ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos );
ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScFormatEntry* pFormatEntry, const ScAddress& rPos );
virtual ~ScCondFrmtEntry();
virtual long Notify( NotifyEvent& rNEvt );
void SetType( ScCondFormatEntryType eType );
void Select();
void Deselect();
bool IsSelected() const;
void SetIndex(sal_Int32 nIndex);
ScFormatEntry* GetEntry() const;
};
class ScCondFormatList : public Control class ScCondFormatList : public Control
{ {
private: private:
...@@ -177,6 +80,7 @@ private: ...@@ -177,6 +80,7 @@ private:
void RecalcAll(); void RecalcAll();
void DoScroll(long nDiff); void DoScroll(long nDiff);
public: public:
ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat,
const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType);
...@@ -188,6 +92,8 @@ public: ...@@ -188,6 +92,8 @@ public:
DECL_LINK( ScrollHdl, void* ); DECL_LINK( ScrollHdl, void* );
DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* ); DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
DECL_LINK( TypeListHdl, ListBox*);
DECL_LINK( ColFormatTypeHdl, ListBox*);
}; };
class ScCondFormatDlg : public ScAnyRefDlg class ScCondFormatDlg : public ScAnyRefDlg
......
#include "colorscale.hxx"
#include "conditio.hxx"
class ScCondFrmtEntry : public Control
{
private:
bool mbActive;
Link maClickHdl;
//general ui elements
ListBox maLbType;
FixedText maFtCondNr;
FixedText maFtCondition;
void SetHeight();
void Init();
sal_Int32 mnIndex;
rtl::OUString maStrCondition;
protected:
ScDocument* mpDoc;
ScAddress maPos;
DECL_LINK( EdModifyHdl, Edit* );
public:
ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos );
virtual ~ScCondFrmtEntry();
virtual long Notify( NotifyEvent& rNEvt );
void Select();
void Deselect();
bool IsSelected() const;
void SetIndex(sal_Int32 nIndex);
virtual ScFormatEntry* GetEntry() const = 0;
};
class ScConditionFrmtEntry : public ScCondFrmtEntry
{
//cond format ui elements
ListBox maLbCondType;
Edit maEdVal1;
Edit maEdVal2;
FixedText maFtStyle;
ListBox maLbStyle;
SvxFontPrevWindow maWdPreview;
ScFormatEntry* createConditionEntry() const;
ScFormatEntry* createFormulaEntry() const;
void SetHeight();
void Init();
DECL_LINK( StyleSelectHdl, void* );
DECL_LINK( ConditionTypeSelectHdl, void* );
public:
ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL );
virtual ScFormatEntry* GetEntry() const;
};
class ScColorScaleFrmtEntry : public ScCondFrmtEntry
{
//color format ui elements
//ListBox maLbColorFormat;
//color scale ui elements
ListBox maLbColScale2;
ListBox maLbColScale3;
ListBox maLbEntryTypeMin;
ListBox maLbEntryTypeMiddle;
ListBox maLbEntryTypeMax;
Edit maEdMin;
Edit maEdMiddle;
Edit maEdMax;
ColorListBox maLbColMin;
ColorListBox maLbColMiddle;
ColorListBox maLbColMax;
ScFormatEntry* createColorscaleEntry() const;
void SetHeight();
void Init();
DECL_LINK( EntryTypeHdl, ListBox* );
public:
ScColorScaleFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL );
virtual ScFormatEntry* GetEntry() const;
};
class ScDataBarFrmtEntry : public ScCondFrmtEntry
{
//color format ui elements
//ListBox maLbColorFormat;
//data bar ui elements
ListBox maLbDataBarMinType;
ListBox maLbDataBarMaxType;
Edit maEdDataBarMin;
Edit maEdDataBarMax;
PushButton maBtOptions;
boost::scoped_ptr<ScDataBarFormatData> mpDataBarData;
ScFormatEntry* createDatabarEntry() const;
void SetHeight();
void Init();
DECL_LINK( OptionBtnHdl, void* );
DECL_LINK( DataBarTypeSelectHdl, void* );
public:
ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL );
virtual ScFormatEntry* GetEntry() const;
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment