summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/inc/paragrph.hxx10
-rw-r--r--cui/source/tabpages/paragrph.cxx10
-rw-r--r--include/svx/dlgctrl.hxx4
-rw-r--r--include/svx/relfld.hxx4
-rw-r--r--svx/source/dialog/dlgctrl.cxx2
-rw-r--r--svx/source/dialog/relfld.cxx10
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx10
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.hxx10
-rw-r--r--svx/source/sidebar/paragraph/ParaSpacingWindow.cxx10
-rw-r--r--svx/source/sidebar/paragraph/ParaSpacingWindow.hxx10
-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
14 files changed, 48 insertions, 48 deletions
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index b068fe643808..b57199d91551 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -52,18 +52,18 @@ private:
SvxParaPrevWindow m_aExampleWin;
// indention
- std::unique_ptr<RelativeField> m_xLeftIndent;
+ std::unique_ptr<SvxRelativeField> m_xLeftIndent;
std::unique_ptr<weld::Label> m_xRightLabel;
- std::unique_ptr<RelativeField> m_xRightIndent;
+ std::unique_ptr<SvxRelativeField> m_xRightIndent;
std::unique_ptr<weld::Label> m_xFLineLabel;
- std::unique_ptr<RelativeField> m_xFLineIndent;
+ std::unique_ptr<SvxRelativeField> m_xFLineIndent;
std::unique_ptr<weld::CheckButton> m_xAutoCB;
// distance
- std::unique_ptr<RelativeField> m_xTopDist;
- std::unique_ptr<RelativeField> m_xBottomDist;
+ std::unique_ptr<SvxRelativeField> m_xTopDist;
+ std::unique_ptr<SvxRelativeField> m_xBottomDist;
std::unique_ptr<weld::CheckButton> m_xContextualCB;
// line spacing
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c8ef51b1245c..b712a7555d8f 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -678,14 +678,14 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(weld::Container* pPage, weld::Dia
, nWidth(11905 /*567 * 50*/)
, nMinFixDist(0)
, bRelativeMode(false)
- , m_xLeftIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_LEFTINDENT", FieldUnit::CM)))
+ , m_xLeftIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinED_LEFTINDENT", FieldUnit::CM)))
, m_xRightLabel(m_xBuilder->weld_label("labelFT_RIGHTINDENT"))
- , m_xRightIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_RIGHTINDENT", FieldUnit::CM)))
+ , m_xRightIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinED_RIGHTINDENT", FieldUnit::CM)))
, m_xFLineLabel(m_xBuilder->weld_label("labelFT_FLINEINDENT"))
- , m_xFLineIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_FLINEINDENT", FieldUnit::CM)))
+ , m_xFLineIndent(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinED_FLINEINDENT", FieldUnit::CM)))
, m_xAutoCB(m_xBuilder->weld_check_button("checkCB_AUTO"))
- , m_xTopDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_TOPDIST", FieldUnit::CM)))
- , m_xBottomDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_BOTTOMDIST", FieldUnit::CM)))
+ , m_xTopDist(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinED_TOPDIST", FieldUnit::CM)))
+ , m_xBottomDist(new SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinED_BOTTOMDIST", FieldUnit::CM)))
, m_xContextualCB(m_xBuilder->weld_check_button("checkCB_CONTEXTUALSPACING"))
, m_xLineDist(m_xBuilder->weld_combo_box("comboLB_LINEDIST"))
, m_xLineDistAtPercentBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTPERCENT", FieldUnit::PERCENT))
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 6625b0651496..a7c70d7be723 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -413,10 +413,10 @@ public:
virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
};
-class RelativeField;
+class SvxRelativeField;
SVX_DLLPUBLIC void limitWidthForSidebar(weld::SpinButton& rSpinButton);
-SVX_DLLPUBLIC void limitWidthForSidebar(RelativeField& rMetricSpinButton);
+SVX_DLLPUBLIC void limitWidthForSidebar(SvxRelativeField& rMetricSpinButton);
//tdf#130197 Give this toolbar a width as if it had 5 standard toolbutton entries
SVX_DLLPUBLIC void padWidthForSidebar(weld::Toolbar& rToolbar, const css::uno::Reference<css::frame::XFrame>& rFrame);
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 1a4e6a5201f8..58301c2a484f 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -24,7 +24,7 @@
#include <vcl/weld.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC RelativeField
+class SVX_DLLPUBLIC SvxRelativeField
{
private:
std::unique_ptr<weld::MetricSpinButton> m_xSpinButton;
@@ -38,7 +38,7 @@ private:
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
- RelativeField(std::unique_ptr<weld::MetricSpinButton> pControl);
+ SvxRelativeField(std::unique_ptr<weld::MetricSpinButton> pControl);
void EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax );
void SetRelative( bool bRelative );
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;
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;
generated by cgit (git 2.34.1) at 2025-02-02 10:33:12 +0000