[Libreoffice-commits] core.git: chart2/source include/svx svx/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jan 24 15:05:16 UTC 2020
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 2
include/svx/dlgctl3d.hxx | 22 ++--
include/svx/float3d.hxx | 2
svx/source/dialog/dlgctl3d.cxx | 52 +++++------
svx/source/engine3d/float3d.cxx | 2
6 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit df416b69199bb56c18a9493eeae6b67df3863a34
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 24 12:19:14 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 24 16:04:38 2020 +0100
rename LightControl3D back to Svx3DLightControl
Change-Id: I3e62bd55f195e9f652ddc21bff74f529a8678b5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87337
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 3af93be0727b..ff2f4f46b132 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -208,7 +208,7 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage(weld::Contain
, m_xHoriScale(m_xBuilder->weld_scale("hori"))
, m_xVertScale(m_xBuilder->weld_scale("vert"))
, m_xBtn_Corner(m_xBuilder->weld_button("corner"))
- , m_xPreview(new LightControl3D)
+ , m_xPreview(new Svx3DLightControl)
, m_xPreviewWnd(new weld::CustomWeld(*m_xBuilder, "CTL_LIGHT_PREVIEW", *m_xPreview))
, m_xCtl_Preview(new SvxLightCtl3D(*m_xPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner))
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 46cbc279c7ac..78c84f23472e 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -85,7 +85,7 @@ private:
std::unique_ptr<weld::Scale> m_xHoriScale;
std::unique_ptr<weld::Scale> m_xVertScale;
std::unique_ptr<weld::Button> m_xBtn_Corner;
- std::unique_ptr<LightControl3D> m_xPreview;
+ std::unique_ptr<Svx3DLightControl> m_xPreview;
std::unique_ptr<weld::CustomWeld> m_xPreviewWnd;
std::unique_ptr<SvxLightCtl3D> m_xCtl_Preview;
};
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 5f19d6a5dccb..0626a7219b7a 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -62,11 +62,11 @@ public:
virtual void Set3DAttributes(const SfxItemSet& rAttr);
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC LightControl3D final : public PreviewControl3D
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl final : public PreviewControl3D
{
// Callback for interactive changes
- Link<LightControl3D*,void> maChangeCallback;
- Link<LightControl3D*,void> maSelectionChangeCallback;
+ Link<Svx3DLightControl*,void> maChangeCallback;
+ Link<Svx3DLightControl*,void> maSelectionChangeCallback;
// lights
sal_uInt32 maSelectedLight;
@@ -98,7 +98,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC LightControl3D final : public PreviewControl
void TrySelection(Point aPosPixel);
public:
- LightControl3D();
+ Svx3DLightControl();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
@@ -111,8 +111,8 @@ public:
virtual void SetObjectType(SvxPreviewObjectType nType) override;
// register user callback
- void SetChangeCallback(Link<LightControl3D*,void> aNew) { maChangeCallback = aNew; }
- void SetSelectionChangeCallback(Link<LightControl3D*,void> aNew) { maSelectionChangeCallback = aNew; }
+ void SetChangeCallback(Link<Svx3DLightControl*,void> aNew) { maChangeCallback = aNew; }
+ void SetSelectionChangeCallback(Link<Svx3DLightControl*,void> aNew) { maSelectionChangeCallback = aNew; }
// selection checks
bool IsSelectionValid();
@@ -139,7 +139,7 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLightCtl3D
{
// local controls
- LightControl3D& mrLightControl;
+ Svx3DLightControl& mrLightControl;
weld::Scale& mrHorScroller;
weld::Scale& mrVerScroller;
weld::Button& mrSwitcher;
@@ -149,7 +149,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLightCtl3D
Link<SvxLightCtl3D*,void> maUserSelectionChangeCallback;
public:
- SvxLightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
+ SvxLightCtl3D(Svx3DLightControl& rLightControl, weld::Scale& rHori,
weld::Scale& rVert, weld::Button& rButton);
~SvxLightCtl3D();
@@ -157,7 +157,7 @@ public:
void CheckSelection();
// bring further settings to the outside world
- LightControl3D& GetSvx3DLightControl() { return mrLightControl; }
+ Svx3DLightControl& GetSvx3DLightControl() { return mrLightControl; }
// register user callback
void SetUserInteractiveChangeCallback(Link<SvxLightCtl3D*,void> aNew) { maUserInteractiveChangeCallback = aNew; }
@@ -165,8 +165,8 @@ public:
private:
- DECL_LINK(InternalInteractiveChange, LightControl3D*, void);
- DECL_LINK(InternalSelectionChange, LightControl3D*, void);
+ DECL_LINK(InternalInteractiveChange, Svx3DLightControl*, void);
+ DECL_LINK(InternalSelectionChange, Svx3DLightControl*, void);
DECL_LINK(ScrollBarMove, weld::Scale&, void);
DECL_LINK(ButtonPress, weld::Button&, void);
DECL_LINK(KeyInput, const KeyEvent&, bool);
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index cd2dd69c1f91..d0fef7666b90 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -184,7 +184,7 @@ private:
std::unique_ptr<weld::Scale> m_xHoriScale;
std::unique_ptr<weld::Scale> m_xVertScale;
std::unique_ptr<weld::Button> m_xBtn_Corner;
- std::unique_ptr<LightControl3D> m_xLightPreview;
+ std::unique_ptr<Svx3DLightControl> m_xLightPreview;
std::unique_ptr<weld::CustomWeld> m_xCtlLightPreviewWin;
std::unique_ptr<SvxLightCtl3D> m_xCtlLightPreview;
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index d73824085779..d0564394c8b6 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -244,7 +244,7 @@ void PreviewControl3D::Set3DAttributes( const SfxItemSet& rAttr )
static const sal_Int32 g_nInteractionStartDistance = 5 * 5 * 2;
-LightControl3D::LightControl3D()
+Svx3DLightControl::Svx3DLightControl()
: maChangeCallback(),
maSelectionChangeCallback(),
maSelectedLight(NO_LIGHT_SELECTED),
@@ -265,13 +265,13 @@ LightControl3D::LightControl3D()
{
}
-void LightControl3D::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void Svx3DLightControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
PreviewControl3D::SetDrawingArea(pDrawingArea);
Construct2();
}
-void LightControl3D::Construct2()
+void Svx3DLightControl::Construct2()
{
{
// hide all page stuff, use control background (normally gray)
@@ -363,7 +363,7 @@ void LightControl3D::Construct2()
mpScene->SetRectsDirty();
}
-void LightControl3D::ConstructLightObjects()
+void Svx3DLightControl::ConstructLightObjects()
{
for(sal_uInt32 a(0); a < MAX_NUMBER_LIGHTS; a++)
{
@@ -407,7 +407,7 @@ void LightControl3D::ConstructLightObjects()
}
}
-void LightControl3D::AdaptToSelectedLight()
+void Svx3DLightControl::AdaptToSelectedLight()
{
if(NO_LIGHT_SELECTED == maSelectedLight)
{
@@ -459,7 +459,7 @@ void LightControl3D::AdaptToSelectedLight()
}
}
-void LightControl3D::TrySelection(Point aPosPixel)
+void Svx3DLightControl::TrySelection(Point aPosPixel)
{
if(mpScene)
{
@@ -525,12 +525,12 @@ void LightControl3D::TrySelection(Point aPosPixel)
}
}
-void LightControl3D::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
+void Svx3DLightControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
PreviewControl3D::Paint(rRenderContext, rRect);
}
-tools::Rectangle LightControl3D::GetFocusRect()
+tools::Rectangle Svx3DLightControl::GetFocusRect()
{
if (!HasFocus())
return tools::Rectangle();
@@ -540,7 +540,7 @@ tools::Rectangle LightControl3D::GetFocusRect()
return tools::Rectangle(Point(2, 2), aFocusSize);
}
-bool LightControl3D::MouseButtonDown( const MouseEvent& rMEvt )
+bool Svx3DLightControl::MouseButtonDown( const MouseEvent& rMEvt )
{
bool bCallParent(true);
@@ -569,7 +569,7 @@ bool LightControl3D::MouseButtonDown( const MouseEvent& rMEvt )
return true;
}
-bool LightControl3D::MouseMove(const MouseEvent& rMEvt)
+bool Svx3DLightControl::MouseMove(const MouseEvent& rMEvt)
{
if (!mbMouseCaptured)
return false;
@@ -661,7 +661,7 @@ bool LightControl3D::MouseMove(const MouseEvent& rMEvt)
return true;
}
-bool LightControl3D::MouseButtonUp(const MouseEvent& rMEvt)
+bool Svx3DLightControl::MouseButtonUp(const MouseEvent& rMEvt)
{
if (!mbMouseCaptured)
return false;
@@ -681,7 +681,7 @@ bool LightControl3D::MouseButtonUp(const MouseEvent& rMEvt)
return true;
}
-void LightControl3D::Resize()
+void Svx3DLightControl::Resize()
{
// set size of page
const Size aSize(GetDrawingArea()->get_ref_device().PixelToLogic(GetOutputSizePixel()));
@@ -691,7 +691,7 @@ void LightControl3D::Resize()
mpScene->SetSnapRect(tools::Rectangle(Point(0, 0), aSize));
}
-void LightControl3D::SetObjectType(SvxPreviewObjectType nType)
+void Svx3DLightControl::SetObjectType(SvxPreviewObjectType nType)
{
// call parent
PreviewControl3D::SetObjectType(nType);
@@ -705,12 +705,12 @@ void LightControl3D::SetObjectType(SvxPreviewObjectType nType)
}
}
-bool LightControl3D::IsSelectionValid()
+bool Svx3DLightControl::IsSelectionValid()
{
return (NO_LIGHT_SELECTED != maSelectedLight) && GetLightOnOff(maSelectedLight);
}
-void LightControl3D::GetPosition(double& rHor, double& rVer)
+void Svx3DLightControl::GetPosition(double& rHor, double& rVer)
{
if(IsSelectionValid())
{
@@ -726,7 +726,7 @@ void LightControl3D::GetPosition(double& rHor, double& rVer)
}
}
-void LightControl3D::SetPosition(double fHor, double fVer)
+void Svx3DLightControl::SetPosition(double fHor, double fVer)
{
if(IsSelectionValid())
{
@@ -780,7 +780,7 @@ void LightControl3D::SetPosition(double fHor, double fVer)
}
}
-void LightControl3D::SetRotation(double fRotX, double fRotY, double fRotZ)
+void Svx3DLightControl::SetRotation(double fRotX, double fRotY, double fRotZ)
{
if(IsGeometrySelected())
{
@@ -802,14 +802,14 @@ void LightControl3D::SetRotation(double fRotX, double fRotY, double fRotZ)
}
}
-void LightControl3D::GetRotation(double& rRotX, double& rRotY, double& rRotZ)
+void Svx3DLightControl::GetRotation(double& rRotX, double& rRotY, double& rRotZ)
{
rRotX = mfRotateX;
rRotY = mfRotateY;
rRotZ = mfRotateZ;
}
-void LightControl3D::Set3DAttributes( const SfxItemSet& rAttr )
+void Svx3DLightControl::Set3DAttributes( const SfxItemSet& rAttr )
{
// call parent
PreviewControl3D::Set3DAttributes(rAttr);
@@ -826,7 +826,7 @@ void LightControl3D::Set3DAttributes( const SfxItemSet& rAttr )
Invalidate();
}
-void LightControl3D::SelectLight(sal_uInt32 nLightNumber)
+void Svx3DLightControl::SelectLight(sal_uInt32 nLightNumber)
{
if(nLightNumber > 7)
{
@@ -851,7 +851,7 @@ void LightControl3D::SelectLight(sal_uInt32 nLightNumber)
}
}
-bool LightControl3D::GetLightOnOff(sal_uInt32 nNum) const
+bool Svx3DLightControl::GetLightOnOff(sal_uInt32 nNum) const
{
if(nNum <= 7)
{
@@ -873,7 +873,7 @@ bool LightControl3D::GetLightOnOff(sal_uInt32 nNum) const
return false;
}
-Color LightControl3D::GetLightColor(sal_uInt32 nNum) const
+Color Svx3DLightControl::GetLightColor(sal_uInt32 nNum) const
{
if(nNum <= 7)
{
@@ -895,7 +895,7 @@ Color LightControl3D::GetLightColor(sal_uInt32 nNum) const
return COL_BLACK;
}
-basegfx::B3DVector LightControl3D::GetLightDirection(sal_uInt32 nNum) const
+basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const
{
if(nNum <= 7)
{
@@ -917,7 +917,7 @@ basegfx::B3DVector LightControl3D::GetLightDirection(sal_uInt32 nNum) const
return basegfx::B3DVector();
}
-SvxLightCtl3D::SvxLightCtl3D(LightControl3D& rLightControl, weld::Scale& rHori,
+SvxLightCtl3D::SvxLightCtl3D(Svx3DLightControl& rLightControl, weld::Scale& rHori,
weld::Scale& rVert, weld::Button& rSwitcher)
: mrLightControl(rLightControl)
, mrHorScroller(rHori)
@@ -1155,7 +1155,7 @@ IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress, weld::Button&, void)
}
}
-IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, LightControl3D*, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightControl*, void)
{
double fHor(0.0), fVer(0.0);
@@ -1169,7 +1169,7 @@ IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, LightControl3D*, void)
}
}
-IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange, LightControl3D*, void)
+IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange, Svx3DLightControl*, void)
{
CheckSelection();
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 063dccfcc075..7bdc178c9ebf 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -181,7 +181,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, m_xHoriScale(m_xBuilder->weld_scale("horiscale"))
, m_xVertScale(m_xBuilder->weld_scale("vertscale"))
, m_xBtn_Corner(m_xBuilder->weld_button("corner"))
- , m_xLightPreview(new LightControl3D)
+ , m_xLightPreview(new Svx3DLightControl)
, m_xCtlLightPreviewWin(new weld::CustomWeld(*m_xBuilder, "lightpreview", *m_xLightPreview))
, m_xCtlLightPreview(new SvxLightCtl3D(*m_xLightPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner)) // TODO might be other body widget as arg 1
More information about the Libreoffice-commits
mailing list