summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-03-26 15:39:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-03-29 22:24:18 +0100
commit0198259e4301a45c339fcdda688892e1e6a3ad9f (patch)
tree826681c831aed8a0288b0e56a9e41b1e5fc39a1f /include
parent37f5c96da886f82b819e375feab0a871cab28513 (diff)
Resolves: tdf#123291 set hex input to overwrite by default
and ensure the modify arrives after the input text has been filtered Change-Id: I16c0bd095700e7d9858e3e74884b5a1ad3eb7e4c Reviewed-on: https://gerrit.libreoffice.org/69764 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f1e52cbdd4a9753a9b9d562ef280a00e52db1dae) support overwrite-mode Change-Id: I6133aedbebd3ca358e2b916469873c38fc7453cb Reviewed-on: https://gerrit.libreoffice.org/69761 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2f70e6111b61d52bbdfa753257370cb82bfd30eb) Related: tdf#123291 treat overwrite like a selection of 1 for input into ImplTruncateToMaxLen like we do for the following erase Change-Id: I8cd02ff1ba76f61ddc614922068cbe2bc9bc4cb8 Reviewed-on: https://gerrit.libreoffice.org/69763 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8622dc09954a1a26661e3524c99e7ed0f456cf6e) Reviewed-on: https://gerrit.libreoffice.org/69800 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
-rw-r--r--include/svx/hexcolorcontrol.hxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx
index 91960d9f7f9b..f47f50fb1e82 100644
--- a/include/svx/hexcolorcontrol.hxx
+++ b/include/svx/hexcolorcontrol.hxx
@@ -34,12 +34,17 @@ class SVX_DLLPUBLIC HexColorControl
{
private:
std::unique_ptr<weld::Entry> m_xEntry;
+ Link<weld::Entry&, void> m_aModifyHdl;
+ ImplSVEvent* m_nAsyncModifyEvent;
DECL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, bool);
+ DECL_LINK(ImplProcessModifyHdl, weld::Entry&, void);
+ DECL_LINK(OnAsyncModifyHdl, void*, void);
public:
HexColorControl(std::unique_ptr<weld::Entry> pEdit);
+ ~HexColorControl();
- void connect_changed(const Link<Entry&, void>& rLink) { m_xEntry->connect_changed(rLink); }
+ void connect_changed(const Link<weld::Entry&, void>& rLink) { m_aModifyHdl = rLink; }
void SetColor( ::Color nColor );
::Color GetColor();