Resolves: tdf#118251 decide what parent colorpicker should have...

depending on if launched from a listbox within a dialog, or from
a (potentially) ephemeral toolbar

Change-Id: I5d3b5cc6dd501490b99b46250e2729fb8bc2a2e2
Reviewed-on: https://gerrit.libreoffice.org/56297
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index d6c0e01239bf..16fb45da4ff3 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -69,6 +69,7 @@ private:
     BorderColorStatus&  mrBorderColorStatus;
 
     ColorSelectFunction maColorSelectFunction;
+    bool mbReuseParentForPicker;
 
     DECL_LINK( SelectHdl, ValueSet*, void );
     DECL_LINK( SelectPaletteHdl, ListBox&, void);
@@ -86,6 +87,11 @@ public:
                    sal_uInt16 nSlotId,
                    const css::uno::Reference< css::frame::XFrame >& rFrame,
                    vcl::Window* pParentWindow,
+                   // tdf#118251 When true, reuse pParentWindow as the parent of the color picker
+                   // that appears from the 'custom color' button. When false use the window of
+                   // rFrame. true is helpful when launched from a dialog, false for launched
+                   // from a toolbar
+                   bool bReuseParentForPicker,
                    ColorSelectFunction const& rColorSelectFunction);
     virtual ~SvxColorWindow() override;
     virtual void        dispose() override;