diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-09 15:04:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-10 09:51:50 +0200 |
| commit | ccbaaa04417eac83f9f521e034a3e62821e4b7f3 (patch) | |
| tree | 444eb8925146632f9878c86f80da4424fc088e5f /sw/source | |
| parent | 342a5d13dfcca37a68cb996650e1ada868c5ce3e (diff) | |
weld SmFontSizeDialog
and give it a parent via SfxRequest::GetFrameWeld
Change-Id: I126c300ce4b3f477fd927efbcc83b1a6d315f594
Reviewed-on: https://gerrit.libreoffice.org/52637
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')
| -rw-r--r-- | sw/source/ui/misc/linenum.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/colwd.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/rowht.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 40604b299f1e..537cc428e59a 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -74,7 +74,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) , m_xCharStyleLB(m_xBuilder->weld_combo_box_text("styledropdown")) , m_xFormatLB(new NumberingTypeListBox(m_xBuilder->weld_combo_box_text("formatdropdown"))) , m_xPosLB(m_xBuilder->weld_combo_box_text("positiondropdown")) - , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin")) + , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FUNIT_CM)) , m_xDivisorED(m_xBuilder->weld_entry("textentry")) , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button("blanklines")) , m_xCountFrameLinesCB(m_xBuilder->weld_check_button("linesintextframes")) diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index deb4fb03e35a..d572563cbe4a 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -42,7 +42,7 @@ 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")) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) { bool bIsWeb = rTableFnc.GetShell() && (dynamic_cast< const SwWebDocShell* >( diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 29c84b7fd242..e8b725b806cd 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -50,7 +50,7 @@ void SwTableHeightDlg::Apply() SwTableHeightDlg::SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS) : GenericDialogController(pParent, "modules/swriter/ui/rowheight.ui", "RowHeightDialog") , m_rSh(rS) - , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("heightmf")) + , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("heightmf", FUNIT_CM)) , m_xAutoHeightCB(m_xBuilder->weld_check_button("fit")) { FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( dynamic_cast< const SwWebDocShell*>( |