[Libreoffice-commits] core.git: bin/find-can-be-private-symbols.classes.results chart2/source cui/source include/svx svx/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 30 12:17:11 UTC 2019
bin/find-can-be-private-symbols.classes.results | 2
chart2/source/controller/dialogs/res_DataLabel.hxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 2
cui/source/inc/align.hxx | 2
cui/source/inc/transfrm.hxx | 2
include/svx/dialcontrol.hxx | 4 -
svx/source/dialog/dialcontrol.cxx | 54 +++++++++---------
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4 -
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 6 +-
sw/source/uibase/inc/frmpage.hxx | 2
12 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit bda40b7eaaee5c8687b01f6805352630ac231de4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 23 21:51:34 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 30 13:16:35 2019 +0100
rename SvxDialControl back to DialControl
Change-Id: I4dcf12b6eccf18a0659c5d5f9cd58bd104c4dc6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85770
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results
index e5a90bdc9f85..03db801f7d93 100644
--- a/bin/find-can-be-private-symbols.classes.results
+++ b/bin/find-can-be-private-symbols.classes.results
@@ -344,7 +344,7 @@ svt::MultiLineEditImplementation
svt::MultiLineTextCell
svx::CommonStyleManager
svx::PropertyValueProvider
-svx::SvxDialControl::DialControl_Impl
+svx::DialControl::DialControl_Impl
svxform::FormToolboxes
sw::BroadcastingModify
sw::UnoCursorHint
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index b8f2667b7418..617056298b42 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -59,7 +59,7 @@ private:
weld::Window* m_pWindow;
SfxItemPool* m_pPool;
- svx::SvxDialControl m_aDC_Dial;
+ svx::DialControl m_aDC_Dial;
std::unique_ptr<weld::CheckButton> m_xCBNumber;
std::unique_ptr<weld::Button> m_xPB_NumberFormatForValue;
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 3816d1ba81f7..ae048cf53079 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -46,7 +46,7 @@ private:
bool m_bHasInitialStacking; /// false = checkbox in tristate
bool m_bComplexCategories;
- svx::SvxDialControl m_aCtrlDial;
+ svx::DialControl m_aCtrlDial;
std::unique_ptr<weld::CheckButton> m_xCbShowDescription;
std::unique_ptr<weld::Label> m_xFlOrder;
std::unique_ptr<weld::RadioButton> m_xRbSideBySide;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index c1a5add984fe..55b26d3e56d1 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -44,7 +44,7 @@ public:
virtual void Reset(const SfxItemSet* rInAttrs) override;
private:
- svx::SvxDialControl m_aAngleDial;
+ svx::DialControl m_aAngleDial;
std::unique_ptr<weld::CheckButton> m_xCB_Clockwise;
std::unique_ptr<weld::Frame> m_xFL_StartingAngle;
std::unique_ptr<weld::SpinButton> m_xNF_StartingAngle;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 616006fa27c2..b84c4720f173 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -37,7 +37,7 @@ namespace chart
class SchAlignmentTabPage : public SfxTabPage
{
private:
- svx::SvxDialControl m_aCtrlDial;
+ svx::DialControl m_aCtrlDial;
std::unique_ptr<weld::Label> m_xFtRotate;
std::unique_ptr<weld::SpinButton> m_xNfRotate;
std::unique_ptr<weld::CheckButton> m_xCbStacked;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index b571601c61bd..03af4f943db9 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -79,7 +79,7 @@ private:
weld::TriStateEnabled m_aHyphenState;
weld::TriStateEnabled m_aShrinkState;
- SvxDialControl m_aCtrlDial;
+ DialControl m_aCtrlDial;
SvtValueSet m_aVsRefEdge;
std::unique_ptr<weld::ComboBox> m_xLbHorAlign;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 973ff69dbddb..c83f0bf60030 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -174,7 +174,7 @@ private:
MapUnit ePoolUnit;
FieldUnit eDlgUnit;
- svx::SvxDialControl m_aCtlAngle;
+ svx::DialControl m_aCtlAngle;
SvxRectCtl m_aCtlRect;
std::unique_ptr<weld::Widget> m_xFlPosition;
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index b17b39cf5615..a67d522dff61 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -66,13 +66,13 @@ private:
state of the control.
It is possible to link a numeric field to this control using the function
- SetLinkedField(). The SvxDialControl will take full control of this numeric
+ SetLinkedField(). The DialControl will take full control of this numeric
field:
- Sets the rotation angle to the numeric field in mouse operations.
- Shows the value entered/modified in the numeric field.
- Enables/disables/shows/hides the field according to own state changes.
*/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDialControl final : public weld::CustomWidgetController
+class SAL_WARN_UNUSED SVX_DLLPUBLIC DialControl final : public weld::CustomWidgetController
{
public:
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
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<DialControlBmp>::Create(rReference)),
mxBmpDisabled(VclPtr<DialControlBmp>::Create(rReference)),
mxBmpBuffered(VclPtr<DialControlBmp>::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<weld::SpinButton> mxMtrAngle;
//rotation control
- std::unique_ptr<svx::SvxDialControl> mxCtrlDial;
+ std::unique_ptr<svx::DialControl> mxCtrlDial;
std::unique_ptr<weld::CustomWeld> 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();
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index a26a21e40a9b..1906a01d90a9 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -203,7 +203,7 @@ class SwGrfExtPage : public SfxTabPage
// mirror
BmpWindow m_aBmpWin;
- svx::SvxDialControl m_aCtlAngle;
+ svx::DialControl m_aCtlAngle;
std::unique_ptr<weld::Widget> m_xMirror;
std::unique_ptr<weld::CheckButton> m_xMirrorVertBox;
std::unique_ptr<weld::CheckButton> m_xMirrorHorzBox;
More information about the Libreoffice-commits
mailing list