include/svx/float3d.hxx | 2 +-
svx/source/engine3d/float3d.cxx | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 5f70927f948c4c86887236a0451545ce0ca20ec2
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Mar 11 00:01:34 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 11 11:26:56 2020 +0100
tdf#131265: Fix 'update' icon in 3D Effects dialog meaning
The effect was reversed
Change-Id: I611d12eec88ba213d952df541cec89c0664471cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90313
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index ada0af345ab4..021cd080e28f 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -214,7 +214,7 @@ private:
std::unique_ptr<SfxItemSet> mpRemember2DAttributes;
DECL_LINK( ClickViewTypeHdl, weld::Button&, void );
- DECL_LINK( ClickUpdateHdl, weld::Button&, void );
+ DECL_LINK( ClickUpdateHdl, weld::ToggleButton&, void );
DECL_LINK( ClickAssignHdl, weld::Button&, void );
DECL_LINK( ClickHdl, weld::Button&, void );
DECL_LINK( ClickColorHdl, weld::Button&, void );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 181c5c71a705..8636cfc2baaa 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -220,7 +220,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow
*pCW, vcl::Window* p
pConvertTo3DLatheItem.reset( new
SvxConvertTo3DItem(SID_CONVERT_TO_3D_LATHE_FAST, pBindings) );
m_xBtnAssign->connect_clicked( LINK( this, Svx3DWin, ClickAssignHdl ) );
- m_xBtnUpdate->connect_clicked( LINK( this, Svx3DWin, ClickUpdateHdl ) );
+ m_xBtnUpdate->connect_toggled( LINK( this, Svx3DWin, ClickUpdateHdl ) );
Link<weld::Button&,void> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) );
m_xBtnGeo->connect_clicked( aLink );
@@ -451,6 +451,7 @@ void Svx3DWin::Reset()
m_xMtrMatSpecularIntensity->set_value( 50, FieldUnit::PERCENT );
m_xBtnLight1->set_active(true);
+ m_xBtnUpdate->set_active(true);
ClickUpdateHdl(*m_xBtnUpdate);
// Select nothing, to avoid errors when selecting the first
@@ -2198,9 +2199,9 @@ void Svx3DWin::Resize()
SfxDockingWindow::Resize();
}
-IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, weld::Button&, void)
+IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, weld::ToggleButton&, void)
{
- bUpdate = !m_xBtnUpdate->get_active();
+ bUpdate = m_xBtnUpdate->get_active();
if( bUpdate )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
