diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/tools/rc.h | 17 | ||||
-rw-r--r-- | include/tools/rcid.h | 2 | ||||
-rw-r--r-- | include/vcl/field.hxx | 5 |
3 files changed, 1 insertions, 23 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 97c9f2dd331c..396c8286987e 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -90,27 +90,10 @@ namespace o3tl { template<> struct typed_flags<RscNumFormatterFlags> : is_typed_flags<RscNumFormatterFlags, 0x37> {}; } -enum class RscMetricFormatterFlags { - Unit = 0x01, - CustomUnitText = 0x02 -}; -namespace o3tl { - template<> struct typed_flags<RscMetricFormatterFlags> : is_typed_flags<RscMetricFormatterFlags, 0x03> {}; -} - #define NUMERICFIELD_FIRST 0x01 #define NUMERICFIELD_LAST 0x02 #define NUMERICFIELD_SPINSIZE 0x04 -enum class RscMetricFieldFlags { - First = 0x01, - Last = 0x02, - SpinSize = 0x04 -}; -namespace o3tl { - template<> struct typed_flags<RscMetricFieldFlags> : is_typed_flags<RscMetricFieldFlags, 0x07> {}; -} - // For "ToolBoxItem" resources: enum class RscToolboxItemFlags { Id = 0x0001, diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 0f98bed3064f..95c4b9a58104 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -68,7 +68,7 @@ #define RSC_SPINFIELD (RSC_NOTYPE + 0x61) #define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63) -#define RSC_METRICFIELD (RSC_NOTYPE + 0x64) + #define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70) #define RSC_TOOLBOX (RSC_NOTYPE + 0x71) diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 90267eb269e2..96873ff2f0ec 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -210,7 +210,6 @@ protected: protected: MetricFormatter(); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE bool ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ); public: @@ -475,12 +474,8 @@ public: class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter { -protected: - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); - explicit MetricField( vcl::Window* pParent, const ResId& ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Notify( NotifyEvent& rNEvt ) override; |