diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-20 14:15:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-21 09:59:39 +0200 |
| commit | 649be5feb4e162f83e9ff5fc8a68b463e723bc07 (patch) | |
| tree | 30ed9e92936bfa51ec376e438fabccc55facff0c /include | |
| parent | 1d48e998ae038263b092e0de71da97fceee299f4 (diff) | |
move SvColorDialog to welded arguments
Change-Id: Ieb04fc4684caa6df47b123ab06e280f2d204375a
Reviewed-on: https://gerrit.libreoffice.org/56174
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/svtools/colrdlg.hxx | 8 | ||||
| -rw-r--r-- | include/svx/PaletteManager.hxx | 2 | ||||
| -rw-r--r-- | include/svx/bmpmask.hxx | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 69def8510b35..f89ec0f5419a 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -21,10 +21,9 @@ #define INCLUDED_SVTOOLS_COLRDLG_HXX #include <svtools/svtdllapi.h> -#include <vcl/vclptr.hxx> #include <tools/color.hxx> -namespace vcl { class Window; } +namespace weld { class Window; } namespace svtools { @@ -36,7 +35,7 @@ namespace svtools class SVT_DLLPUBLIC SvColorDialog final { public: - SvColorDialog( vcl::Window* pParent ); + SvColorDialog(); ~SvColorDialog(); void SetColor( const Color& rColor ); @@ -44,10 +43,9 @@ public: void SetMode( svtools::ColorPickerMode eMode ); - short Execute(); + short Execute(weld::Window* pParent); private: - VclPtr<vcl::Window> mpParent; Color maColor; svtools::ColorPickerMode meMode; }; diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index d4b6fd1a2298..ed8f639374f3 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -74,7 +74,7 @@ public: void AddRecentColor(const Color& rRecentColor, const OUString& rColorName, bool bFront = true); void SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater); - void PopupColorPicker(vcl::Window* pParent, const OUString& aCommand, const Color& rInitialColor); + void PopupColorPicker(weld::Window* pParent, const OUString& aCommand, const Color& rInitialColor); void SetColorSelectFunction(const std::function<void(const OUString&, const NamedColor&)>& aColorSelectFunction); diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index a471ffcf880a..75c31f56459c 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -89,7 +89,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindo class MaskData; class MaskSet; -class ColorWindow; +class BmpColorWindow; class SvxColorListBox; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow @@ -98,7 +98,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow friend class MaskSet; VclPtr<ToolBox> m_pTbxPipette; - VclPtr<ColorWindow> m_pCtlPipette; + VclPtr<BmpColorWindow> m_pCtlPipette; VclPtr<PushButton> m_pBtnExec; VclPtr<CheckBox> m_pCbx1; |