diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-08 09:06:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-11 15:37:05 +0100 |
| commit | 3a42ee3284df7020ef111293a4d11148c1bf3a50 (patch) | |
| tree | d12e7c85bb5e58c0ede3a500d56856e24a9ade0a /include | |
| parent | 231c06c5c2320c0465df0cbeab4c754937a05a9b (diff) | |
weld SvxConfigDialog
Change-Id: Ia6983fd658521cf8704ca1ed95ecff6590ddde09
Reviewed-on: https://gerrit.libreoffice.org/68906
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/sfx2/sfxdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 48b6b965b64d..26d978d3b13d 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -128,7 +128,7 @@ public: static SfxAbstractDialogFactory* Create(); virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const OUString& rParameter ) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateAutoCorrTabDialog(weld::Window* pParent, const SfxItemSet* pAttrSet) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateCustomizeTabDialog( + virtual VclPtr<SfxAbstractTabDialog> CreateCustomizeTabDialog(weld::Window* pParent, const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 6c499307a7f1..42b1685a1e93 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -294,6 +294,8 @@ namespace vcl { VCL_DLLPUBLIC void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); +typedef struct _cairo_surface cairo_surface_t; + /** * Some things multiple-inherit from VclAbstractDialog and OutputDevice, * so we need to use virtual inheritance to keep the referencing counting @@ -307,6 +309,8 @@ class VCL_DLLPUBLIC OutputDevice : public virtual VclReferenceBase friend class WorkWindow; friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); + friend cairo_surface_t* get_underlying_alpha_cairo_surface(const VirtualDevice&); + private: OutputDevice(const OutputDevice&) = delete; OutputDevice& operator=(const OutputDevice&) = delete; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index fdd2d486b1e3..49ae4a249c25 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -202,6 +202,10 @@ public: //parents virtual void help_hierarchy_foreach(const std::function<bool(const OString&)>& func) = 0; + virtual OUString strip_mnemonic(const OUString& rLabel) const = 0; + + virtual VclPtr<VirtualDevice> create_virtual_device() const = 0; + virtual ~Widget() {} }; |