diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-15 08:13:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-16 07:31:14 +0100 |
commit | cc60e2eacdf2d55e0f52754d1e0801479b199615 (patch) | |
tree | fab10c88f0b874f6516083b57b1bf15fca95acbc /include/vcl/toolkit | |
parent | 0b7494dfd361f7f2f7d8257b0a8a233a11f00679 (diff) |
reduce symbol visibility in vcl
Change-Id: Ia56bb092a4634e301ff8922ae63e6f7ede874d80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164865
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl/toolkit')
-rw-r--r-- | include/vcl/toolkit/button.hxx | 18 | ||||
-rw-r--r-- | include/vcl/toolkit/field.hxx | 42 |
2 files changed, 30 insertions, 30 deletions
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 27b49df74227..d9e7380ea031 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -145,11 +145,11 @@ public: void Toggle(); - void SetSymbol( SymbolType eSymbol ); + SAL_DLLPRIVATE void SetSymbol( SymbolType eSymbol ); SymbolType GetSymbol() const { return meSymbol; } - void SetSymbolAlign( SymbolAlign eAlign ); + SAL_DLLPRIVATE void SetSymbolAlign( SymbolAlign eAlign ); - void SetDropDown( PushButtonDropdownStyle nStyle ); + SAL_DLLPRIVATE void SetDropDown( PushButtonDropdownStyle nStyle ); void SetState( TriState eState ); TriState GetState() const { return meState; } @@ -161,7 +161,7 @@ public: void SetPressed( bool bPressed ); bool IsPressed() const { return mbPressed; } - void EndSelection(); + SAL_DLLPRIVATE void EndSelection(); Size CalcMinimumSize() const; virtual Size GetOptimalSize() const override; @@ -208,7 +208,7 @@ protected: using Control::ImplInitSettings; using Window::ImplInit; - explicit PushButton( WindowType nType ); + SAL_DLLPRIVATE explicit PushButton( WindowType nType ); virtual void FillLayoutData() const override; virtual const vcl::Font& @@ -445,20 +445,20 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - void Toggle(); + SAL_DLLPRIVATE void Toggle(); bool IsStateChanged() const { return mbStateChanged; } void EnableRadioCheck( bool bRadioCheck ) { mbRadioCheck = bRadioCheck; } bool IsRadioCheckEnabled() const { return mbRadioCheck; } - void SetModeRadioImage( const Image& rImage ); + SAL_DLLPRIVATE void SetModeRadioImage( const Image& rImage ); void SetState( bool bCheck ); void Check( bool bCheck = true ); bool IsChecked() const { return mbChecked; } - static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); + SAL_DLLPRIVATE static Image GetRadioImage( const AllSettings& rSettings, DrawButtonFlags nFlags ); Size CalcMinimumSize( tools::Long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const override; @@ -485,7 +485,7 @@ public: /* * Group this RadioButton with another */ - void group(RadioButton &rOther); + SAL_DLLPRIVATE void group(RadioButton &rOther); virtual void ShowFocus(const tools::Rectangle& rRect) override; /// Button has additional stuff that we need to dump too. diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index 699d7bb74416..1a312c99e2ec 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -163,11 +163,11 @@ private: class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter { public: - virtual ~MetricFormatter() override; + SAL_DLLPRIVATE virtual ~MetricFormatter() override; - virtual void Reformat() override; + SAL_DLLPRIVATE virtual void Reformat() override; - virtual void SetUnit( FieldUnit meUnit ); + SAL_DLLPRIVATE virtual void SetUnit( FieldUnit meUnit ); FieldUnit GetUnit() const { return meUnit; } void SetCustomUnitText( const OUString& rStr ); const OUString& GetCustomUnitText() const { return maCustomUnitText; } @@ -182,23 +182,23 @@ public: sal_Int64 GetMin( FieldUnit eOutUnit ) const; void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nValue ) override; + SAL_DLLPRIVATE virtual void SetValue( sal_Int64 nValue ) override; using NumericFormatter::SetUserValue; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); using NumericFormatter::GetValue; sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual OUString CreateFieldText( sal_Int64 nValue ) const override; + SAL_DLLPRIVATE virtual OUString CreateFieldText( sal_Int64 nValue ) const override; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; protected: FieldUnit meUnit; - MetricFormatter(Edit* pEdit); + SAL_DLLPRIVATE MetricFormatter(Edit* pEdit); SAL_DLLPRIVATE void ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ); - virtual sal_Int64 GetValueFromString(const OUString& rStr) const override; - sal_Int64 GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const; + SAL_DLLPRIVATE virtual sal_Int64 GetValueFromString(const OUString& rStr) const override; + SAL_DLLPRIVATE sal_Int64 GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const; private: OUString maCustomUnitText; @@ -209,18 +209,18 @@ class VCL_DLLPUBLIC MetricField final : public SpinField, public MetricFormatter public: explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); - virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + SAL_DLLPRIVATE virtual bool PreNotify( NotifyEvent& rNEvt ) override; + SAL_DLLPRIVATE virtual bool EventNotify( NotifyEvent& rNEvt ) override; + SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size CalcMinimumSize() const override; + SAL_DLLPRIVATE virtual Size CalcMinimumSize() const override; - virtual void Modify() override; + SAL_DLLPRIVATE virtual void Modify() override; - virtual void Up() override; - virtual void Down() override; - virtual void First() override; - virtual void Last() override; + SAL_DLLPRIVATE virtual void Up() override; + SAL_DLLPRIVATE virtual void Down() override; + SAL_DLLPRIVATE virtual void First() override; + SAL_DLLPRIVATE virtual void Last() override; virtual void SetUnit( FieldUnit meUnit ) override; @@ -229,11 +229,11 @@ public: void SetLast( sal_Int64 nNewLast, FieldUnit eInUnit ); sal_Int64 GetLast( FieldUnit eOutUnit ) const; - virtual bool set_property(const OUString &rKey, const OUString &rValue) override; - virtual void dispose() override; + SAL_DLLPRIVATE virtual bool set_property(const OUString &rKey, const OUString &rValue) override; + SAL_DLLPRIVATE virtual void dispose() override; - virtual void DumpAsPropertyTree(tools::JsonWriter&) override; - virtual FactoryFunction GetUITestFactory() const override; + SAL_DLLPRIVATE virtual void DumpAsPropertyTree(tools::JsonWriter&) override; + SAL_DLLPRIVATE virtual FactoryFunction GetUITestFactory() const override; }; class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetricBox final : public ComboBox, public MetricFormatter |