[Libreoffice-commits] core.git: chart2/source include/svx svx/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jan 24 15:02:41 UTC 2020
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6 -
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 6 -
include/svx/dlgctl3d.hxx | 14 ++--
include/svx/float3d.hxx | 4 -
svx/source/dialog/dlgctl3d.cxx | 36 +++++------
svx/source/engine3d/float3d.cxx | 4 -
6 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 7d55b62c1e306819fe3235cdb5a9c1aff792fe05
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 24 12:16:44 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 24 16:02:12 2020 +0100
rename LightCtl3D back to SvxLightCtl3D
Change-Id: I2cf5d019324643b048eea432753705af485720a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87336
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 058e0a208afc..3af93be0727b 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -210,7 +210,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage(weld::Contain
, m_xBtn_Corner(m_xBuilder->weld_button("corner"))
, m_xPreview(new LightControl3D)
, m_xPreviewWnd(new weld::CustomWeld(*m_xBuilder, "CTL_LIGHT_PREVIEW", *m_xPreview))
- , m_xCtl_Preview(new LightCtl3D(*m_xPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner))
+ , m_xCtl_Preview(new SvxLightCtl3D(*m_xPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner))
{
m_pLightSourceInfoList.reset(new LightSourceInfo[8]);
m_pLightSourceInfoList[0].pButton = m_xBtn_Light1.get();
@@ -283,7 +283,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel()
m_aTimerTriggeredControllerLock.startTimer();
}
-IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, LightCtl3D*, void)
+IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void)
{
m_aTimerTriggeredControllerLock.startTimer();
@@ -333,7 +333,7 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, LightCtl3D*,
applyLightSourcesToModel();
}
-IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, LightCtl3D*, void)
+IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void)
{
sal_uInt32 nLightNumber = m_xCtl_Preview->GetSvx3DLightControl().GetSelectedLight();
if(nLightNumber<8)
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 049680760fa7..46cbc279c7ac 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -46,8 +46,8 @@ private:
DECL_LINK( ClickLightSourceButtonHdl, weld::Button&, void );
DECL_LINK( SelectColorHdl, ColorListBox&, void );
DECL_LINK( ColorDialogHdl, weld::Button&, void );
- DECL_LINK( PreviewChangeHdl, LightCtl3D*, void );
- DECL_LINK( PreviewSelectHdl, LightCtl3D*, void );
+ DECL_LINK( PreviewChangeHdl, SvxLightCtl3D*, void );
+ DECL_LINK( PreviewSelectHdl, SvxLightCtl3D*, void );
void updatePreview();
@@ -87,7 +87,7 @@ private:
std::unique_ptr<weld::Button> m_xBtn_Corner;
std::unique_ptr<LightControl3D> m_xPreview;
std::unique_ptr<weld::CustomWeld> m_xPreviewWnd;
- std::unique_ptr<LightCtl3D> m_xCtl_Preview;
+ std::unique_ptr<SvxLightCtl3D> m_xCtl_Preview;
};
} //namespace chart
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 8264c06049db..3e9fcc313869 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -207,7 +207,7 @@ public:
basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const;
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC LightCtl3D
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLightCtl3D
{
// local controls
LightControl3D& mrLightControl;
@@ -216,13 +216,13 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC LightCtl3D
weld::Button& mrSwitcher;
// callback for interactive changes
- Link<LightCtl3D*,void> maUserInteractiveChangeCallback;
- Link<LightCtl3D*,void> maUserSelectionChangeCallback;
+ Link<SvxLightCtl3D*,void> maUserInteractiveChangeCallback;
+ Link<SvxLightCtl3D*,void> maUserSelectionChangeCallback;
public:
- LightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
+ SvxLightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
weld::Scale& rVert, weld::Button& rButton);
- ~LightCtl3D();
+ ~SvxLightCtl3D();
// check the selection for validity
void CheckSelection();
@@ -231,8 +231,8 @@ public:
LightControl3D& GetSvx3DLightControl() { return mrLightControl; }
// register user callback
- void SetUserInteractiveChangeCallback(Link<LightCtl3D*,void> aNew) { maUserInteractiveChangeCallback = aNew; }
- void SetUserSelectionChangeCallback(Link<LightCtl3D*,void> aNew) { maUserSelectionChangeCallback = aNew; }
+ void SetUserInteractiveChangeCallback(Link<SvxLightCtl3D*,void> aNew) { maUserInteractiveChangeCallback = aNew; }
+ void SetUserSelectionChangeCallback(Link<SvxLightCtl3D*,void> aNew) { maUserSelectionChangeCallback = aNew; }
private:
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d899b2d5e4fc..cd2dd69c1f91 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -186,7 +186,7 @@ private:
std::unique_ptr<weld::Button> m_xBtn_Corner;
std::unique_ptr<LightControl3D> m_xLightPreview;
std::unique_ptr<weld::CustomWeld> m_xCtlLightPreviewWin;
- std::unique_ptr<LightCtl3D> m_xCtlLightPreview;
+ std::unique_ptr<SvxLightCtl3D> m_xCtlLightPreview;
// bottom part
std::unique_ptr<weld::Button> m_xBtnConvertTo3D;
@@ -224,7 +224,7 @@ private:
DECL_LINK( ModifySpinHdl, weld::SpinButton&, void );
void ClickLight(const LightButton& rBtn);
- DECL_LINK( ChangeSelectionCallbackHdl, LightCtl3D*, void );
+ DECL_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void );
SVX_DLLPRIVATE void Construct();
SVX_DLLPRIVATE void Reset();
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 758084678aea..7e76f5dff640 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -1594,7 +1594,7 @@ basegfx::B3DVector LightControl3D::GetLightDirection(sal_uInt32 nNum) const
return basegfx::B3DVector();
}
-LightCtl3D::LightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
+SvxLightCtl3D::SvxLightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
weld::Scale& rVert, weld::Button& rSwitcher)
: mrLightControl(rLightControl)
, mrHorScroller(rHori)
@@ -1605,7 +1605,7 @@ LightCtl3D::LightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
Init();
}
-void LightCtl3D::Init()
+void SvxLightCtl3D::Init()
{
Size aSize(mrLightControl.GetDrawingArea()->get_ref_device().LogicToPixel(Size(80, 100), MapMode(MapUnit::MapAppFont)));
mrLightControl.set_size_request(aSize.Width(), aSize.Height());
@@ -1618,39 +1618,39 @@ void LightCtl3D::Init()
// Light preview
mrLightControl.Show();
- mrLightControl.SetChangeCallback( LINK(this, LightCtl3D, InternalInteractiveChange) );
- mrLightControl.SetSelectionChangeCallback( LINK(this, LightCtl3D, InternalSelectionChange) );
+ mrLightControl.SetChangeCallback( LINK(this, SvxLightCtl3D, InternalInteractiveChange) );
+ mrLightControl.SetSelectionChangeCallback( LINK(this, SvxLightCtl3D, InternalSelectionChange) );
// Horiz Scrollbar
mrHorScroller.show();
mrHorScroller.set_range(0, 36000);
- mrHorScroller.connect_value_changed( LINK(this, LightCtl3D, ScrollBarMove) );
+ mrHorScroller.connect_value_changed( LINK(this, SvxLightCtl3D, ScrollBarMove) );
// Vert Scrollbar
mrVerScroller.show();
mrVerScroller.set_range(0, 18000);
- mrVerScroller.connect_value_changed( LINK(this, LightCtl3D, ScrollBarMove) );
+ mrVerScroller.connect_value_changed( LINK(this, SvxLightCtl3D, ScrollBarMove) );
// Switch Button
mrSwitcher.show();
- mrSwitcher.connect_clicked( LINK(this, LightCtl3D, ButtonPress) );
+ mrSwitcher.connect_clicked( LINK(this, SvxLightCtl3D, ButtonPress) );
weld::DrawingArea* pArea = mrLightControl.GetDrawingArea();
pArea->connect_key_press(Link<const KeyEvent&, bool>()); //acknowledge we first remove the old one
- pArea->connect_key_press(LINK(this, LightCtl3D, KeyInput));
+ pArea->connect_key_press(LINK(this, SvxLightCtl3D, KeyInput));
pArea->connect_focus_in(Link<weld::Widget&, void>()); //acknowledge we first remove the old one
- pArea->connect_focus_in(LINK(this, LightCtl3D, FocusIn));
+ pArea->connect_focus_in(LINK(this, SvxLightCtl3D, FocusIn));
// check selection
CheckSelection();
}
-LightCtl3D::~LightCtl3D()
+SvxLightCtl3D::~SvxLightCtl3D()
{
}
-void LightCtl3D::CheckSelection()
+void SvxLightCtl3D::CheckSelection()
{
const bool bSelectionValid(mrLightControl.IsSelectionValid() || mrLightControl.IsGeometrySelected());
mrHorScroller.set_sensitive(bSelectionValid);
@@ -1665,7 +1665,7 @@ void LightCtl3D::CheckSelection()
}
}
-void LightCtl3D::move( double fDeltaHor, double fDeltaVer )
+void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer )
{
double fHor(0.0), fVer(0.0);
@@ -1689,7 +1689,7 @@ void LightCtl3D::move( double fDeltaHor, double fDeltaVer )
}
}
-IMPL_LINK(LightCtl3D, KeyInput, const KeyEvent&, rKEvt, bool)
+IMPL_LINK(SvxLightCtl3D, KeyInput, const KeyEvent&, rKEvt, bool)
{
const vcl::KeyCode aCode(rKEvt.GetKeyCode());
@@ -1797,7 +1797,7 @@ IMPL_LINK(LightCtl3D, KeyInput, const KeyEvent&, rKEvt, bool)
return bHandled;
}
-IMPL_LINK_NOARG(LightCtl3D, FocusIn, weld::Widget&, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, FocusIn, weld::Widget&, void)
{
if (mrLightControl.IsEnabled())
{
@@ -1805,7 +1805,7 @@ IMPL_LINK_NOARG(LightCtl3D, FocusIn, weld::Widget&, void)
}
}
-IMPL_LINK_NOARG(LightCtl3D, ScrollBarMove, weld::Scale&, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove, weld::Scale&, void)
{
const sal_Int32 nHor(mrHorScroller.get_value());
const sal_Int32 nVer(mrVerScroller.get_value());
@@ -1820,7 +1820,7 @@ IMPL_LINK_NOARG(LightCtl3D, ScrollBarMove, weld::Scale&, void)
}
}
-IMPL_LINK_NOARG(LightCtl3D, ButtonPress, weld::Button&, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress, weld::Button&, void)
{
if(SvxPreviewObjectType::SPHERE == GetSvx3DLightControl().GetObjectType())
{
@@ -1832,7 +1832,7 @@ IMPL_LINK_NOARG(LightCtl3D, ButtonPress, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(LightCtl3D, InternalInteractiveChange, LightControl3D*, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, LightControl3D*, void)
{
double fHor(0.0), fVer(0.0);
@@ -1846,7 +1846,7 @@ IMPL_LINK_NOARG(LightCtl3D, InternalInteractiveChange, LightControl3D*, void)
}
}
-IMPL_LINK_NOARG(LightCtl3D, InternalSelectionChange, LightControl3D*, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange, LightControl3D*, void)
{
CheckSelection();
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 2147bc152fc3..063dccfcc075 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -183,7 +183,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, m_xBtn_Corner(m_xBuilder->weld_button("corner"))
, m_xLightPreview(new LightControl3D)
, m_xCtlLightPreviewWin(new weld::CustomWeld(*m_xBuilder, "lightpreview", *m_xLightPreview))
- , m_xCtlLightPreview(new LightCtl3D(*m_xLightPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner)) // TODO might be other body widget as arg 1
+ , m_xCtlLightPreview(new SvxLightCtl3D(*m_xLightPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner)) // TODO might be other body widget as arg 1
, m_xBtnConvertTo3D(m_xBuilder->weld_button("to3d"))
, m_xBtnLatheObject(m_xBuilder->weld_button("tolathe"))
@@ -2645,7 +2645,7 @@ void Svx3DWin::ClickLight(const LightButton& rBtn)
m_xCtlLightPreview->CheckSelection();
}
-IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl, LightCtl3D*, void)
+IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void)
{
const sal_uInt32 nLight(m_xCtlLightPreview->GetSvx3DLightControl().GetSelectedLight());
weld::Button* pBtn = nullptr;
More information about the Libreoffice-commits
mailing list