summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/svx/colorwindow.hxx6
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;