From bda40b7eaaee5c8687b01f6805352630ac231de4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 23 Dec 2019 21:51:34 +0000 Subject: rename SvxDialControl back to DialControl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4dcf12b6eccf18a0659c5d5f9cd58bd104c4dc6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85770 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/dialog/dialcontrol.cxx | 54 +++++++++++----------- .../sidebar/possize/PosSizePropertyPanel.cxx | 4 +- .../sidebar/possize/PosSizePropertyPanel.hxx | 6 +-- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'svx') diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 47bef93b3992..3ca96e2926af 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -215,7 +215,7 @@ void DialControlBmp::DrawBackground() DrawEllipse( aEllipseRect ); } -SvxDialControl::DialControl_Impl::DialControl_Impl(OutputDevice& rReference) : +DialControl::DialControl_Impl::DialControl_Impl(OutputDevice& rReference) : mxBmpEnabled(VclPtr::Create(rReference)), mxBmpDisabled(VclPtr::Create(rReference)), mxBmpBuffered(VclPtr::Create(rReference)), @@ -230,7 +230,7 @@ SvxDialControl::DialControl_Impl::DialControl_Impl(OutputDevice& rReference) : { } -void SvxDialControl::DialControl_Impl::Init( const Size& rWinSize, const vcl::Font& rWinFont ) +void DialControl::DialControl_Impl::Init( const Size& rWinSize, const vcl::Font& rWinFont ) { maWinFont = rWinFont; maWinFont.SetTransparent(true); @@ -238,7 +238,7 @@ void SvxDialControl::DialControl_Impl::Init( const Size& rWinSize, const vcl::Fo SetSize(rWinSize); } -void SvxDialControl::DialControl_Impl::SetSize( const Size& rWinSize ) +void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) { // make the control squared, and adjusted so that we have a well-defined // center ["(x - 1) | 1" creates odd value <= x] @@ -254,7 +254,7 @@ void SvxDialControl::DialControl_Impl::SetSize( const Size& rWinSize ) mxBmpBuffered->SetSize( maWinSize ); } -void SvxDialControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) +void DialControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) { CustomWidgetController::SetDrawingArea(pDrawingArea); //use same logic as DialControl_Impl::SetSize @@ -267,26 +267,26 @@ void SvxDialControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) Init(aSize); } -void SvxDialControl::Resize() +void DialControl::Resize() { mpImpl->SetSize(GetOutputSizePixel()); InvalidateControl(); } -void SvxDialControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) +void DialControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { Point aPos; rRenderContext.DrawBitmapEx(aPos, mpImpl->mxBmpBuffered->GetBitmapEx(aPos, mpImpl->maWinSize)); } -void SvxDialControl::StyleUpdated() +void DialControl::StyleUpdated() { CustomWidgetController::StyleUpdated(); Init( mpImpl->maWinSize, mpImpl->maWinFont ); InvalidateControl(); } -bool SvxDialControl::MouseButtonDown(const MouseEvent& rMEvt) +bool DialControl::MouseButtonDown(const MouseEvent& rMEvt) { if( rMEvt.IsLeft() ) { @@ -298,14 +298,14 @@ bool SvxDialControl::MouseButtonDown(const MouseEvent& rMEvt) return true; } -bool SvxDialControl::MouseMove( const MouseEvent& rMEvt ) +bool DialControl::MouseMove( const MouseEvent& rMEvt ) { if( IsMouseCaptured() && rMEvt.IsLeft() ) HandleMouseEvent( rMEvt.GetPosPixel(), false ); return true; } -bool SvxDialControl::MouseButtonUp(const MouseEvent&) +bool DialControl::MouseButtonUp(const MouseEvent&) { if( IsMouseCaptured() ) { @@ -316,7 +316,7 @@ bool SvxDialControl::MouseButtonUp(const MouseEvent&) return true; } -bool SvxDialControl::KeyInput( const KeyEvent& rKEvt ) +bool DialControl::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode& rKCode = rKEvt.GetKeyCode(); if( !rKCode.GetModifier() && (rKCode.GetCode() == KEY_ESCAPE) ) @@ -327,18 +327,18 @@ bool SvxDialControl::KeyInput( const KeyEvent& rKEvt ) return CustomWidgetController::KeyInput(rKEvt); } -void SvxDialControl::LoseFocus() +void DialControl::LoseFocus() { // release captured mouse HandleEscapeEvent(); } -bool SvxDialControl::HasRotation() const +bool DialControl::HasRotation() const { return !mpImpl->mbNoRot; } -void SvxDialControl::SetNoRotation() +void DialControl::SetNoRotation() { if( !mpImpl->mbNoRot ) { @@ -349,12 +349,12 @@ void SvxDialControl::SetNoRotation() } } -sal_Int32 SvxDialControl::GetRotation() const +sal_Int32 DialControl::GetRotation() const { return mpImpl->mnAngle; } -void SvxDialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 nDecimalPlaces) +void DialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 nDecimalPlaces) { mpImpl->mnLinkedFieldValueMultiplyer = 100 / std::pow(10.0, double(nDecimalPlaces)); @@ -370,39 +370,39 @@ void SvxDialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 nDecimal if( mpImpl->mpLinkField ) { weld::SpinButton& rField = *mpImpl->mpLinkField; - rField.connect_value_changed(LINK(this, SvxDialControl, LinkedFieldModifyHdl)); + rField.connect_value_changed(LINK(this, DialControl, LinkedFieldModifyHdl)); } } -IMPL_LINK_NOARG(SvxDialControl, LinkedFieldModifyHdl, weld::SpinButton&, void) +IMPL_LINK_NOARG(DialControl, LinkedFieldModifyHdl, weld::SpinButton&, void) { LinkedFieldModifyHdl(); } -void SvxDialControl::LinkedFieldModifyHdl() +void DialControl::LinkedFieldModifyHdl() { if( mpImpl->mpLinkField ) SetRotation(mpImpl->mpLinkField->get_value() * mpImpl->mnLinkedFieldValueMultiplyer); } -void SvxDialControl::SaveValue() +void DialControl::SaveValue() { mpImpl->mnInitialAngle = mpImpl->mnAngle; } -bool SvxDialControl::IsValueModified() const +bool DialControl::IsValueModified() const { return mpImpl->mnInitialAngle != mpImpl->mnAngle; } -void SvxDialControl::Init( const Size& rWinSize, const vcl::Font& rWinFont ) +void DialControl::Init( const Size& rWinSize, const vcl::Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); EnableRTL( false ); // don't mirror mouse handling SetOutputSizePixel( mpImpl->maWinSize ); } -void SvxDialControl::Init( const Size& rWinSize ) +void DialControl::Init( const Size& rWinSize ) { //hidpi TODO: GetDefaultFont() picks a font size too small, so fix it here. vcl::Font aDefaultSize = Application::GetSettings().GetStyleSettings().GetLabelFont(); @@ -414,7 +414,7 @@ void SvxDialControl::Init( const Size& rWinSize ) Init( rWinSize, aFont ); } -void SvxDialControl::InvalidateControl() +void DialControl::InvalidateControl() { mpImpl->mxBmpBuffered->CopyBackground( IsEnabled() ? *mpImpl->mxBmpEnabled : *mpImpl->mxBmpDisabled ); if( !mpImpl->mbNoRot ) @@ -422,7 +422,7 @@ void SvxDialControl::InvalidateControl() Invalidate(); } -void SvxDialControl::SetRotation(sal_Int32 nAngle) +void DialControl::SetRotation(sal_Int32 nAngle) { bool bOldSel = mpImpl->mbNoRot; mpImpl->mbNoRot = false; @@ -439,7 +439,7 @@ void SvxDialControl::SetRotation(sal_Int32 nAngle) } } -void SvxDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) +void DialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) { long nX = rPos.X() - mpImpl->mnCenterX; long nY = mpImpl->mnCenterY - rPos.Y(); @@ -458,7 +458,7 @@ void SvxDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) } } -void SvxDialControl::HandleEscapeEvent() +void DialControl::HandleEscapeEvent() { if( IsMouseCaptured() ) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d6c300be6a8d..625769a28f84 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -75,7 +75,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( mxCbxScale(m_xBuilder->weld_check_button("ratio")), mxFtAngle(m_xBuilder->weld_label("rotationlabel")), mxMtrAngle(m_xBuilder->weld_spin_button("rotation")), - mxCtrlDial(new SvxDialControl), + mxCtrlDial(new DialControl), mxDial(new weld::CustomWeld(*m_xBuilder, "orientationcontrol", *mxCtrlDial)), mxFtFlip(m_xBuilder->weld_label("fliplabel")), mxFlipTbx(m_xBuilder->weld_toolbar("selectrotationtype")), @@ -452,7 +452,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl, weld::SpinButton&, void } -IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, SvxDialControl*, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mxCtrlDial->GetRotation(); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index c5a0f3c92479..92a54357f354 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -36,7 +36,7 @@ class SdrView; namespace svx { -class SvxDialControl; +class DialControl; }; namespace svx { namespace sidebar { @@ -95,7 +95,7 @@ private: std::unique_ptr mxMtrAngle; //rotation control - std::unique_ptr mxCtrlDial; + std::unique_ptr mxCtrlDial; std::unique_ptr mxDial; //flip @@ -153,7 +153,7 @@ private: DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void ); DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void ); DECL_LINK( AngleModifiedHdl, weld::SpinButton&, void ); - DECL_LINK( RotationHdl, svx::SvxDialControl*, void ); + DECL_LINK( RotationHdl, svx::DialControl*, void ); DECL_STATIC_LINK( PosSizePropertyPanel, ClickChartEditHdl, weld::Button&, void ); void Initialize(); -- cgit