no need to allocate these separately

they are all one or two words in size

Change-Id: Iebbe17f114b098337305d4f8f5c3835be4744c30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148376
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 20 insertions, 20 deletions

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index a5a341376838..20e05096d6c4 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -412,11 +412,11 @@ ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent,
       mxTBxIndent(m_xBuilder->weld_toolbar("indent")),
       mxIndentDispatch(new ToolbarUnoDispatcher(*mxTBxIndent, *m_xBuilder, rxFrame)),
       //Paragraph spacing
-      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))),
+      mxTopDist(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM)),
+      mxBottomDist(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM)),
+      mxLeftIndent(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM)),
+      mxRightIndent(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM)),
+      mxFLineIndent(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 b6e61ae018fe..04bbf9065375 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -93,11 +93,11 @@ private:
     std::unique_ptr<ToolbarUnoDispatcher> mxIndentDispatch;
 
     //Paragraph spacing
-    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;
+    std::optional<SvxRelativeField> mxTopDist;
+    std::optional<SvxRelativeField> mxBottomDist;
+    std::optional<SvxRelativeField> mxLeftIndent;
+    std::optional<SvxRelativeField> mxRightIndent;
+    std::optional<SvxRelativeField> mxFLineIndent;
 
     // Data Member
     tools::Long                maTxtLeft;
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index fa164dd024c6..f5968510e2ea 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -39,8 +39,8 @@ ParaULSpacingWindow::ParaULSpacingWindow(vcl::Window* pParent)
     : InterimItemWindow(pParent, "svx/ui/paraulspacing.ui", "ParaULSpacingWindow")
     , m_eUnit(MapUnit::MapTwip)
 {
-    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_xAboveSpacing.emplace(m_xBuilder->weld_metric_spin_button("aboveparaspacing", FieldUnit::CM));
+    m_xBelowSpacing.emplace(m_xBuilder->weld_metric_spin_button("belowparaspacing", FieldUnit::CM));
     m_xAboveContainer = m_xBuilder->weld_container("above");
     m_xBelowContainer = m_xBuilder->weld_container("below");
 
@@ -135,9 +135,9 @@ ParaLRSpacingWindow::ParaLRSpacingWindow(vcl::Window* pParent)
     : InterimItemWindow(pParent, "svx/ui/paralrspacing.ui", "ParaLRSpacingWindow")
     , m_eUnit(MapUnit::MapTwip)
 {
-    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_xBeforeSpacing.emplace(m_xBuilder->weld_metric_spin_button("beforetextindent", FieldUnit::CM));
+    m_xAfterSpacing.emplace(m_xBuilder->weld_metric_spin_button("aftertextindent", FieldUnit::CM));
+    m_xFLSpacing.emplace(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 f1730f93387b..139ae1b8f00f 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -39,8 +39,8 @@ public:
 protected:
     ParaULSpacingWindow(vcl::Window* pParent);
 
-    std::unique_ptr<SvxRelativeField> m_xAboveSpacing;
-    std::unique_ptr<SvxRelativeField> m_xBelowSpacing;
+    std::optional<SvxRelativeField> m_xAboveSpacing;
+    std::optional<SvxRelativeField> m_xBelowSpacing;
     std::unique_ptr<weld::Container> m_xAboveContainer;
     std::unique_ptr<weld::Container> m_xBelowContainer;
 
@@ -74,9 +74,9 @@ public:
 protected:
     ParaLRSpacingWindow(vcl::Window* pParent);
 
-    std::unique_ptr<SvxRelativeField> m_xBeforeSpacing;
-    std::unique_ptr<SvxRelativeField> m_xAfterSpacing;
-    std::unique_ptr<SvxRelativeField> m_xFLSpacing;
+    std::optional<SvxRelativeField> m_xBeforeSpacing;
+    std::optional<SvxRelativeField> m_xAfterSpacing;
+    std::optional<SvxRelativeField> m_xFLSpacing;
     std::unique_ptr<weld::Container> m_xBeforeContainer;
     std::unique_ptr<weld::Container> m_xAfterContainer;
     std::unique_ptr<weld::Container> m_xFirstLineContainer;