From 9a96b1b5158428e4b1925816932d6d0060e6c3d6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 24 Nov 2021 15:57:13 +0200 Subject: remove unused defines and convert some to OUStringLiteral Also remove the associated links.txt entries Change-Id: I5028fab2feb828875a0b772418fc29cbdfe4ce72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125773 Tested-by: Jenkins Reviewed-by: Noel Grandin --- forms/source/inc/frm_strings.hxx | 6 ------ forms/source/inc/services.hxx | 7 ------- 2 files changed, 13 deletions(-) (limited to 'forms') diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 8a1889701165..35d9dab77234 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -32,9 +32,6 @@ inline constexpr OUStringLiteral PROPERTY_FETCHSIZE = u"FetchSize"; inline constexpr OUStringLiteral PROPERTY_VALUE = u"Value"; inline constexpr OUStringLiteral PROPERTY_TEXT = u"Text"; inline constexpr OUStringLiteral PROPERTY_LABEL = u"Label"; -#define PROPERTY_CANINSERT "CanInsert" -#define PROPERTY_CANUPDATE "CanUpdate" -#define PROPERTY_CANDELETE "CanDelete" inline constexpr OUStringLiteral PROPERTY_NAVIGATION = u"NavigationBarMode"; inline constexpr OUStringLiteral PROPERTY_HASNAVIGATION = u"HasNavigationBar"; inline constexpr OUStringLiteral PROPERTY_CYCLE = u"Cycle"; @@ -90,8 +87,6 @@ inline constexpr OUStringLiteral PROPERTY_DEFAULT_DATE = u"DefaultDate"; inline constexpr OUStringLiteral PROPERTY_DEFAULT_TIME = u"DefaultTime"; inline constexpr OUStringLiteral PROPERTY_DEFAULT_VALUE = u"DefaultValue"; inline constexpr OUStringLiteral PROPERTY_DECIMAL_ACCURACY = u"DecimalAccuracy"; -#define PROPERTY_CURSORSOURCE "DataSelection" -#define PROPERTY_CURSORSOURCETYPE "DataSelectionType" inline constexpr OUStringLiteral PROPERTY_FIELDTYPE = u"Type"; inline constexpr OUStringLiteral PROPERTY_DECIMALS = u"Decimals"; inline constexpr OUStringLiteral PROPERTY_REFVALUE = u"RefValue"; @@ -162,7 +157,6 @@ inline constexpr OUStringLiteral PROPERTY_HIDDEN = u"Hidden"; inline constexpr OUStringLiteral PROPERTY_FILTERPROPOSAL = u"UseFilterValueProposal"; inline constexpr OUStringLiteral PROPERTY_FIELDSOURCE = u"FieldSource"; inline constexpr OUStringLiteral PROPERTY_TABLENAME = u"TableName"; -#define PROPERTY_ISFILTERAPPLIED "IsFilterApplied" inline constexpr OUStringLiteral PROPERTY_CONTROLLABEL = u"LabelControl"; inline constexpr OUStringLiteral PROPERTY_CURRSYM_POSITION = u"PrependCurrencySymbol"; inline constexpr OUStringLiteral PROPERTY_CURSORCOLOR = u"CursorColor"; diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index caf2e4ce0325..3bc9fab75cdb 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -19,18 +19,14 @@ #pragma once -#define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField" -#define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit" inline constexpr OUStringLiteral VCL_CONTROL_LISTBOX = u"stardiv.vcl.control.ListBox"; inline constexpr OUStringLiteral VCL_CONTROL_COMBOBOX = u"stardiv.vcl.control.ComboBox"; inline constexpr OUStringLiteral VCL_CONTROL_RADIOBUTTON = u"stardiv.vcl.control.RadioButton"; inline constexpr OUStringLiteral VCL_CONTROL_GROUPBOX = u"stardiv.vcl.control.GroupBox"; -#define VCL_CONTROL_FIXEDTEXT "stardiv.vcl.control.FixedText" inline constexpr OUStringLiteral VCL_CONTROL_COMMANDBUTTON = u"stardiv.vcl.control.Button"; inline constexpr OUStringLiteral VCL_CONTROL_CHECKBOX = u"stardiv.vcl.control.CheckBox"; inline constexpr OUStringLiteral VCL_CONTROL_IMAGEBUTTON = u"stardiv.vcl.control.ImageButton"; -#define VCL_CONTROL_FILECONTROL "stardiv.vcl.control.FileControl" inline constexpr OUStringLiteral VCL_CONTROL_TIMEFIELD = u"stardiv.vcl.control.TimeField"; inline constexpr OUStringLiteral VCL_CONTROL_DATEFIELD = u"stardiv.vcl.control.DateField"; inline constexpr OUStringLiteral VCL_CONTROL_NUMERICFIELD = u"stardiv.vcl.control.NumericField"; @@ -155,7 +151,6 @@ inline constexpr OUStringLiteral FRM_SUN_CONTROL_LISTBOX = u"com.sun.star.form.c inline constexpr OUStringLiteral FRM_SUN_CONTROL_COMBOBOX = u"com.sun.star.form.control.ComboBox"; inline constexpr OUStringLiteral FRM_SUN_CONTROL_RADIOBUTTON = u"com.sun.star.form.control.RadioButton"; inline constexpr OUStringLiteral FRM_SUN_CONTROL_GROUPBOX = u"com.sun.star.form.control.GroupBox"; -#define FRM_SUN_CONTROL_FIXEDTEXT "com.sun.star.form.control.FixedText" inline constexpr OUStringLiteral FRM_SUN_CONTROL_COMMANDBUTTON = u"com.sun.star.form.control.CommandButton"; inline constexpr OUStringLiteral FRM_SUN_CONTROL_CHECKBOX = u"com.sun.star.form.control.CheckBox"; inline constexpr OUStringLiteral FRM_SUN_CONTROL_GRIDCONTROL = u"com.sun.star.form.control.GridControl"; @@ -193,8 +188,6 @@ inline constexpr OUStringLiteral FRM_SUN_FORMCOMPONENT = u"com.sun.star.form.For // misc -#define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer" - inline constexpr OUStringLiteral SRV_SDB_ROWSET = u"com.sun.star.sdb.RowSet"; inline constexpr OUStringLiteral SRV_SDB_CONNECTION = u"com.sun.star.sdb.Connection"; -- cgit