summaryrefslogtreecommitdiff
path: root/sw/source/ui/table
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-02 15:30:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-02 21:54:03 +0200
commitfa8822c48e2a79589bebbd015b36d1da8b338cc2 (patch)
tree0e3c8c305f08a2dee687e540b4795e7de90ad20f /sw/source/ui/table
parent5d5a7293bf6a49b1828bdd9fdff989f0a9cd2e53 (diff)
weld SwTableWidthDlg
Change-Id: I272a783c9b7a8f725314e416fbd81217105ee5a6 Reviewed-on: https://gerrit.libreoffice.org/52266 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/table')
-rw-r--r--sw/source/ui/table/colwd.cxx67
1 files changed, 29 insertions, 38 deletions
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 8ad8aaf6be64..4ca22dda4b5e 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -30,57 +30,48 @@
#include <cmdid.h>
-IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, Edit&, void)
+IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, weld::SpinButton&, void)
{
- sal_uInt16 nId = static_cast<sal_uInt16>(m_pColNF->GetValue())-1;
- const SwTwips lWidth = rFnc.GetColWidth(nId);
- m_pWidthMF->SetMax(m_pWidthMF->Normalize(rFnc.GetMaxColWidth(nId)), FUNIT_TWIP);
- m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP);
+ sal_uInt16 nId = static_cast<sal_uInt16>(m_xColNF->get_value()) - 1;
+ const SwTwips lWidth = m_rFnc.GetColWidth(nId);
+ m_xWidthMF->set_max(m_xWidthMF->normalize(m_rFnc.GetMaxColWidth(nId)), FUNIT_TWIP);
+ m_xWidthMF->set_value(m_xWidthMF->normalize(lWidth), FUNIT_TWIP);
}
-SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )
- : SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" )
- , rFnc(rTableFnc)
+SwTableWidthDlg::SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rTableFnc)
+ : GenericDialogController(pParent, "modules/swriter/ui/columnwidth.ui", "ColumnWidthDialog")
+ , m_rFnc(rTableFnc)
+ , m_xColNF(m_xBuilder->weld_spin_button("column"))
+ , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width"))
{
- get(m_pColNF, "column");
- get(m_pWidthMF, "width");
-
bool bIsWeb = rTableFnc.GetShell()
&& (dynamic_cast< const SwWebDocShell* >(
rTableFnc.GetShell()->GetView().GetDocShell()) != nullptr );
FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( bIsWeb )->GetMetric();
- ::SetFieldUnit(*m_pWidthMF, eFieldUnit);
-
- m_pColNF->SetValue( rFnc.GetCurColNum() +1 );
- m_pWidthMF->SetMin(m_pWidthMF->Normalize(MINLAY), FUNIT_TWIP);
- if(!m_pWidthMF->GetMin())
- m_pWidthMF->SetMin(1);
+ ::SetFieldUnit(*m_xWidthMF, eFieldUnit);
- if(rFnc.GetColCount() == 0)
- m_pWidthMF->SetMin(m_pWidthMF->Normalize(rFnc.GetColWidth(0)), FUNIT_TWIP);
- m_pColNF->SetMax(rFnc.GetColCount() +1 );
- m_pColNF->SetModifyHdl(LINK(this,SwTableWidthDlg, LoseFocusHdl));
- LoseFocusHdl(*m_pColNF);
-}
+ m_xColNF->set_max(m_rFnc.GetColCount() + 1);
+ m_xColNF->set_value(m_rFnc.GetCurColNum() + 1);
-SwTableWidthDlg::~SwTableWidthDlg()
-{
- disposeOnce();
-}
-
-void SwTableWidthDlg::dispose()
-{
- m_pColNF.clear();
- m_pWidthMF.clear();
- SvxStandardDialog::dispose();
+ if (m_rFnc.GetColCount() == 0)
+ m_xWidthMF->set_min(m_xWidthMF->normalize(m_rFnc.GetColWidth(0)), FUNIT_TWIP);
+ else
+ m_xWidthMF->set_min(m_xWidthMF->normalize(MINLAY), FUNIT_TWIP);
+ m_xColNF->connect_value_changed(LINK(this, SwTableWidthDlg, LoseFocusHdl));
+ LoseFocusHdl(*m_xColNF);
}
-void SwTableWidthDlg::Apply()
+short SwTableWidthDlg::execute()
{
- rFnc.InitTabCols();
- rFnc.SetColWidth(
- static_cast< sal_uInt16 >(m_pColNF->GetValue() - 1),
- static_cast< sal_uInt16 >(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP))));
+ short nRet = run();
+ if (nRet == RET_OK)
+ {
+ m_rFnc.InitTabCols();
+ m_rFnc.SetColWidth(
+ static_cast<sal_uInt16>(m_xColNF->get_value() - 1),
+ static_cast<sal_uInt16>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP))));
+ }
+ return nRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */