Kaydet (Commit) b6f8bc08 authored tarafından Caolán McNamara's avatar Caolán McNamara

split out format table page and adapt code

Change-Id: Iecc66a0a26c6944bd398f79eb760694405b17e70
üst 00dc46b5
...@@ -23,6 +23,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\ ...@@ -23,6 +23,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/endnotepage \ sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \ sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/exchangedatabases \ sw/uiconfig/swriter/ui/exchangedatabases \
sw/uiconfig/swriter/ui/formattablepage \
sw/uiconfig/swriter/ui/footnotepage \ sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \ sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbookmark \ sw/uiconfig/swriter/ui/insertbookmark \
......
...@@ -46,18 +46,25 @@ public: ...@@ -46,18 +46,25 @@ public:
PercentFieldWrap(); PercentFieldWrap();
void set(MetricField *pField); void set(MetricField *pField);
const MetricField* get() const { return m_pField; }
void SetUpHdl(const Link& rLink) { m_pField->SetUpHdl(rLink); } void SetUpHdl(const Link& rLink) { m_pField->SetUpHdl(rLink); }
void SetDownHdl(const Link& rLink) { m_pField->SetDownHdl(rLink); } void SetDownHdl(const Link& rLink) { m_pField->SetDownHdl(rLink); }
void SetLoseFocusHdl(const Link& rLink) { m_pField->SetLoseFocusHdl(rLink); } void SetLoseFocusHdl(const Link& rLink) { m_pField->SetLoseFocusHdl(rLink); }
void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); } void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); }
void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); } void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); }
bool HasFocus() const { return m_pField->HasFocus(); }
void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); } void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); }
void SetText(const OUString& rStr) { m_pField->SetText(rStr); } void SetText(const OUString& rStr) { m_pField->SetText(rStr); }
void SaveValue() { m_pField->SaveValue(); }
OUString GetSavedValue() const { return m_pField->GetSavedValue(); }
OUString GetText() const { return m_pField->GetText(); }
void SetMetricFieldMin(sal_Int64 nNewMin) { m_pField->SetMin(nNewMin); } void SetMetricFieldMin(sal_Int64 nNewMin) { m_pField->SetMin(nNewMin); }
void SetMetricFieldMax(sal_Int64 nNewMax) { m_pField->SetMax(nNewMax); } void SetMetricFieldMax(sal_Int64 nNewMax) { m_pField->SetMax(nNewMax); }
void SetValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE); void SetValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
void SetLast(sal_Int64 nNewLast) { m_pField->SetLast(nNewLast); }
void SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE); void SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
void SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE); void SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
......
This diff is collapsed.
...@@ -38,34 +38,28 @@ struct TColumn ...@@ -38,34 +38,28 @@ struct TColumn
class SwFormatTablePage : public SfxTabPage class SwFormatTablePage : public SfxTabPage
{ {
FixedLine aOptionsFL; TableNameEdit* m_pNameED;
FixedText aNameFT; FixedText* m_pWidthFT;
TableNameEdit aNameED; PercentFieldWrap m_aWidthMF;
FixedText aWidthFT; CheckBox* m_pRelWidthCB;
PercentField aWidthMF;
CheckBox aRelWidthCB; RadioButton* m_pFullBtn;
RadioButton* m_pLeftBtn;
FixedLine aPosFL; RadioButton* m_pFromLeftBtn;
RadioButton aFullBtn; RadioButton* m_pRightBtn;
RadioButton aLeftBtn; RadioButton* m_pCenterBtn;
RadioButton aFromLeftBtn; RadioButton* m_pFreeBtn;
RadioButton aRightBtn;
RadioButton aCenterBtn; FixedText* m_pLeftFT;
RadioButton aFreeBtn; PercentFieldWrap m_aLeftMF;
FixedText* m_pRightFT;
FixedLine aDistFL; PercentFieldWrap m_aRightMF;
FixedText aLeftFT; FixedText* m_pTopFT;
PercentField aLeftMF; MetricField* m_pTopMF;
FixedText aRightFT; FixedText* m_pBottomFT;
PercentField aRightMF; MetricField* m_pBottomMF;
FixedText aTopFT;
MetricField aTopMF; ListBox* m_pTextDirectionLB;
FixedText aBottomFT;
MetricField aBottomMF;
FixedLine aPropertiesFL;
FixedText aTextDirectionFT;
ListBox aTextDirectionLB;
SwTableRep* pTblData; SwTableRep* pTblData;
SwTwips nSaveWidth; SwTwips nSaveWidth;
...@@ -76,7 +70,7 @@ class SwFormatTablePage : public SfxTabPage ...@@ -76,7 +70,7 @@ class SwFormatTablePage : public SfxTabPage
sal_Bool bHtmlMode : 1; sal_Bool bHtmlMode : 1;
void Init(); void Init();
void ModifyHdl( Edit* pEdit ); void ModifyHdl(const Edit* pEdit);
DECL_LINK( AutoClickHdl, CheckBox * ); DECL_LINK( AutoClickHdl, CheckBox * );
DECL_LINK( RelWidthClickHdl, CheckBox * ); DECL_LINK( RelWidthClickHdl, CheckBox * );
......
This diff is collapsed.
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