diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-01 13:59:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-01 20:37:04 +0200 |
commit | 5c64c0e5f264818a648fbe8b49ed784f14cd8e6a (patch) | |
tree | 86fcd1c8bdf23c7bd98a389f0f2821ceaac5d181 | |
parent | a734dcdd10c7912ae2fbaef4062756f80a00814d (diff) |
rename PreviewBase back to SvxPreviewBase
Change-Id: I121b169ab1eff090457cfc3a1307e32a4bd3f40a
Reviewed-on: https://gerrit.libreoffice.org/61192
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | include/svx/dlgctrl.hxx | 12 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 8193163b5905..ab2bc673292a 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -335,7 +335,7 @@ class SdrObject; class SdrPathObj; class SdrModel; -class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI PreviewBase : public weld::CustomWidgetController +class SAL_WARN_UNUSED SAL_DLLPUBLIC_RTTI SvxPreviewBase : public weld::CustomWidgetController { private: std::unique_ptr<SdrModel> mpModel; @@ -353,9 +353,9 @@ protected: void LocalPostPaint(vcl::RenderContext& rRenderContext); public: - PreviewBase(); + SvxPreviewBase(); virtual void SetDrawingArea(weld::DrawingArea*) override; - virtual ~PreviewBase() override; + virtual ~SvxPreviewBase() override; // change support virtual void StyleUpdated() override; @@ -388,7 +388,7 @@ public: |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXLinePreview : public PreviewBase +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXLinePreview : public SvxPreviewBase { private: SdrPathObj* mpLineObjA; @@ -414,7 +414,7 @@ public: virtual void Resize() override; }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXRectPreview : public PreviewBase +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXRectPreview : public SvxPreviewBase { private: SdrObject* mpRectangleObject; @@ -436,7 +436,7 @@ public: |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXShadowPreview : public PreviewBase +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXShadowPreview : public SvxPreviewBase { private: Point maShadowOffset; diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 4830da68e9c7..7d3014462fa1 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1198,7 +1198,7 @@ void SvxLineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bi void SvxXLinePreview::Resize() { - PreviewBase::Resize(); + SvxPreviewBase::Resize(); const Size aOutputSize(GetOutputSize()); const sal_Int32 nDistance(500); @@ -1247,7 +1247,7 @@ SvxXLinePreview::SvxXLinePreview() void SvxXLinePreview::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - PreviewBase::SetDrawingArea(pDrawingArea); + SvxPreviewBase::SetDrawingArea(pDrawingArea); mpLineObjA = new SdrPathObj(getModel(), OBJ_LINE); mpLineObjB = new SdrPathObj(getModel(), OBJ_PLIN); @@ -1332,7 +1332,7 @@ SvxXShadowPreview::SvxXShadowPreview() void SvxXShadowPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - PreviewBase::SetDrawingArea(pDrawingArea); + SvxPreviewBase::SetDrawingArea(pDrawingArea); InitSettings(); // prepare size @@ -1408,7 +1408,7 @@ void SvxXShadowPreview::Paint(vcl::RenderContext& rRenderContext, const tools::R rRenderContext.Pop(); } -void PreviewBase::InitSettings() +void SvxPreviewBase::InitSettings() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -1423,14 +1423,14 @@ void PreviewBase::InitSettings() Invalidate(); } -PreviewBase::PreviewBase() +SvxPreviewBase::SvxPreviewBase() : mpModel(new SdrModel(nullptr, nullptr, true)) { // init model mpModel->GetItemPool().FreezeIdRanges(); } -void PreviewBase::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void SvxPreviewBase::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); Size aSize(getPreviewStripSize(pDrawingArea->get_ref_device())); @@ -1441,13 +1441,13 @@ void PreviewBase::SetDrawingArea(weld::DrawingArea* pDrawingArea) mpBufferDevice->SetMapMode(MapMode(MapUnit::Map100thMM)); } -PreviewBase::~PreviewBase() +SvxPreviewBase::~SvxPreviewBase() { mpModel.reset(); mpBufferDevice.disposeAndClear(); } -void PreviewBase::LocalPrePaint(vcl::RenderContext const & rRenderContext) +void SvxPreviewBase::LocalPrePaint(vcl::RenderContext const & rRenderContext) { // init BufferDevice if (mpBufferDevice->GetOutputSizePixel() != GetOutputSizePixel()) @@ -1474,7 +1474,7 @@ void PreviewBase::LocalPrePaint(vcl::RenderContext const & rRenderContext) } } -void PreviewBase::LocalPostPaint(vcl::RenderContext& rRenderContext) +void SvxPreviewBase::LocalPostPaint(vcl::RenderContext& rRenderContext) { // copy to front (in pixel mode) const bool bWasEnabledSrc(mpBufferDevice->IsMapModeEnabled()); @@ -1492,7 +1492,7 @@ void PreviewBase::LocalPostPaint(vcl::RenderContext& rRenderContext) rRenderContext.EnableMapMode(bWasEnabledDst); } -void PreviewBase::StyleUpdated() +void SvxPreviewBase::StyleUpdated() { InitSettings(); CustomWidgetController::StyleUpdated(); @@ -1503,7 +1503,7 @@ SvxXRectPreview::SvxXRectPreview() { } -tools::Rectangle PreviewBase::GetPreviewSize() const +tools::Rectangle SvxPreviewBase::GetPreviewSize() const { tools::Rectangle aObjectSize(Point(), getBufferDevice().PixelToLogic(GetOutputSizePixel())); return aObjectSize; @@ -1511,7 +1511,7 @@ tools::Rectangle PreviewBase::GetPreviewSize() const void SvxXRectPreview::SetDrawingArea(weld::DrawingArea* pDrawingArea) { - PreviewBase::SetDrawingArea(pDrawingArea); + SvxPreviewBase::SetDrawingArea(pDrawingArea); InitSettings(); // create RectangleObject @@ -1527,7 +1527,7 @@ void SvxXRectPreview::Resize() SetAttributes(pOrigObject->GetMergedItemSet()); SdrObject::Free(pOrigObject); } - PreviewBase::Resize(); + SvxPreviewBase::Resize(); } SvxXRectPreview::~SvxXRectPreview() |