[Libreoffice-commits] .: 5 commits - cui/source cui/uiconfig filter/source filter/uiconfig sw/source sw/uiconfig sw/UI_swriter.mk vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 11 11:43:17 PST 2013
cui/source/tabpages/chardlg.cxx | 22
cui/source/tabpages/numfmt.cxx | 10
cui/uiconfig/ui/charnamepage.ui | 32 +
cui/uiconfig/ui/numberingformatpage.ui | 23
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 12
filter/uiconfig/ui/testxmlfilter.ui | 22
sw/UI_swriter.mk | 1
sw/source/ui/dialog/wordcountdialog.cxx | 11
sw/source/ui/inc/prcntfld.hxx | 7
sw/source/ui/misc/docfnote.cxx | 8
sw/source/ui/table/tabledlg.cxx | 457 ++++++++---------
sw/source/ui/table/tablepg.hxx | 52 -
sw/uiconfig/swriter/ui/footnotepage.ui | 11
sw/uiconfig/swriter/ui/formattablepage.ui | 611 +++++++++++++++++++++++
sw/uiconfig/swriter/ui/tableproperties.ui | 574 ---------------------
sw/uiconfig/swriter/ui/wordcount.ui | 13
vcl/inc/vcl/builder.hxx | 15
vcl/inc/vcl/combobox.hxx | 11
vcl/inc/vcl/layout.hxx | 52 +
vcl/inc/vcl/window.hxx | 13
vcl/inc/window.h | 2
vcl/source/control/combobox.cxx | 107 ++--
vcl/source/window/builder.cxx | 80 +++
vcl/source/window/layout.cxx | 58 ++
vcl/source/window/window.cxx | 7
vcl/source/window/window2.cxx | 141 ++++-
26 files changed, 1347 insertions(+), 1005 deletions(-)
New commits:
commit 89cb169b49de363ac290c23cb228675d022f5cda
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 11 13:01:21 2013 +0000
use sizegroups instead of explicit code
Change-Id: I2376e69adf235d1e6f89296c50a9cea76041f9d7
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ff52f40..123079b 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -260,20 +260,6 @@ struct SvxCharNamePage_Impl
}
};
-namespace
-{
- void equalize_width_requests(Window *pA, Window *pB, Window *pC)
- {
- long nWidthWest = pA->get_preferred_size().Width();
- long nWidthEast = pB->get_preferred_size().Width();
- long nWidthCTL = pC->get_preferred_size().Width();
- long nLargest = std::max(nWidthWest, std::max(nWidthEast, nWidthCTL));
- pA->set_width_request(nLargest);
- pB->set_width_request(nLargest);
- pC->set_width_request(nLargest);
- }
-}
-
// class SvxCharNamePage -------------------------------------------------
SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
@@ -380,10 +366,6 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
m_pWestFontStyleLB->set_height_request(nHeight);
m_pWestFontSizeLB->set_height_request(nHeight);
}
- else
- {
- equalize_width_requests(m_pWestFontLanguageLB, m_pEastFontLanguageLB, m_pCTLFontLanguageLB);
- }
Initialize();
}
@@ -1192,10 +1174,6 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet )
Reset_Impl( rSet, Asian );
Reset_Impl( rSet, Ctl );
- equalize_width_requests(m_pWestFontNameLB, m_pEastFontNameLB, m_pCTLFontNameLB);
- equalize_width_requests(m_pWestFontStyleLB, m_pEastFontStyleLB, m_pCTLFontStyleLB);
- equalize_width_requests(m_pWestFontSizeLB, m_pEastFontSizeLB, m_pCTLFontSizeLB);
-
SetPrevFontWidthScale( rSet );
UpdatePreview_Impl();
}
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 88202b6..01267b7 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -784,4 +784,36 @@
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westlanglb-cjk"/>
+ <widget name="eastlanglb"/>
+ <widget name="ctllanglb"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westfontnameft-cjk"/>
+ <widget name="eastfontnameft"/>
+ <widget name="ctlfontnameft"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="weststylelb-cjk"/>
+ <widget name="eaststylelb"/>
+ <widget name="ctlstylelb"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="westsizelb-cjk"/>
+ <widget name="eastsizelb"/>
+ <widget name="ctlsizelb"/>
+ </widgets>
+ </object>
</interface>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 0c04cad..45742df 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -156,18 +156,6 @@ XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
get(m_pPBRecentFile, "recentfile");
get(m_pFTNameOfRecentFile, "recentfilename");
- long nWidth =
- std::max(m_pPBExportBrowse->get_preferred_size().Width(),
- std::max(m_pPBCurrentDocument->get_preferred_size().Width(),
- std::max(m_pPBImportBrowse->get_preferred_size().Width(),
- m_pPBRecentFile->get_preferred_size().Width())));
-
- //make sure that the second columns of the two disconnected
- //grids are of equal width by ensuring that the widest
- //entry in each equals
- m_pPBExportBrowse->set_width_request(nWidth);
- m_pPBImportBrowse->set_width_request(nWidth);
-
get(m_pPBClose, "close");
m_pPBExportBrowse->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
diff --git a/filter/uiconfig/ui/testxmlfilter.ui b/filter/uiconfig/ui/testxmlfilter.ui
index fee4a79..a82fe11 100644
--- a/filter/uiconfig/ui/testxmlfilter.ui
+++ b/filter/uiconfig/ui/testxmlfilter.ui
@@ -18,13 +18,11 @@
<child>
<object class="GtkButton" id="close">
<property name="label">gtk-close</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -36,11 +34,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -115,11 +111,9 @@
<child>
<object class="GtkButton" id="exportbrowse">
<property name="label" translatable="yes">Browse...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -131,11 +125,9 @@
<child>
<object class="GtkButton" id="currentdocument">
<property name="label" translatable="yes">Current Document</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -232,11 +224,9 @@
<child>
<object class="GtkButton" id="importbrowse">
<property name="label" translatable="yes">Browse...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -248,11 +238,9 @@
<child>
<object class="GtkButton" id="recentfile">
<property name="label" translatable="yes">Recent File</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -292,11 +280,9 @@
<child>
<object class="GtkCheckButton" id="displaysource">
<property name="label" translatable="yes">Display source</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -391,4 +377,12 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="exportbrowse"/>
+ <widget name="currentdocument"/>
+ <widget name="importbrowse"/>
+ <widget name="recentfile"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 5a43642..5264293 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -102,17 +102,6 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
get(m_pClosePB, "close");
- long nPrefWidth = m_pCurrentWordFT->get_preferred_size().Width();
-
- m_pCurrentWordFT->set_width_request(nPrefWidth);
- m_pCurrentCharacterFT->set_width_request(nPrefWidth);
- m_pCurrentCharacterExcludingSpacesFT->set_width_request(nPrefWidth);
- m_pCurrentCjkcharsFT->set_width_request(nPrefWidth);
- m_pDocWordFT->set_width_request(nPrefWidth);
- m_pDocCharacterFT->set_width_request(nPrefWidth);
- m_pDocCharacterExcludingSpacesFT->set_width_request(nPrefWidth);
- m_pDocCjkcharsFT->set_width_request(nPrefWidth);
-
showCJK(SvtCJKOptions().IsAnyEnabled());
Initialize(pInfo);
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 3a59919..9e3bad2 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -117,14 +117,6 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, sal_Bool bEN,
get(m_pPageTemplBox, "pagestylelb");
get(m_pFtnCharAnchorTemplBox, "charanchorstylelb");
get(m_pFtnCharTextTemplBox, "charstylelb");
-
- long nWidth = std::max(std::max(
- m_pPrefixED->get_preferred_size().Width(),
- m_pSuffixED->get_preferred_size().Width()),
- m_pNumViewBox->get_preferred_size().Width());
- m_pPrefixED->set_width_request(nWidth);
- m_pSuffixED->set_width_request(nWidth);
- m_pNumViewBox->set_width_request(nWidth);
}
void SwEndNoteOptionPage::Reset( const SfxItemSet& )
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index 32056a5..6ffe813 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -117,11 +117,9 @@
<child>
<object class="GtkRadioButton" id="pospagecb">
<property name="label" translatable="yes">End of page</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">posdoccb</property>
@@ -136,11 +134,9 @@
<child>
<object class="GtkRadioButton" id="posdoccb">
<property name="label" translatable="yes">End of document</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">pospagecb</property>
@@ -579,4 +575,11 @@
</row>
</data>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="prefix"/>
+ <widget name="suffix"/>
+ <widget name="numberinglb"/>
+ </widgets>
+ </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index c04be51..c0b0224 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -331,4 +331,17 @@
<action-widget response="0">close</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="selectwords"/>
+ <widget name="selectchars"/>
+ <widget name="selectcharsnospaces"/>
+ <widget name="docwords"/>
+ <widget name="docchars"/>
+ <widget name="doccharsnospaces"/>
+ <widget name="selectcjkchars"/>
+ <widget name="doccjkchars"/>
+ </widgets>
+ </object>
</interface>
commit b6f8bc08cdb514639fcc15d6ad76406478e44f54
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 10 22:58:10 2013 +0000
split out format table page and adapt code
Change-Id: Iecc66a0a26c6944bd398f79eb760694405b17e70
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 2caf62f..95d6564 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/exchangedatabases \
+ sw/uiconfig/swriter/ui/formattablepage \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index d87fe600..b13a0e2 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -46,18 +46,25 @@ public:
PercentFieldWrap();
void set(MetricField *pField);
+ const MetricField* get() const { return m_pField; }
void SetUpHdl(const Link& rLink) { m_pField->SetUpHdl(rLink); }
void SetDownHdl(const Link& rLink) { m_pField->SetDownHdl(rLink); }
void SetLoseFocusHdl(const Link& rLink) { m_pField->SetLoseFocusHdl(rLink); }
void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); }
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 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 SetMetricFieldMax(sal_Int64 nNewMax) { m_pField->SetMax(nNewMax); }
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 SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE);
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index abf96ed..a41c76b 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -63,58 +63,43 @@
using namespace ::com::sun::star;
-SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SW_RES( TP_FORMAT_TABLE ), rSet ),
- aOptionsFL(this, SW_RES( FL_OPTIONS )),
- aNameFT(this, SW_RES( FT_NAME )),
- aNameED(this, SW_RES( ED_NAME )),
- aWidthFT(this, SW_RES( FT_WIDTH )),
- aWidthMF(this, SW_RES( ED_WIDTH )),
- aRelWidthCB(this, SW_RES( CB_REL_WIDTH )),
-
- aPosFL(this, SW_RES( FL_POS )),
- aFullBtn(this, SW_RES( RB_FULL )),
- aLeftBtn(this, SW_RES( RB_LEFT )),
- aFromLeftBtn(this, SW_RES( RB_FROM_LEFT )),
- aRightBtn(this, SW_RES( RB_RIGHT )),
- aCenterBtn(this, SW_RES( RB_CENTER )),
- aFreeBtn(this, SW_RES( RB_FREE )),
-
- aDistFL(this, SW_RES( FL_DIST )),
- aLeftFT(this, SW_RES( FT_LEFT_DIST )),
- aLeftMF(this, SW_RES( ED_LEFT_DIST )),
- aRightFT(this, SW_RES( FT_RIGHT_DIST )),
- aRightMF(this, SW_RES( ED_RIGHT_DIST )),
- aTopFT (this, SW_RES( FT_TOP_DIST )),
- aTopMF(this, SW_RES( ED_TOP_DIST )),
- aBottomFT(this, SW_RES( FT_BOTTOM_DIST )),
- aBottomMF(this, SW_RES( ED_BOTTOM_DIST )),
-
- aPropertiesFL(this, SW_RES( FL_PROPERTIES )),
- aTextDirectionFT(this, SW_RES( FT_TEXTORIENTATION )),
- aTextDirectionLB(this, SW_RES( LB_TEXTORIENTATION )),
-
- pTblData(0),
- nSaveWidth(0),
- nMinTableWidth(MINLAY),
- bModified(sal_False),
- bFull(0),
- bHtmlMode(sal_False)
+SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", rSet)
+ , pTblData(0)
+ , nSaveWidth(0)
+ , nMinTableWidth(MINLAY)
+ , bModified(sal_False)
+ , bFull(0)
+ , bHtmlMode(sal_False)
{
- FreeResource();
+ get(m_pNameED, "name");
+ get(m_pWidthFT, "widthft");
+ m_aWidthMF.set(get<MetricField>("widthmf"));
+ m_aLeftMF.set(get<MetricField>("leftmf"));
+ m_aRightMF.set(get<MetricField>("rightmf"));
+ get(m_pRelWidthCB, "relwidth");
+ get(m_pFullBtn, "full");
+ get(m_pLeftBtn, "left");
+ get(m_pFromLeftBtn, "fromleft");
+ get(m_pRightBtn, "right");
+ get(m_pCenterBtn, "center");
+ get(m_pFreeBtn, "free");
+ get(m_pLeftFT, "leftft");
+ get(m_pRightFT, "rightft");
+ get(m_pTopFT, "aboveft");
+ get(m_pTopMF, "abovemf");
+ get(m_pBottomFT, "belowft");
+ get(m_pBottomMF, "belowmf");
+ get(m_pTextDirectionLB, "textdirection");
+
SetExchangeSupport();
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem))
bHtmlMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON);
- sal_Bool bCTL = SW_MOD()->GetCTLOptions().IsCTLFontEnabled();
- if( !bHtmlMode && bCTL )
- {
- aPropertiesFL.Show();
- aTextDirectionFT.Show();
- aTextDirectionLB.Show();
- }
+ bool bCTL = SW_MOD()->GetCTLOptions().IsCTLFontEnabled();
+ get<VclContainer>("properties")->Show(!bHtmlMode && bCTL);
Init();
}
@@ -122,38 +107,38 @@ SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet )
void SwFormatTablePage::Init()
{
- aLeftMF.MetricField::SetMin(-999999);
- aRightMF.MetricField::SetMin(-999999);
+ m_aLeftMF.SetMetricFieldMin(-999999);
+ m_aRightMF.SetMetricFieldMin(-999999);
// handler
Link aLk = LINK( this, SwFormatTablePage, AutoClickHdl );
- aFullBtn.SetClickHdl( aLk );
- aFreeBtn.SetClickHdl( aLk );
- aLeftBtn.SetClickHdl( aLk );
- aFromLeftBtn.SetClickHdl( aLk );
- aRightBtn.SetClickHdl( aLk );
- aCenterBtn.SetClickHdl( aLk );
+ m_pFullBtn->SetClickHdl( aLk );
+ m_pFreeBtn->SetClickHdl( aLk );
+ m_pLeftBtn->SetClickHdl( aLk );
+ m_pFromLeftBtn->SetClickHdl( aLk );
+ m_pRightBtn->SetClickHdl( aLk );
+ m_pCenterBtn->SetClickHdl( aLk );
aLk = LINK( this, SwFormatTablePage, UpDownLoseFocusHdl );
- aTopMF.SetUpHdl( aLk );
- aBottomMF.SetUpHdl( aLk );
- aRightMF.SetUpHdl( aLk );
- aLeftMF.SetUpHdl( aLk );
- aWidthMF.SetUpHdl( aLk );
-
- aTopMF.SetDownHdl( aLk );
- aBottomMF.SetDownHdl( aLk );
- aRightMF.SetDownHdl( aLk );
- aLeftMF.SetDownHdl( aLk );
- aWidthMF.SetDownHdl( aLk );
-
- aTopMF.SetLoseFocusHdl( aLk );
- aBottomMF.SetLoseFocusHdl( aLk );
- aRightMF.SetLoseFocusHdl( aLk );
- aLeftMF.SetLoseFocusHdl( aLk );
- aWidthMF.SetLoseFocusHdl( aLk );
-
- aRelWidthCB.SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl ));
+ m_pTopMF->SetUpHdl( aLk );
+ m_pBottomMF->SetUpHdl( aLk );
+ m_aRightMF.SetUpHdl( aLk );
+ m_aLeftMF.SetUpHdl( aLk );
+ m_aWidthMF.SetUpHdl( aLk );
+
+ m_pTopMF->SetDownHdl( aLk );
+ m_pBottomMF->SetDownHdl( aLk );
+ m_aRightMF.SetDownHdl( aLk );
+ m_aLeftMF.SetDownHdl( aLk );
+ m_aWidthMF.SetDownHdl( aLk );
+
+ m_pTopMF->SetLoseFocusHdl( aLk );
+ m_pBottomMF->SetLoseFocusHdl( aLk );
+ m_aRightMF.SetLoseFocusHdl( aLk );
+ m_aLeftMF.SetLoseFocusHdl( aLk );
+ m_aWidthMF.SetLoseFocusHdl( aLk );
+
+ m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl ));
}
/*------------------------------------------------------------------------*/
@@ -162,32 +147,32 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn )
{
OSL_ENSURE(pTblData, "table data not available?");
sal_Bool bIsChecked = pBtn->IsChecked();
- sal_Int64 nLeft = aLeftMF.DenormalizePercent(aLeftMF.GetValue(FUNIT_TWIP ));
- sal_Int64 nRight = aRightMF.DenormalizePercent(aRightMF.GetValue(FUNIT_TWIP ));
- aWidthMF.ShowPercent(bIsChecked);
- aLeftMF.ShowPercent(bIsChecked);
- aRightMF.ShowPercent(bIsChecked);
+ sal_Int64 nLeft = m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue(FUNIT_TWIP ));
+ sal_Int64 nRight = m_aRightMF.DenormalizePercent(m_aRightMF.GetValue(FUNIT_TWIP ));
+ m_aWidthMF.ShowPercent(bIsChecked);
+ m_aLeftMF.ShowPercent(bIsChecked);
+ m_aRightMF.ShowPercent(bIsChecked);
if (bIsChecked)
{
- aWidthMF.SetRefValue(pTblData->GetSpace());
- aLeftMF.SetRefValue(pTblData->GetSpace());
- aRightMF.SetRefValue(pTblData->GetSpace());
- aLeftMF.MetricField::SetMin(0); // wird vom Percentfield ueberschrieben
- aRightMF.MetricField::SetMin(0);// -""-
- aLeftMF.MetricField::SetMax(99); //
- aRightMF.MetricField::SetMax(99);//
- aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP );
- aRightMF.SetPrcntValue(aRightMF.NormalizePercent(nRight ), FUNIT_TWIP );
+ m_aWidthMF.SetRefValue(pTblData->GetSpace());
+ m_aLeftMF.SetRefValue(pTblData->GetSpace());
+ m_aRightMF.SetRefValue(pTblData->GetSpace());
+ m_aLeftMF.SetMetricFieldMin(0); // wird vom Percentfield ueberschrieben
+ m_aRightMF.SetMetricFieldMin(0); // -""-
+ m_aLeftMF.SetMetricFieldMax(99); //
+ m_aRightMF.SetMetricFieldMax(99); //
+ m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(nLeft ), FUNIT_TWIP );
+ m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(nRight ), FUNIT_TWIP );
}
else
- ModifyHdl(&aLeftMF); // Werte wieder korrigieren
+ ModifyHdl(m_aLeftMF.get()); // Werte wieder korrigieren
- if(aFreeBtn.IsChecked())
+ if(m_pFreeBtn->IsChecked())
{
sal_Bool bEnable = !pBtn->IsChecked();
- aRightMF.Enable(bEnable);
- aRightFT.Enable(bEnable);
+ m_aRightMF.Enable(bEnable);
+ m_pRightFT->Enable(bEnable);
}
bModified = sal_True;
@@ -202,50 +187,50 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
bRightEnable= sal_False,
bWidthEnable= sal_False,
bOthers = sal_True;
- if( (RadioButton *) pBox == &aFullBtn )
+ if ((RadioButton *)pBox == m_pFullBtn)
{
- aLeftMF.SetPrcntValue(0);
- aRightMF.SetPrcntValue(0);
- nSaveWidth = static_cast< SwTwips >(aWidthMF.DenormalizePercent(aWidthMF.GetValue(FUNIT_TWIP )));
- aWidthMF.SetPrcntValue(aWidthMF.NormalizePercent(pTblData->GetSpace() ), FUNIT_TWIP );
+ m_aLeftMF.SetPrcntValue(0);
+ m_aRightMF.SetPrcntValue(0);
+ nSaveWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue(FUNIT_TWIP )));
+ m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(pTblData->GetSpace() ), FUNIT_TWIP );
bFull = sal_True;
bRestore = sal_False;
}
- else if( (RadioButton *) pBox == &aLeftBtn )
+ else if ((RadioButton *)pBox == m_pLeftBtn)
{
bRightEnable = bWidthEnable = sal_True;
- aLeftMF.SetPrcntValue(0);
+ m_aLeftMF.SetPrcntValue(0);
}
- else if( (RadioButton *) pBox == &aFromLeftBtn )
+ else if ((RadioButton *) pBox == m_pFromLeftBtn)
{
bLeftEnable = bWidthEnable = sal_True;
- aRightMF.SetPrcntValue(0);
+ m_aRightMF.SetPrcntValue(0);
}
- else if( (RadioButton *) pBox == &aRightBtn )
+ else if ((RadioButton *) pBox == m_pRightBtn)
{
bLeftEnable = bWidthEnable = sal_True;
- aRightMF.SetPrcntValue(0);
+ m_aRightMF.SetPrcntValue(0);
}
- else if( ( RadioButton * ) pBox == &aCenterBtn )
+ else if ((RadioButton *) pBox == m_pCenterBtn)
{
bLeftEnable = bWidthEnable = sal_True;
}
- else if( ( RadioButton * ) pBox == &aFreeBtn )
+ else if ((RadioButton *) pBox == m_pFreeBtn)
{
RightModify();
bLeftEnable = sal_True;
bWidthEnable = sal_True;
bOthers = sal_False;
}
- aLeftMF.Enable(bLeftEnable);
- aLeftFT.Enable(bLeftEnable);
- aWidthMF.Enable(bWidthEnable);
- aWidthFT.Enable(bWidthEnable);
+ m_aLeftMF.Enable(bLeftEnable);
+ m_pLeftFT->Enable(bLeftEnable);
+ m_aWidthMF.Enable(bWidthEnable);
+ m_pWidthFT->Enable(bWidthEnable);
if ( bOthers )
{
- aRightMF.Enable(bRightEnable);
- aRightFT.Enable(bRightEnable);
- aRelWidthCB.Enable(bWidthEnable);
+ m_aRightMF.Enable(bRightEnable);
+ m_pRightFT->Enable(bRightEnable);
+ m_pRelWidthCB->Enable(bWidthEnable);
}
if(bFull && bRestore)
@@ -253,9 +238,9 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
// nachdem auf autom. geschaltet wurde, wurde die Breite gemerkt,
// um sie beim Zurueckschalten restaurieren zu koennen
bFull = sal_False;
- aWidthMF.SetPrcntValue(aWidthMF.NormalizePercent(nSaveWidth ), FUNIT_TWIP );
+ m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(nSaveWidth ), FUNIT_TWIP );
}
- ModifyHdl(&aWidthMF);
+ ModifyHdl(m_aWidthMF.get());
bModified = sal_True;
return 0;
}
@@ -263,53 +248,53 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, CheckBox *, pBox )
/*----------------------------------------------------------------------*/
void SwFormatTablePage::RightModify()
{
- if(aFreeBtn.IsChecked())
+ if(m_pFreeBtn->IsChecked())
{
- sal_Bool bEnable = aRightMF.GetValue() == 0;
- aRelWidthCB.Enable(bEnable);
+ sal_Bool bEnable = m_aRightMF.GetValue() == 0;
+ m_pRelWidthCB->Enable(bEnable);
if ( !bEnable )
{
- aRelWidthCB.Check(sal_False);
- RelWidthClickHdl(&aRelWidthCB);
+ m_pRelWidthCB->Check(sal_False);
+ RelWidthClickHdl(m_pRelWidthCB);
}
- bEnable = aRelWidthCB.IsChecked();
- aRightMF.Enable(!bEnable);
- aRightFT.Enable(!bEnable);
+ bEnable = m_pRelWidthCB->IsChecked();
+ m_aRightMF.Enable(!bEnable);
+ m_pRightFT->Enable(!bEnable);
}
}
IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
{
- if( &aRightMF == pEdit)
+ if( m_aRightMF.get() == pEdit)
RightModify();
ModifyHdl( pEdit );
return 0;
}
IMPL_LINK_INLINE_END( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
-void SwFormatTablePage::ModifyHdl( Edit* pEdit )
+void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
{
- SwTwips nCurWidth = static_cast< SwTwips >(aWidthMF.DenormalizePercent(aWidthMF.GetValue( FUNIT_TWIP )));
+ SwTwips nCurWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue( FUNIT_TWIP )));
SwTwips nPrevWidth = nCurWidth;
- SwTwips nRight = static_cast< SwTwips >(aRightMF.DenormalizePercent(aRightMF.GetValue( FUNIT_TWIP )));
- SwTwips nLeft = static_cast< SwTwips >(aLeftMF.DenormalizePercent(aLeftMF.GetValue( FUNIT_TWIP )));
+ SwTwips nRight = static_cast< SwTwips >(m_aRightMF.DenormalizePercent(m_aRightMF.GetValue( FUNIT_TWIP )));
+ SwTwips nLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP )));
SwTwips nDiff;
- if( pEdit == &aWidthMF )
+ if (pEdit == m_aWidthMF.get())
{
if( nCurWidth < MINLAY )
nCurWidth = MINLAY;
nDiff = nRight + nLeft + nCurWidth - pTblData->GetSpace() ;
//rechtsbuendig nur linken Rand veraendern
- if(aRightBtn.IsChecked())
+ if(m_pRightBtn->IsChecked())
nLeft -= nDiff;
//linksbuendig nur rechten Rand veraendern
- else if(aLeftBtn.IsChecked())
+ else if(m_pLeftBtn->IsChecked())
nRight -= nDiff;
//linker Rand und Breite erlaubt - erst rechts - dann links
- else if(aFromLeftBtn.IsChecked())
+ else if(m_pFromLeftBtn->IsChecked())
{
if( nRight >= nDiff )
nRight -= nDiff;
@@ -329,7 +314,7 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
}
}
//zentriert beide Seiten gleichmaessig veraendern
- else if(aCenterBtn.IsChecked())
+ else if(m_pCenterBtn->IsChecked())
{
if((nLeft != nRight))
{
@@ -344,13 +329,13 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
}
}
//freie Ausrichtung: beide Raender verkleinern
- else if(aFreeBtn.IsChecked())
+ else if(m_pFreeBtn->IsChecked())
{
nLeft -= nDiff/2;
nRight -= nDiff/2;
}
}
- if( pEdit == &aRightMF )
+ if (pEdit == m_aRightMF.get())
{
if( nRight + nLeft > pTblData->GetSpace() - MINLAY )
@@ -358,11 +343,11 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
nCurWidth = pTblData->GetSpace() - nLeft - nRight;
}
- if( pEdit == &aLeftMF )
+ if (pEdit == m_aLeftMF.get())
{
- if(!aFromLeftBtn.IsChecked())
+ if(!m_pFromLeftBtn->IsChecked())
{
- sal_Bool bCenter = aCenterBtn.IsChecked();
+ sal_Bool bCenter = m_pCenterBtn->IsChecked();
if( bCenter )
nRight = nLeft;
if(nRight + nLeft > pTblData->GetSpace() - MINLAY )
@@ -384,9 +369,9 @@ void SwFormatTablePage::ModifyHdl( Edit* pEdit )
}
}
if (nCurWidth != nPrevWidth )
- aWidthMF.SetPrcntValue( aWidthMF.NormalizePercent( nCurWidth ), FUNIT_TWIP );
- aRightMF.SetPrcntValue( aRightMF.NormalizePercent( nRight ), FUNIT_TWIP );
- aLeftMF.SetPrcntValue( aLeftMF.NormalizePercent( nLeft ), FUNIT_TWIP );
+ m_aWidthMF.SetPrcntValue( m_aWidthMF.NormalizePercent( nCurWidth ), FUNIT_TWIP );
+ m_aRightMF.SetPrcntValue( m_aRightMF.NormalizePercent( nRight ), FUNIT_TWIP );
+ m_aLeftMF.SetPrcntValue( m_aLeftMF.NormalizePercent( nLeft ), FUNIT_TWIP );
bModified = sal_True;
}
@@ -401,43 +386,43 @@ SfxTabPage* SwFormatTablePage::Create( Window* pParent,
sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet )
{
// Testen, ob eins der Control noch den Focus hat
- if(aWidthMF.HasFocus())
- ModifyHdl(&aWidthMF);
- else if(aLeftMF.HasFocus())
- ModifyHdl(&aLeftMF);
- else if(aRightMF.HasFocus())
- ModifyHdl(&aRightMF);
- else if(aTopMF.HasFocus())
- ModifyHdl(&aTopMF);
- else if(aBottomMF.HasFocus())
- ModifyHdl(&aBottomMF);
+ if (m_aWidthMF.HasFocus())
+ ModifyHdl(m_aWidthMF.get());
+ else if (m_aLeftMF.HasFocus())
+ ModifyHdl(m_aLeftMF.get());
+ else if(m_aRightMF.HasFocus())
+ ModifyHdl(m_aRightMF.get());
+ else if(m_pTopMF->HasFocus())
+ ModifyHdl(m_pTopMF);
+ else if(m_pBottomMF->HasFocus())
+ ModifyHdl(m_pBottomMF);
if(bModified)
{
- if( aBottomMF.GetText() != aBottomMF.GetSavedValue() ||
- aTopMF.GetText() != aTopMF.GetSavedValue() )
+ if( m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() ||
+ m_pTopMF->GetText() != m_pTopMF->GetSavedValue() )
{
SvxULSpaceItem aULSpace(RES_UL_SPACE);
- aULSpace.SetUpper( (sal_uInt16) aTopMF.Denormalize(
- aTopMF.GetValue( FUNIT_TWIP )));
- aULSpace.SetLower( (sal_uInt16) aBottomMF.Denormalize(
- aBottomMF.GetValue( FUNIT_TWIP )));
+ aULSpace.SetUpper( (sal_uInt16) m_pTopMF->Denormalize(
+ m_pTopMF->GetValue( FUNIT_TWIP )));
+ aULSpace.SetLower( (sal_uInt16) m_pBottomMF->Denormalize(
+ m_pBottomMF->GetValue( FUNIT_TWIP )));
rCoreSet.Put(aULSpace);
}
}
- if(aNameED.GetText() != aNameED.GetSavedValue())
+ if(m_pNameED->GetText() != m_pNameED->GetSavedValue())
{
- rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, aNameED.GetText()));
+ rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText()));
bModified = sal_True;
}
sal_uInt16 nPos;
- if( aTextDirectionLB.IsVisible() &&
- ( nPos = aTextDirectionLB.GetSelectEntryPos() ) !=
- aTextDirectionLB.GetSavedValue() )
+ if( m_pTextDirectionLB->IsVisible() &&
+ ( nPos = m_pTextDirectionLB->GetSelectEntryPos() ) !=
+ m_pTextDirectionLB->GetSavedValue() )
{
- sal_uInt32 nDirection = (sal_uInt32)(sal_uIntPtr)aTextDirectionLB.GetEntryData( nPos );
+ sal_uInt32 nDirection = (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos );
rCoreSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR));
bModified = sal_True;
}
@@ -453,25 +438,25 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
if(bHtmlMode)
{
- aNameED .Disable();
- aTopFT .Hide();
- aTopMF .Hide();
- aBottomFT.Hide();
- aBottomMF.Hide();
- aFreeBtn.Enable(sal_False);
+ m_pNameED->Disable();
+ m_pTopFT->Hide();
+ m_pTopMF->Hide();
+ m_pBottomFT->Hide();
+ m_pBottomMF->Hide();
+ m_pFreeBtn->Enable(sal_False);
}
FieldUnit aMetric = ::GetDfltMetric(bHtmlMode);
- SetMetric( aWidthMF, aMetric );
- SetMetric( aRightMF, aMetric );
- SetMetric( aLeftMF, aMetric );
- SetMetric( aTopMF, aMetric );
- SetMetric( aBottomMF, aMetric );
+ m_aWidthMF.SetMetric(aMetric);
+ m_aRightMF.SetMetric(aMetric);
+ m_aLeftMF.SetMetric(aMetric);
+ SetMetric(*m_pTopMF, aMetric);
+ SetMetric(*m_pBottomMF, aMetric);
//Name
if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, sal_False, &pItem ))
{
- aNameED.SetText(((const SfxStringItem*)pItem)->GetValue());
- aNameED.SaveValue();
+ m_pNameED->SetText(((const SfxStringItem*)pItem)->GetValue());
+ m_pNameED->SaveValue();
}
if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, sal_False, &pItem ))
@@ -481,33 +466,33 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
if(pTblData->GetWidthPercent())
{
- aRelWidthCB.Check(sal_True);
- RelWidthClickHdl(&aRelWidthCB);
- aWidthMF.SetPrcntValue(pTblData->GetWidthPercent(), FUNIT_CUSTOM);
+ m_pRelWidthCB->Check(sal_True);
+ RelWidthClickHdl(m_pRelWidthCB);
+ m_aWidthMF.SetPrcntValue(pTblData->GetWidthPercent(), FUNIT_CUSTOM);
- aWidthMF.SaveValue();
- nSaveWidth = static_cast< SwTwips >(aWidthMF.GetValue(FUNIT_CUSTOM));
+ m_aWidthMF.SaveValue();
+ nSaveWidth = static_cast< SwTwips >(m_aWidthMF.GetValue(FUNIT_CUSTOM));
}
else
{
- aWidthMF.SetPrcntValue(aWidthMF.NormalizePercent(
+ m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(
pTblData->GetWidth()), FUNIT_TWIP);
- aWidthMF.SaveValue();
+ m_aWidthMF.SaveValue();
nSaveWidth = pTblData->GetWidth();
nMinTableWidth = Min( nSaveWidth, nMinTableWidth );
}
- aWidthMF.SetRefValue(pTblData->GetSpace());
- aWidthMF.SetLast(aWidthMF.NormalizePercent( pTblData->GetSpace() ));
- aLeftMF.SetLast(aLeftMF.NormalizePercent( pTblData->GetSpace() ));
- aRightMF.SetLast(aRightMF.NormalizePercent( pTblData->GetSpace() ));
+ m_aWidthMF.SetRefValue(pTblData->GetSpace());
+ m_aWidthMF.SetLast(m_aWidthMF.NormalizePercent( pTblData->GetSpace() ));
+ m_aLeftMF.SetLast(m_aLeftMF.NormalizePercent( pTblData->GetSpace() ));
+ m_aRightMF.SetLast(m_aRightMF.NormalizePercent( pTblData->GetSpace() ));
- aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(
+ m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(
pTblData->GetLeftSpace()), FUNIT_TWIP);
- aRightMF.SetPrcntValue(aRightMF.NormalizePercent(
+ m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(
pTblData->GetRightSpace()), FUNIT_TWIP);
- aLeftMF.SaveValue();
- aRightMF.SaveValue();
+ m_aLeftMF.SaveValue();
+ m_aRightMF.SaveValue();
nOldAlign = pTblData->GetAlign();
@@ -516,53 +501,53 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
switch( nOldAlign )
{
case text::HoriOrientation::NONE:
- aFreeBtn.Check();
- if(aRelWidthCB.IsChecked())
+ m_pFreeBtn->Check();
+ if(m_pRelWidthCB->IsChecked())
bSetRight = sal_True;
break;
case text::HoriOrientation::FULL:
{
bSetRight = bSetLeft = sal_True;
- aFullBtn.Check();
- aWidthMF.Enable(sal_False);
- aRelWidthCB.Enable(sal_False);
- aWidthFT.Enable(sal_False);
+ m_pFullBtn->Check();
+ m_aWidthMF.Enable(sal_False);
+ m_pRelWidthCB->Enable(sal_False);
+ m_pWidthFT->Enable(sal_False);
}
break;
case text::HoriOrientation::LEFT:
{
bSetLeft = sal_True;
- aLeftBtn.Check();
+ m_pLeftBtn->Check();
}
break;
case text::HoriOrientation::LEFT_AND_WIDTH :
{
bSetRight = sal_True;
- aFromLeftBtn.Check();
+ m_pFromLeftBtn->Check();
}
break;
case text::HoriOrientation::RIGHT:
{
bSetRight = sal_True;
- aRightBtn.Check();
+ m_pRightBtn->Check();
}
break;
case text::HoriOrientation::CENTER:
{
bSetRight = sal_True;
- aCenterBtn.Check();
+ m_pCenterBtn->Check();
}
break;
}
if ( bSetRight )
{
- aRightMF.Enable(bRightEnable);
- aRightFT.Enable(bRightEnable);
+ m_aRightMF.Enable(bRightEnable);
+ m_pRightFT->Enable(bRightEnable);
}
if ( bSetLeft )
{
- aLeftMF.Enable(bLeftEnable);
- aLeftFT.Enable(bLeftEnable);
+ m_aLeftMF.Enable(bLeftEnable);
+ m_pLeftFT->Enable(bLeftEnable);
}
}
@@ -570,27 +555,27 @@ void SwFormatTablePage::Reset( const SfxItemSet& )
//Raender
if(SFX_ITEM_SET == rSet.GetItemState( RES_UL_SPACE, sal_False,&pItem ))
{
- aTopMF.SetValue(aTopMF.Normalize(
+ m_pTopMF->SetValue(m_pTopMF->Normalize(
((const SvxULSpaceItem*)pItem)->GetUpper()), FUNIT_TWIP);
- aBottomMF.SetValue(aBottomMF.Normalize(
+ m_pBottomMF->SetValue(m_pBottomMF->Normalize(
((const SvxULSpaceItem*)pItem)->GetLower()), FUNIT_TWIP);
- aTopMF.SaveValue();
- aBottomMF.SaveValue();
+ m_pTopMF->SaveValue();
+ m_pBottomMF->SaveValue();
}
//text direction
if( SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, sal_True, &pItem ) )
{
sal_uIntPtr nVal = ((SvxFrameDirectionItem*)pItem)->GetValue();
- sal_uInt16 nPos = aTextDirectionLB.GetEntryPos( (void*) nVal );
- aTextDirectionLB.SelectEntryPos( nPos );
- aTextDirectionLB.SaveValue();
+ sal_uInt16 nPos = m_pTextDirectionLB->GetEntryPos( (void*) nVal );
+ m_pTextDirectionLB->SelectEntryPos( nPos );
+ m_pTextDirectionLB->SaveValue();
}
- aWidthMF.SetMax( 2*aWidthMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
- aRightMF.SetMax( aRightMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
- aLeftMF.SetMax( aLeftMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
- aWidthMF.SetMin( aWidthMF.NormalizePercent( nMinTableWidth ), FUNIT_TWIP );
+ m_aWidthMF.SetMax( 2*m_aWidthMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
+ m_aRightMF.SetMax( m_aRightMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
+ m_aLeftMF.SetMax( m_aLeftMF.NormalizePercent( pTblData->GetSpace() ), FUNIT_TWIP );
+ m_aWidthMF.SetMin( m_aWidthMF.NormalizePercent( nMinTableWidth ), FUNIT_TWIP );
}
@@ -604,18 +589,18 @@ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet )
pTblData->GetWidth() :
pTblData->GetSpace();
if(pTblData->GetWidthPercent() == 0 &&
- nCurWidth != aWidthMF.DenormalizePercent(aWidthMF.GetValue(FUNIT_TWIP )))
+ nCurWidth != m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue(FUNIT_TWIP )))
{
- aWidthMF.SetPrcntValue(aWidthMF.NormalizePercent(
+ m_aWidthMF.SetPrcntValue(m_aWidthMF.NormalizePercent(
nCurWidth), FUNIT_TWIP);
- aWidthMF.SaveValue();
+ m_aWidthMF.SaveValue();
nSaveWidth = nCurWidth;
- aLeftMF.SetPrcntValue(aLeftMF.NormalizePercent(
+ m_aLeftMF.SetPrcntValue(m_aLeftMF.NormalizePercent(
pTblData->GetLeftSpace()), FUNIT_TWIP);
- aLeftMF.SaveValue();
- aRightMF.SetPrcntValue(aRightMF.NormalizePercent(
+ m_aLeftMF.SaveValue();
+ m_aRightMF.SetPrcntValue(m_aRightMF.NormalizePercent(
pTblData->GetRightSpace()), FUNIT_TWIP);
- aRightMF.SaveValue();
+ m_aRightMF.SaveValue();
}
}
@@ -625,13 +610,13 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
{
// os: VCL sorgt nicht dafuer, dass das aktive Control im
// dialog bei OK den focus verliert
- aNameED.GrabFocus();
+ m_pNameED->GrabFocus();
// Test des Tabellennamens auf Leerzeichen
- String sTblName = aNameED.GetText();
+ String sTblName = m_pNameED->GetText();
if(sTblName.Search(' ') != STRING_NOTFOUND)
{
InfoBox(this, SW_RES(MSG_WRONG_TABLENAME)).Execute();
- aNameED.GrabFocus();
+ m_pNameED->GrabFocus();
return KEEP_PAGE;
}
if(_pSet)
@@ -639,12 +624,12 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
FillItemSet(*_pSet);
if(bModified)
{
- SwTwips lLeft = static_cast< SwTwips >(aLeftMF.DenormalizePercent(aLeftMF.GetValue( FUNIT_TWIP )));
- SwTwips lRight = static_cast< SwTwips >(aRightMF.DenormalizePercent(aRightMF.GetValue( FUNIT_TWIP )));
+ SwTwips lLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP )));
+ SwTwips lRight = static_cast< SwTwips >(m_aRightMF.DenormalizePercent(m_aRightMF.GetValue( FUNIT_TWIP )));
- if( aLeftMF.GetText() != aLeftMF.GetSavedValue() ||
- aRightMF.GetText() != aRightMF.GetSavedValue() )
+ if( m_aLeftMF.GetText() != m_aLeftMF.GetSavedValue() ||
+ m_aRightMF.GetText() != m_aRightMF.GetSavedValue() )
{
pTblData->SetWidthChanged();
pTblData->SetLeftSpace( lLeft);
@@ -652,10 +637,10 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
}
SwTwips lWidth;
- if (aRelWidthCB.IsChecked() && aRelWidthCB.IsEnabled())
+ if (m_pRelWidthCB->IsChecked() && m_pRelWidthCB->IsEnabled())
{
lWidth = pTblData->GetSpace() - lRight - lLeft;
- sal_uInt16 nPercentWidth = (sal_uInt16)aWidthMF.GetValue(FUNIT_CUSTOM);
+ sal_uInt16 nPercentWidth = (sal_uInt16)m_aWidthMF.GetValue(FUNIT_CUSTOM);
if(pTblData->GetWidthPercent() != nPercentWidth)
{
pTblData->SetWidthPercent(nPercentWidth);
@@ -665,7 +650,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
else
{
pTblData->SetWidthPercent(0);
- lWidth = static_cast< SwTwips >(aWidthMF.DenormalizePercent(aWidthMF.GetValue( FUNIT_TWIP )));
+ lWidth = static_cast< SwTwips >(m_aWidthMF.DenormalizePercent(m_aWidthMF.GetValue( FUNIT_TWIP )));
}
pTblData->SetWidth(lWidth);
@@ -703,17 +688,17 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
}
sal_Int16 nAlign = 0;
- if(aRightBtn.IsChecked())
+ if(m_pRightBtn->IsChecked())
nAlign = text::HoriOrientation::RIGHT;
- else if(aLeftBtn.IsChecked())
+ else if(m_pLeftBtn->IsChecked())
nAlign = text::HoriOrientation::LEFT;
- else if(aFromLeftBtn.IsChecked())
+ else if(m_pFromLeftBtn->IsChecked())
nAlign = text::HoriOrientation::LEFT_AND_WIDTH;
- else if(aCenterBtn.IsChecked())
+ else if(m_pCenterBtn->IsChecked())
nAlign = text::HoriOrientation::CENTER;
- else if(aFreeBtn.IsChecked())
+ else if(m_pFreeBtn->IsChecked())
nAlign = text::HoriOrientation::NONE;
- else if(aFullBtn.IsChecked())
+ else if(m_pFullBtn->IsChecked())
{
nAlign = text::HoriOrientation::FULL;
lWidth = lAutoWidth;
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 6a3d92c..9258b93 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -38,34 +38,28 @@ struct TColumn
class SwFormatTablePage : public SfxTabPage
{
- FixedLine aOptionsFL;
- FixedText aNameFT;
- TableNameEdit aNameED;
- FixedText aWidthFT;
- PercentField aWidthMF;
- CheckBox aRelWidthCB;
-
- FixedLine aPosFL;
- RadioButton aFullBtn;
- RadioButton aLeftBtn;
- RadioButton aFromLeftBtn;
- RadioButton aRightBtn;
- RadioButton aCenterBtn;
- RadioButton aFreeBtn;
-
- FixedLine aDistFL;
- FixedText aLeftFT;
- PercentField aLeftMF;
- FixedText aRightFT;
- PercentField aRightMF;
- FixedText aTopFT;
- MetricField aTopMF;
- FixedText aBottomFT;
- MetricField aBottomMF;
-
- FixedLine aPropertiesFL;
- FixedText aTextDirectionFT;
- ListBox aTextDirectionLB;
+ TableNameEdit* m_pNameED;
+ FixedText* m_pWidthFT;
+ PercentFieldWrap m_aWidthMF;
+ CheckBox* m_pRelWidthCB;
+
+ RadioButton* m_pFullBtn;
+ RadioButton* m_pLeftBtn;
+ RadioButton* m_pFromLeftBtn;
+ RadioButton* m_pRightBtn;
+ RadioButton* m_pCenterBtn;
+ RadioButton* m_pFreeBtn;
+
+ FixedText* m_pLeftFT;
+ PercentFieldWrap m_aLeftMF;
+ FixedText* m_pRightFT;
+ PercentFieldWrap m_aRightMF;
+ FixedText* m_pTopFT;
+ MetricField* m_pTopMF;
+ FixedText* m_pBottomFT;
+ MetricField* m_pBottomMF;
+
+ ListBox* m_pTextDirectionLB;
SwTableRep* pTblData;
SwTwips nSaveWidth;
@@ -76,7 +70,7 @@ class SwFormatTablePage : public SfxTabPage
sal_Bool bHtmlMode : 1;
void Init();
- void ModifyHdl( Edit* pEdit );
+ void ModifyHdl(const Edit* pEdit);
DECL_LINK( AutoClickHdl, CheckBox * );
DECL_LINK( RelWidthClickHdl, CheckBox * );
diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui
new file mode 100644
index 0000000..20b213b
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/formattablepage.ui
@@ -0,0 +1,611 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">99.989999999999995</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">-99.989999999999995</property>
+ <property name="upper">99.989999999999995</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkGrid" id="FormatTablePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkFrame" id="frame12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="bottom_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="nameft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="widthft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">W_idth</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="swlo:TableNameEdit" id="name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="relwidth">
+ <property name="label" translatable="yes">Relati_ve</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="widthmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Properties</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="leftft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.50999999046325684</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">Lef_t</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="rightft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ri_ght</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="aboveft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="ypad">1</property>
+ <property name="label" translatable="yes">_Above</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="belowft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">_Below</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="leftmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="rightmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="abovemf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="belowmf:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Spacing</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="full">
+ <property name="label" translatable="yes">A_utomatic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes">_Left</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">fromleft</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="fromleft">
+ <property name="label" translatable="yes">_From left</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">right</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes">R_ight</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">center</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="center">
+ <property name="label" translatable="yes">_Center</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">free</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="free">
+ <property name="label" translatable="yes">_Manual</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">full</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label43">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">1</property>
+ <property name="label" translatable="yes">Alignment</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="properties">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Text _direction</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="textdirection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Properties </property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Left-to-right</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right-to-left</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="1">4</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="nameft"/>
+ <widget name="widthft"/>
+ <widget name="leftft"/>
+ <widget name="rightft"/>
+ <widget name="aboveft"/>
+ <widget name="belowft"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="ignore_hidden">True</property>
+ <widgets>
+ <widget name="widthmf:0.00cm"/>
+ <widget name="leftmf:0.00cm"/>
+ <widget name="rightmf:0.00cm"/>
+ <widget name="abovemf:0.00cm"/>
+ <widget name="belowmf:0.00cm"/>
+ </widgets>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 13cbed9..c638397 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -14,530 +14,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkGrid" id="grid25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">8</property>
- <child>
- <object class="GtkGrid" id="grid26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkGrid" id="grid27">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">10</property>
- <child>
- <object class="GtkFrame" id="frame12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="label47">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Name</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label48">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Width</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid29">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton11">
- <property name="label" translatable="yes">Relative</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton16">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label45">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid31">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">10</property>
- <child>
- <object class="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.50999999046325684</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">Left </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label50">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Right</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="ypad">1</property>
- <property name="label" translatable="yes">Above </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label52">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">Below</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton17">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton18">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton19">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list