diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-01 14:31:09 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-02 21:39:58 +0100 |
commit | 075e365e20a75dd12c29b0b094fea986f3e1231a (patch) | |
tree | 07fc29345cbfbb2f4e7fe81a75840791f4435d15 | |
parent | 61fd0e0c27494fdda61e9e06490c50ef1147c1bd (diff) |
SvxRelativeField is newly unused
Change-Id: Iaeb72e9aa7276736632a66f1eb75277a696e91e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
-rw-r--r-- | include/svx/relfld.hxx | 7 | ||||
-rwxr-xr-x | solenv/bin/native-code.py | 1 | ||||
-rw-r--r-- | svx/source/dialog/relfld.cxx | 23 |
4 files changed, 0 insertions, 34 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 903553e985b5..b132e58b18f5 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -82,9 +82,6 @@ <glade-widget-class title="Page List Control" name="sduilo-SdPageListControl" generic-name="Page List Control" parent="GtkTreeView" icon-name="widget-gtk-treeview"/> - <glade-widget-class title="Relative Numeric Field" name="svxlo-SvxRelativeField" - generic-name="Relative Numeric Field" parent="GtkSpinButton" - icon-name="widget-gtk-spinbutton"/> <glade-widget-class title="Calc Row SpinButton" name="sclo-RowEdit" generic-name="Calc Row SpinButton" parent="GtkSpinButton" diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 7aa6b88d7c5b..1a4e6a5201f8 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -21,16 +21,9 @@ #include <tools/fldunit.hxx> #include <svtools/unitconv.hxx> -#include <vcl/field.hxx> #include <vcl/weld.hxx> #include <svx/svxdllapi.h> -class SAL_DLLPUBLIC_RTTI SvxRelativeField final : public MetricField -{ -public: - SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit); -}; - class SVX_DLLPUBLIC RelativeField { private: diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 9f4704e82074..f8133a6d7723 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -515,7 +515,6 @@ custom_widgets = [ 'SearchResultsBox', 'SidebarToolBox', 'SvxColorValueSet', - 'SvxRelativeField', 'TemplateDefaultView', ] diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index a6609d2009a4..d8db417a9717 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -18,29 +18,6 @@ */ #include <svx/relfld.hxx> -#include <vcl/builder.hxx> - -SvxRelativeField::SvxRelativeField( - vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit) - : MetricField( pParent, nBits) -{ - SetUnit(eUnit); - SetDecimalDigits( 2 ); - SetMin( 0 ); - SetMax( 9999 ); -} - -extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxRelativeField(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) -{ - static_assert(std::is_same_v<std::remove_pointer_t<VclBuilder::customMakeWidget>, - decltype(makeSvxRelativeField)>); - OUString const custom(BuilderUtils::extractCustomProperty(rMap)); - FieldUnit const eUnit(BuilderUtils::detectUnit(custom)); - rRet = VclPtr<SvxRelativeField>::Create(pParent, - WB_BORDER | WB_SPIN | WB_REPEAT | - WB_LEFT | WB_GROUP, - eUnit); -} RelativeField::RelativeField(std::unique_ptr<weld::MetricSpinButton> pControl) : m_xSpinButton(std::move(pControl)) |