sw/inc/grfatr.hxx | 20 ++++++++++----------
sw/source/core/graphic/grfatr.cxx | 8 ++++----
sw/source/uibase/utlui/attrdesc.cxx | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 8aa8893be8f3c7e4acfdacb401f8fe3d297647b5
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 30 09:07:22 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 30 09:58:32 2019 +0200
sw: prefix members of SwGammaGrf
See tdf#94879 for motivation.
Change-Id: I53e8dd6a24da0a35d36f415237525b8cb87854c4
Reviewed-on: https://gerrit.libreoffice.org/79824
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 87db52a36ab9..bb8f41311fb7 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -38,11 +38,11 @@ enum class MirrorGraph
class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem<MirrorGraph>
{
- bool bGrfToggle; // Flip graphics on even pages.
+ bool m_bGrfToggle; // Flip graphics on even pages.
public:
SwMirrorGrf( MirrorGraph eMiro = MirrorGraph::Dont )
- : SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), bGrfToggle( false )
+ : SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), m_bGrfToggle( false )
{}
// pure virtual methods of SfxPoolItem
@@ -62,8 +62,8 @@ public:
virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- bool IsGrfToggle() const { return bGrfToggle; }
- void SetGrfToggle( bool bNew ) { bGrfToggle = bNew; }
+ bool IsGrfToggle() const { return m_bGrfToggle; }
+ void SetGrfToggle( bool bNew ) { m_bGrfToggle = bNew; }
};
class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
@@ -80,7 +80,7 @@ public:
class SAL_DLLPUBLIC_RTTI SwRotationGrf : public SfxUInt16Item
{
private:
- Size const aUnrotatedSize;
+ Size const m_aUnrotatedSize;
// tdf#115529 check and evtl. correct value, it is in 10th
// degrees and *has* to be in the range [0 .. 3600[
@@ -105,7 +105,7 @@ public:
virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
+ const Size& GetUnrotatedSize() const { return m_aUnrotatedSize;
}
};
class SW_DLLPUBLIC SwLuminanceGrf : public SfxInt16Item
@@ -183,13 +183,13 @@ public:
class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem
{
- double nValue;
+ double m_nValue;
public:
- SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( 1.0 )
+ SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), m_nValue( 1.0 )
{}
SwGammaGrf( const double& rVal )
- : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( rVal )
+ : SfxPoolItem( RES_GRFATR_GAMMA ), m_nValue( rVal )
{}
// pure virtual methods from SfxEnumItem
@@ -206,7 +206,7 @@ public:
virtual bool PutValue( const css::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
- const double& GetValue() const { return nValue; }
+ const double& GetValue() const { return m_nValue; }
};
class SwInvertGrf: public SfxBoolItem
diff --git a/sw/source/core/graphic/grfatr.cxx
b/sw/source/core/graphic/grfatr.cxx
index 2368fdbbea51..680dfc0c30ea 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -169,7 +169,7 @@ sal_Int16 SwRotationGrf::checkAndCorrectValue(sal_Int16
nValue)
SwRotationGrf::SwRotationGrf( sal_Int16 nVal, const Size& rSz )
// tdf#115529 check and evtl. correct value
: SfxUInt16Item( RES_GRFATR_ROTATION, checkAndCorrectValue(nVal) ),
- aUnrotatedSize( rSz )
+ m_aUnrotatedSize( rSz )
{
}
@@ -246,18 +246,18 @@ SfxPoolItem* SwGammaGrf::Clone( SfxItemPool * ) const
bool SwGammaGrf::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==( rCmp ) &&
- nValue == static_cast<const SwGammaGrf&>(rCmp).GetValue();
+ m_nValue == static_cast<const SwGammaGrf&>(rCmp).GetValue();
}
bool SwGammaGrf::QueryValue( uno::Any& rVal, sal_uInt8 ) const
{
- rVal <<= nValue;
+ rVal <<= m_nValue;
return true;
}
bool SwGammaGrf::PutValue( const uno::Any& rVal, sal_uInt8 )
{
- return rVal >>= nValue;
+ return rVal >>= m_nValue;
}
// Sw___Grf::Clone(..) cont'd
diff --git a/sw/source/uibase/utlui/attrdesc.cxx
b/sw/source/uibase/utlui/attrdesc.cxx
index e69c13419bf0..421d1d749da0 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -695,7 +695,7 @@ bool SwMirrorGrf::GetPresentation(
if (pId)
{
rText = SwResId(pId);
- if (bGrfToggle)
+ if (m_bGrfToggle)
rText += SwResId( STR_MIRROR_TOGGLE );
}
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
