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-20 21:57:36 +0200 |
commit | b15244d526c285cd109f7195855409f698d0cdc0 (patch) | |
tree | f5b36b0d2ad0c2ba94024ef742147ed320f1ca17 /include | |
parent | 02e5afcea007365714b57e09b079ad0acca6e99d (diff) |
move SvColorDialog to welded arguments
Change-Id: Ieb04fc4684caa6df47b123ab06e280f2d204375a
Reviewed-on: https://gerrit.libreoffice.org/56162
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 | 4 | ||||
-rw-r--r-- | include/svx/PaletteManager.hxx | 2 | ||||
-rw-r--r-- | include/svx/bmpmask.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 69def8510b35..3688e348f4a5 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -36,7 +36,7 @@ namespace svtools class SVT_DLLPUBLIC SvColorDialog final { public: - SvColorDialog( vcl::Window* pParent ); + SvColorDialog(); ~SvColorDialog(); void SetColor( const Color& rColor ); @@ -44,7 +44,7 @@ public: void SetMode( svtools::ColorPickerMode eMode ); - short Execute(); + short Execute(weld::Window* pParent); private: VclPtr<vcl::Window> mpParent; 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 2b88d7dd3144..26f8791f49f2 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -90,7 +90,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 @@ -99,7 +99,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; |