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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 12 insertions, 12 deletions

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;