From 23a1b7bad5147ee48d7f920085426d8846559af7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 15 May 2020 14:54:58 +0100 Subject: Resolves: tdf#132461 set color on mouse release, not press MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and rearrange to allow dnd to drop the currently selected color, not the one seen by SelectHdl which is now called on mouse release which allows the dnd from color bar to gradiant tool to work as expected Change-Id: Ib54850ff8f73dc3a0d08c76060309a7a74d2cc8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94314 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/inc/colrctrl.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/inc/colrctrl.hxx') diff --git a/svx/inc/colrctrl.hxx b/svx/inc/colrctrl.hxx index 019be34863e6..012f0085598d 100644 --- a/svx/inc/colrctrl.hxx +++ b/svx/inc/colrctrl.hxx @@ -44,6 +44,7 @@ class SvxColorValueSetData; class SAL_WARN_UNUSED SvxColorValueSet_docking final : public SvxColorValueSet { + rtl::Reference m_xHelper; bool mbLeftButton; // ValueSet @@ -51,6 +52,8 @@ class SAL_WARN_UNUSED SvxColorValueSet_docking final : public SvxColorValueSet virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; + virtual bool StartDrag() override; + public: SvxColorValueSet_docking(std::unique_ptr pWindow); @@ -69,7 +72,6 @@ friend class SvxColorChildWindow; private: XColorListRef pColorList; - rtl::Reference m_xHelper; std::unique_ptr xColorSet; std::unique_ptr xColorSetWin; @@ -85,8 +87,6 @@ private: virtual bool Close() override; - void SetupDrag(const OUString& rItemText, const Color& rItemColor, css::drawing::FillStyle eStyle); - public: SvxColorDockingWindow(SfxBindings* pBindings, SfxChildWindow *pCW, -- cgit