diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-04 14:33:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-05 20:13:45 +0200 |
| commit | 368195c06679417e493db4f2060321895472f0b3 (patch) | |
| tree | bb15ede6ac9e92c251f35189fd25e6ab92394bb0 /include | |
| parent | 8fe484a989a1bea05dd9d1bc032c859c83966b0b (diff) | |
only MultiLineEditSyntaxHighlight uses UpdateData
and only the VclMultiLineEdit one which hides the Edit one so remove the unused
Edit UpdataData related functions leaving the VclMultiLineEdit set
Change-Id: Icd9a633d28907b3e5a3d52771b31574984e64d92
Reviewed-on: https://gerrit.libreoffice.org/80228
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/edit.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/vclmedit.hxx | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 2634b18fcc01..2ebb5e903f0f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -58,7 +58,6 @@ class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropCli { private: VclPtr<Edit> mpSubEdit; - std::unique_ptr<Timer> mpUpdateDataTimer; TextFilter* mpFilterText; std::unique_ptr<DDInfo, o3tl::default_delete<DDInfo>> mpDDInfo; std::unique_ptr<Impl_IMEInfos> mpIMEInfos; @@ -90,8 +89,6 @@ private: css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC; - DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void); - SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); SAL_DLLPRIVATE void ImplModified(); @@ -170,7 +167,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify(); - virtual void UpdateData(); static bool IsCharInput( const KeyEvent& rKEvt ); @@ -178,9 +174,6 @@ public: virtual void ClearModifyFlag(); virtual bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } - virtual void EnableUpdateData( sal_uLong nTimeout ); - virtual void DisableUpdateData(); - void SetEchoChar( sal_Unicode c ); sal_Unicode GetEchoChar() const { return mcEchoChar; } diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index e6144cb930b3..414705c2d70f 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -110,14 +110,14 @@ public: void SelectionChanged(); void CaretChanged(); virtual void Modify() override; - virtual void UpdateData() override; virtual void SetModifyFlag() override; virtual void ClearModifyFlag() override; virtual bool IsModified() const override; - virtual void EnableUpdateData( sal_uLong nTimeout ) override; - virtual void DisableUpdateData() override { pUpdateDataTimer.reset(); } + void EnableUpdateData( sal_uLong nTimeout ); + virtual void UpdateData(); + void DisableUpdateData() { pUpdateDataTimer.reset(); } virtual void SetReadOnly( bool bReadOnly = true ) override; virtual bool IsReadOnly() const override; |