include/svx/dlgctl3d.hxx | 8 ++++----
include/svx/float3d.hxx | 2 +-
svx/source/dialog/dlgctl3d.cxx | 30 +++++++++++++++---------------
svx/source/engine3d/float3d.cxx | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit de7871bea289c984e53b6ecadde796d4b4bcf0e9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 24 12:20:55 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jan 24 16:05:05 2020 +0100
rename PreviewControl3D back to Svx3DPreviewControl
Change-Id: I90791c4d87da465fbf486014cefe755985b600b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87338
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 0626a7219b7a..d43ab5f4c8d8 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -35,7 +35,7 @@ class E3dScene;
enum class SvxPreviewObjectType { SPHERE, CUBE };
-class SAL_WARN_UNUSED SVX_DLLPUBLIC PreviewControl3D : public
weld::CustomWidgetController
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DPreviewControl : public
weld::CustomWidgetController
{
protected:
std::unique_ptr<FmFormModel> mpModel;
@@ -48,9 +48,9 @@ protected:
void Construct();
public:
- PreviewControl3D();
+ Svx3DPreviewControl();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
- virtual ~PreviewControl3D() override;
+ virtual ~Svx3DPreviewControl() override;
virtual void Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect ) override;
virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override;
@@ -62,7 +62,7 @@ public:
virtual void Set3DAttributes(const SfxItemSet& rAttr);
};
-class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl final : public
PreviewControl3D
+class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl final : public
Svx3DPreviewControl
{
// Callback for interactive changes
Link<Svx3DLightControl*,void> maChangeCallback;
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d0fef7666b90..ada0af345ab4 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -177,7 +177,7 @@ private:
std::unique_ptr<weld::Button> m_xBtnSpecularColor;
std::unique_ptr<weld::MetricSpinButton> m_xMtrMatSpecularIntensity;
- std::unique_ptr<PreviewControl3D> m_xCtlPreview;
+ std::unique_ptr<Svx3DPreviewControl> m_xCtlPreview;
std::unique_ptr<weld::CustomWeld> m_xCtlPreviewWin;
std::unique_ptr<weld::Widget> m_xLightPreviewGrid;
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index d0564394c8b6..afbef78f9818 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -44,7 +44,7 @@
using namespace com::sun::star;
-PreviewControl3D::PreviewControl3D()
+Svx3DPreviewControl::Svx3DPreviewControl()
: mpFmPage(nullptr)
, mpScene(nullptr)
, mp3DObj(nullptr)
@@ -52,7 +52,7 @@ PreviewControl3D::PreviewControl3D()
{
}
-void PreviewControl3D::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void Svx3DPreviewControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(80, 100),
MapMode(MapUnit::MapAppFont)));
pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
@@ -62,13 +62,13 @@ void PreviewControl3D::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
Construct();
}
-PreviewControl3D::~PreviewControl3D()
+Svx3DPreviewControl::~Svx3DPreviewControl()
{
mp3DView.reset();
mpModel.reset();
}
-void PreviewControl3D::Construct()
+void Svx3DPreviewControl::Construct()
{
// Do never mirror the preview window. This explicitly includes right
// to left writing environments.
@@ -139,7 +139,7 @@ void PreviewControl3D::Construct()
mp3DView->MarkObj( mpScene, pPageView );
}
-void PreviewControl3D::Resize()
+void Svx3DPreviewControl::Resize()
{
// size of page
Size aSize(GetOutputSizePixel());
@@ -154,12 +154,12 @@ void PreviewControl3D::Resize()
mpScene->SetSnapRect( aRect );
}
-void PreviewControl3D::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
+void Svx3DPreviewControl::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
mp3DView->CompleteRedraw(&rRenderContext, vcl::Region(rRect));
}
-bool PreviewControl3D::MouseButtonDown(const MouseEvent& rMEvt)
+bool Svx3DPreviewControl::MouseButtonDown(const MouseEvent& rMEvt)
{
if (rMEvt.IsShift() && rMEvt.IsMod1())
{
@@ -175,7 +175,7 @@ bool PreviewControl3D::MouseButtonDown(const MouseEvent&
rMEvt)
return false;
}
-void PreviewControl3D::SetObjectType(SvxPreviewObjectType nType)
+void Svx3DPreviewControl::SetObjectType(SvxPreviewObjectType nType)
{
if( mnObjectType != nType || !mp3DObj)
{
@@ -224,12 +224,12 @@ void PreviewControl3D::SetObjectType(SvxPreviewObjectType
nType)
}
}
-SfxItemSet const & PreviewControl3D::Get3DAttributes() const
+SfxItemSet const & Svx3DPreviewControl::Get3DAttributes() const
{
return mp3DObj->GetMergedItemSet();
}
-void PreviewControl3D::Set3DAttributes( const SfxItemSet& rAttr )
+void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr )
{
mp3DObj->SetMergedItemSet(rAttr, true);
Resize();
@@ -267,7 +267,7 @@ Svx3DLightControl::Svx3DLightControl()
void Svx3DLightControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
- PreviewControl3D::SetDrawingArea(pDrawingArea);
+ Svx3DPreviewControl::SetDrawingArea(pDrawingArea);
Construct2();
}
@@ -527,7 +527,7 @@ void Svx3DLightControl::TrySelection(Point aPosPixel)
void Svx3DLightControl::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
- PreviewControl3D::Paint(rRenderContext, rRect);
+ Svx3DPreviewControl::Paint(rRenderContext, rRect);
}
tools::Rectangle Svx3DLightControl::GetFocusRect()
@@ -565,7 +565,7 @@ bool Svx3DLightControl::MouseButtonDown( const MouseEvent&
rMEvt )
// call parent
if (bCallParent)
- return PreviewControl3D::MouseButtonDown(rMEvt);
+ return Svx3DPreviewControl::MouseButtonDown(rMEvt);
return true;
}
@@ -694,7 +694,7 @@ void Svx3DLightControl::Resize()
void Svx3DLightControl::SetObjectType(SvxPreviewObjectType nType)
{
// call parent
- PreviewControl3D::SetObjectType(nType);
+ Svx3DPreviewControl::SetObjectType(nType);
// apply object rotation
if(mp3DObj)
@@ -812,7 +812,7 @@ void Svx3DLightControl::GetRotation(double& rRotX, double&
rRotY, double& rRotZ)
void Svx3DLightControl::Set3DAttributes( const SfxItemSet& rAttr )
{
// call parent
- PreviewControl3D::Set3DAttributes(rAttr);
+ Svx3DPreviewControl::Set3DAttributes(rAttr);
if(maSelectedLight != NO_LIGHT_SELECTED && !GetLightOnOff(maSelectedLight))
{
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 7bdc178c9ebf..f96c5c22f19c 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -174,7 +174,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow
*pCW, vcl::Window* p
, m_xBtnSpecularColor(m_xBuilder->weld_button("colorbutton5"))
,
m_xMtrMatSpecularIntensity(m_xBuilder->weld_metric_spin_button("intensity",
FieldUnit::PERCENT))
- , m_xCtlPreview(new PreviewControl3D)
+ , m_xCtlPreview(new Svx3DPreviewControl)
, m_xCtlPreviewWin(new weld::CustomWeld(*m_xBuilder, "preview",
*m_xCtlPreview))
, m_xLightPreviewGrid(m_xBuilder->weld_container("lightpreviewgrid"))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
