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>

6 files changed, 26 insertions, 26 deletions

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index c9cb58ca1594..1e2631e990c7 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1460,7 +1460,7 @@ void limitWidthForSidebar(weld::SpinButton& rSpinButton)
     rSpinButton.set_width_chars(std::min(rSpinButton.get_width_chars(), nMaxDigits));
 }
 
-void limitWidthForSidebar(RelativeField& rMetricSpinButton)
+void limitWidthForSidebar(SvxRelativeField& rMetricSpinButton)
 {
     weld::SpinButton& rSpinButton = rMetricSpinButton.get_widget();
     limitWidthForSidebar(rSpinButton);
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index d8db417a9717..80340a168031 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/relfld.hxx>
 
-RelativeField::RelativeField(std::unique_ptr<weld::MetricSpinButton> pControl)
+SvxRelativeField::SvxRelativeField(std::unique_ptr<weld::MetricSpinButton> pControl)
     : m_xSpinButton(std::move(pControl))
     , nRelMin(0)
     , nRelMax(0)
@@ -29,10 +29,10 @@ RelativeField::RelativeField(std::unique_ptr<weld::MetricSpinButton> pControl)
 
 {
     weld::SpinButton& rSpinButton = m_xSpinButton->get_widget();
-    rSpinButton.connect_changed(LINK(this, RelativeField, ModifyHdl));
+    rSpinButton.connect_changed(LINK(this, SvxRelativeField, ModifyHdl));
 }
 
-IMPL_LINK_NOARG(RelativeField, ModifyHdl, weld::Entry&, void)
+IMPL_LINK_NOARG(SvxRelativeField, ModifyHdl, weld::Entry&, void)
 {
     if (bRelativeMode)
     {
@@ -65,7 +65,7 @@ IMPL_LINK_NOARG(RelativeField, ModifyHdl, weld::Entry&, void)
     }
 }
 
-void RelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax)
+void SvxRelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax)
 {
     bRelativeMode = true;
     nRelMin       = nMin;
@@ -73,7 +73,7 @@ void RelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax)
     m_xSpinButton->set_unit(FieldUnit::CM);
 }
 
-void RelativeField::SetRelative( bool bNewRelative )
+void SvxRelativeField::SetRelative( bool bNewRelative )
 {
     weld::SpinButton& rSpinButton = m_xSpinButton->get_widget();
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 01dd63823e9e..815ac08e2f9e 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -426,11 +426,11 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
       mxTBxIndent(m_xBuilder->weld_toolbar("indent")),
       mxIndentDispatch(new ToolbarUnoDispatcher(*mxTBxIndent, rxFrame)),
       //Paragraph spacing
-      mxTopDist(new RelativeField(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM))),
-      mxBottomDist(new RelativeField(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM))),
-      mxLeftIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM))),
-      mxRightIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM))),
-      mxFLineIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("firstlineindent", FieldUnit::CM))),
+      mxTopDist(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM))),
+      mxBottomDist(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM))),
+      mxLeftIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM))),
+      mxRightIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM))),
+      mxFLineIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("firstlineindent", FieldUnit::CM))),
       maTxtLeft (0),
       maUpper (0),
       maLower (0),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 4e360bfaa243..d3fd42d92f49 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -91,11 +91,11 @@ private:
     std::unique_ptr<ToolbarUnoDispatcher> mxIndentDispatch;
 
     //Paragraph spacing
-    std::unique_ptr<RelativeField> mxTopDist;
-    std::unique_ptr<RelativeField> mxBottomDist;
-    std::unique_ptr<RelativeField> mxLeftIndent;
-    std::unique_ptr<RelativeField> mxRightIndent;
-    std::unique_ptr<RelativeField> mxFLineIndent;
+    std::unique_ptr<SvxRelativeField> mxTopDist;
+    std::unique_ptr<SvxRelativeField> mxBottomDist;
+    std::unique_ptr<SvxRelativeField> mxLeftIndent;
+    std::unique_ptr<SvxRelativeField> mxRightIndent;
+    std::unique_ptr<SvxRelativeField> mxFLineIndent;
 
     // Data Member
     long                maTxtLeft;
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 8ddbe0949e03..e70cb93095f1 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -45,8 +45,8 @@ ParaULSpacingWindow::ParaULSpacingWindow(vcl::Window* pParent)
     m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, "svx/ui/paraulspacing.ui"));
     m_xContainer = m_xBuilder->weld_container("ParaULSpacingWindow");
 
-    m_xAboveSpacing = std::make_unique<RelativeField>(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM));
-    m_xBelowSpacing = std::make_unique<RelativeField>(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM));
+    m_xAboveSpacing = std::make_unique<SvxRelativeField>(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM));
+    m_xBelowSpacing = std::make_unique<SvxRelativeField>(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM));
     m_xAboveContainer = m_xBuilder->weld_container("above");
     m_xBelowContainer = m_xBuilder->weld_container("below");
 
@@ -170,9 +170,9 @@ ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent)
     m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, "svx/ui/paralrspacing.ui"));
     m_xContainer = m_xBuilder->weld_container("ParaLRSpacingWindow");
 
-    m_xBeforeSpacing = std::make_unique<RelativeField>(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM));
-    m_xAfterSpacing = std::make_unique<RelativeField>(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM));
-    m_xFLSpacing = std::make_unique<RelativeField>(m_xBuilder->weld_metric_spin_button("firstlineindent", FieldUnit::CM));
+    m_xBeforeSpacing = std::make_unique<SvxRelativeField>(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM));
+    m_xAfterSpacing = std::make_unique<SvxRelativeField>(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM));
+    m_xFLSpacing = std::make_unique<SvxRelativeField>(m_xBuilder->weld_metric_spin_button("firstlineindent", FieldUnit::CM));
     m_xBeforeContainer = m_xBuilder->weld_container("before");
     m_xAfterContainer = m_xBuilder->weld_container("after");
     m_xFirstLineContainer = m_xBuilder->weld_container("firstline");
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 1e19fdb78bed..36dd90aea79b 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -48,8 +48,8 @@ protected:
     VclPtr<vcl::Window> m_xVclContentArea;
     std::unique_ptr<weld::Container> m_xContainer;
 
-    std::unique_ptr<RelativeField> m_xAboveSpacing;
-    std::unique_ptr<RelativeField> m_xBelowSpacing;
+    std::unique_ptr<SvxRelativeField> m_xAboveSpacing;
+    std::unique_ptr<SvxRelativeField> m_xBelowSpacing;
     std::unique_ptr<weld::Container> m_xAboveContainer;
     std::unique_ptr<weld::Container> m_xBelowContainer;
 
@@ -92,9 +92,9 @@ protected:
     VclPtr<vcl::Window> m_xVclContentArea;
     std::unique_ptr<weld::Container> m_xContainer;
 
-    std::unique_ptr<RelativeField> m_xBeforeSpacing;
-    std::unique_ptr<RelativeField> m_xAfterSpacing;
-    std::unique_ptr<RelativeField> m_xFLSpacing;
+    std::unique_ptr<SvxRelativeField> m_xBeforeSpacing;
+    std::unique_ptr<SvxRelativeField> m_xAfterSpacing;
+    std::unique_ptr<SvxRelativeField> m_xFLSpacing;
     std::unique_ptr<weld::Container> m_xBeforeContainer;
     std::unique_ptr<weld::Container> m_xAfterContainer;
     std::unique_ptr<weld::Container> m_xFirstLineContainer;