diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-08 12:17:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-11 21:34:45 +0100 |
| commit | cf4b65c75c07142be0fcab5835188a28e839b749 (patch) | |
| tree | 41b2bd5cd5d419f33db3839c93b9e674a193c2c1 /sfx2 | |
| parent | e0e307675cc2b962d0dcb557f4af4a34a729da66 (diff) | |
weld color picker
Change-Id: I487b9a0cc13b2b60a0f1e28667773b5d3b5c66cc
Reviewed-on: https://gerrit.libreoffice.org/51001
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/new.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/inc/preview.hxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index eed042b7d60e..be99751c9a05 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -105,9 +105,9 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFil } } -IMPL_LINK(SfxPreviewWin_Impl, DoPaint, vcl::RenderContext&, rRenderContext, void) +IMPL_LINK(SfxPreviewWin_Impl, DoPaint, weld::DrawingArea::draw_args, aPayload, void) { - ImpPaint(rRenderContext, xMetaFile.get()); + ImpPaint(aPayload.first, xMetaFile.get()); } IMPL_LINK_NOARG(SfxNewFileDialog, Update, Timer*, void) @@ -193,6 +193,7 @@ IMPL_LINK( SfxNewFileDialog, RegionSelect, weld::TreeView&, rBox, void ) m_xTemplateLb->append(m_aTemplates.GetName(nRegion, i)); m_xTemplateLb->thaw(); m_xTemplateLb->select(0); + TemplateSelect(*m_xTemplateLb); } IMPL_LINK_NOARG(SfxNewFileDialog, Expand, weld::Expander&, void) diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index 3a747db969f2..8b39231c31a8 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -32,7 +32,7 @@ protected: public: SfxPreviewWin_Impl(weld::DrawingArea* pArea); void SetObjectShell( SfxObjectShell const * pObj ); - DECL_LINK(DoPaint, vcl::RenderContext&, void); + DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); DECL_LINK(DoResize, const Size& rSize, void); void queue_draw() { m_xDrawingArea->queue_draw(); } void show() { m_xDrawingArea->show(); } |