summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-01 21:18:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-02 21:40:36 +0100
commit69ccba90135f4dfc22d4cb823e10cf4794ddaa04 (patch)
treeedb24a189f9b0555a97c95fbd72acf73fed6a8aa /sw/source/uibase
parent075e365e20a75dd12c29b0b094fea986f3e1231a (diff)
rename RelativeField back to SvxRelativeField
Change-Id: Iadac47f83aae0f7403f3391e3dd45bef52ad347a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87832 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/sidebar/PageFormatPanel.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageFormatPanel.hxx4
-rw-r--r--sw/source/uibase/sidebar/TableEditPanel.cxx4
-rw-r--r--sw/source/uibase/sidebar/TableEditPanel.hxx4
4 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 2837937a2ca1..4b66cf865d8c 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -90,8 +90,8 @@ PageFormatPanel::PageFormatPanel(
PanelLayout(pParent, "PageFormatPanel", "modules/swriter/ui/pageformatpanel.ui", rxFrame, true),
mpBindings( pBindings ),
mxPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box("papersize"))),
- mxPaperWidth(new RelativeField(m_xBuilder->weld_metric_spin_button("paperwidth", FieldUnit::CM))),
- mxPaperHeight(new RelativeField(m_xBuilder->weld_metric_spin_button("paperheight", FieldUnit::CM))),
+ mxPaperWidth(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("paperwidth", FieldUnit::CM))),
+ mxPaperHeight(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("paperheight", FieldUnit::CM))),
mxPaperOrientation(m_xBuilder->weld_combo_box("paperorientation")),
mxMarginSelectBox(m_xBuilder->weld_combo_box("marginLB")),
mxCustomEntry(m_xBuilder->weld_label("customlabel")),
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx
index db7311593c3f..63b3ccd902f6 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx
@@ -66,8 +66,8 @@ private:
SfxBindings* mpBindings;
std::unique_ptr<SvxPaperSizeListBox> mxPaperSizeBox;
- std::unique_ptr<RelativeField> mxPaperWidth;
- std::unique_ptr<RelativeField> mxPaperHeight;
+ std::unique_ptr<SvxRelativeField> mxPaperWidth;
+ std::unique_ptr<SvxRelativeField> mxPaperHeight;
std::unique_ptr<weld::ComboBox> mxPaperOrientation;
std::unique_ptr<weld::ComboBox> mxMarginSelectBox;
std::unique_ptr<weld::Label> mxCustomEntry;
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 8f64722499a4..0dec00ec1613 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -97,9 +97,9 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
true)
, m_pBindings(pBindings)
, m_xRowHeightEdit(
- new RelativeField(m_xBuilder->weld_metric_spin_button("rowheight", FieldUnit::CM)))
+ new SvxRelativeField(m_xBuilder->weld_metric_spin_button("rowheight", FieldUnit::CM)))
, m_xColumnWidthEdit(
- new RelativeField(m_xBuilder->weld_metric_spin_button("columnwidth", FieldUnit::CM)))
+ new SvxRelativeField(m_xBuilder->weld_metric_spin_button("columnwidth", FieldUnit::CM)))
, m_xInsert(m_xBuilder->weld_toolbar("insert"))
, m_xInsertDispatch(new ToolbarUnoDispatcher(*m_xInsert, rxFrame))
, m_xSelect(m_xBuilder->weld_toolbar("select"))
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx
index d04d192001e9..ed67b3ebfc7e 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -45,8 +45,8 @@ private:
SfxBindings* m_pBindings;
- std::unique_ptr<RelativeField> m_xRowHeightEdit;
- std::unique_ptr<RelativeField> m_xColumnWidthEdit;
+ std::unique_ptr<SvxRelativeField> m_xRowHeightEdit;
+ std::unique_ptr<SvxRelativeField> m_xColumnWidthEdit;
std::unique_ptr<weld::Toolbar> m_xInsert;
std::unique_ptr<ToolbarUnoDispatcher> m_xInsertDispatch;
std::unique_ptr<weld::Toolbar> m_xSelect;