include/svx/xdash.hxx | 36 ++++++++++++++++++------------------
svx/source/xoutdev/xattr.cxx | 24 ++++++++++++------------
2 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 1a4e52c0d985138d483af288c547f8cea6c96667
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 22 08:09:36 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 22 09:13:38 2024 +0100
svx: prefix members of XDash
See tdf#94879 for motivation.
Change-Id: I78a3b52001cc61728fe568623acf13b86f43c449
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162361
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index eef7d2f7fb2d..6b6771a9fa35 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -30,12 +30,12 @@
class SVXCORE_DLLPUBLIC XDash final
{
- css::drawing::DashStyle eDash;
- sal_uInt16 nDots;
- sal_uInt16 nDashes;
- double nDotLen;
- double nDashLen;
- double nDistance;
+ css::drawing::DashStyle m_eDash;
+ sal_uInt16 m_nDots;
+ sal_uInt16 m_nDashes;
+ double m_nDotLen;
+ double m_nDashLen;
+ double m_nDistance;
public:
XDash(css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT,
@@ -44,19 +44,19 @@ public:
bool operator==(const XDash& rDash) const;
- void SetDashStyle(css::drawing::DashStyle eNewStyle) { eDash = eNewStyle; }
- void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; }
- void SetDotLen(double nNewDotLen) { nDotLen =
nNewDotLen; }
- void SetDashes(sal_uInt16 nNewDashes) { nDashes =
nNewDashes; }
- void SetDashLen(double nNewDashLen) { nDashLen =
nNewDashLen; }
- void SetDistance(double nNewDistance) { nDistance =
nNewDistance; }
+ void SetDashStyle(css::drawing::DashStyle eNewStyle) { m_eDash =
eNewStyle; }
+ void SetDots(sal_uInt16 nNewDots) { m_nDots = nNewDots;
}
+ void SetDotLen(double nNewDotLen) { m_nDotLen =
nNewDotLen; }
+ void SetDashes(sal_uInt16 nNewDashes) { m_nDashes =
nNewDashes; }
+ void SetDashLen(double nNewDashLen) { m_nDashLen =
nNewDashLen; }
+ void SetDistance(double nNewDistance) { m_nDistance =
nNewDistance; }
- css::drawing::DashStyle GetDashStyle() const { return eDash; }
- sal_uInt16 GetDots() const { return nDots; }
- double GetDotLen() const { return nDotLen; }
- sal_uInt16 GetDashes() const { return nDashes; }
- double GetDashLen() const { return nDashLen; }
- double GetDistance() const { return nDistance; }
+ css::drawing::DashStyle GetDashStyle() const { return m_eDash; }
+ sal_uInt16 GetDots() const { return m_nDots; }
+ double GetDotLen() const { return m_nDotLen; }
+ sal_uInt16 GetDashes() const { return m_nDashes; }
+ double GetDashLen() const { return m_nDashLen; }
+ double GetDistance() const { return m_nDistance;
}
// XDash is translated into an array of doubles which describe the lengths
of the
// dashes, dots and empty passages. It returns the complete length of the
full DashDot
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index e712be7632f2..68b40d539cd0 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -487,23 +487,23 @@ sal_uInt16 XLineStyleItem::GetValueCount() const
XDash::XDash(css::drawing::DashStyle eTheDash, sal_uInt16 nTheDots, double
nTheDotLen,
sal_uInt16 nTheDashes, double nTheDashLen, double nTheDistance) :
- eDash(eTheDash),
- nDots(nTheDots),
- nDashes(nTheDashes),
- nDotLen(nTheDotLen),
- nDashLen(nTheDashLen),
- nDistance(nTheDistance)
+ m_eDash(eTheDash),
+ m_nDots(nTheDots),
+ m_nDashes(nTheDashes),
+ m_nDotLen(nTheDotLen),
+ m_nDashLen(nTheDashLen),
+ m_nDistance(nTheDistance)
{
}
bool XDash::operator==(const XDash& rDash) const
{
- return ( eDash == rDash.eDash &&
- nDots == rDash.nDots &&
- nDotLen == rDash.nDotLen &&
- nDashes == rDash.nDashes &&
- nDashLen == rDash.nDashLen &&
- nDistance == rDash.nDistance );
+ return ( m_eDash == rDash.m_eDash &&
+ m_nDots == rDash.m_nDots &&
+ m_nDotLen == rDash.m_nDotLen &&
+ m_nDashes == rDash.m_nDashes &&
+ m_nDashLen == rDash.m_nDashLen &&
+ m_nDistance == rDash.m_nDistance );
}
// XDash is translated into an array of doubles which describe the lengths of
the
