sw/source/filter/inc/rtf.hxx | 10 +++++-----
sw/source/filter/ww8/WW8Sttbf.hxx | 8 ++++----
sw/source/filter/ww8/rtfexport.cxx | 2 +-
sw/source/filter/ww8/wrtw8esh.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 2 +-
sw/source/filter/ww8/wrtww8.hxx | 4 ++--
sw/source/filter/ww8/ww8par.hxx | 2 +-
sw/source/filter/ww8/ww8par3.cxx | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit c06b2ac50ec198a4c75345c15103541ab45462a4
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon May 9 08:11:56 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon May 9 10:13:13 2022 +0200
sw: prefix members of RTFSurround, SwMSConvertControls, ww8::WW8Sttb and ...
... wwFontHelper
See tdf#94879 for motivation.
Change-Id: Ib5ee24b6ed599041b0c2724931742d86ee9b360c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134033
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index f0bff55c5923..ed64c08b76eb 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -31,17 +31,17 @@ class RTFSurround
sal_uInt8 nJunk : 3;
} Flags;
sal_uInt8 nVal;
- } Value;
+ } m_Value;
public:
RTFSurround(bool bGoldCut, sal_uInt8 nOrder)
{
- Value.Flags.nGoldCut = sal_uInt8(bGoldCut);
- Value.Flags.nOrder = nOrder;
- Value.Flags.nJunk = 0;
+ m_Value.Flags.nGoldCut = sal_uInt8(bGoldCut);
+ m_Value.Flags.nOrder = nOrder;
+ m_Value.Flags.nJunk = 0;
}
- sal_uInt16 GetValue() const { return Value.nVal; }
+ sal_uInt16 GetValue() const { return m_Value.nVal; }
};
#endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx
b/sw/source/filter/ww8/WW8Sttbf.hxx
index 3bc04e3d870b..c061362bf829 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -54,7 +54,7 @@ namespace ww8
class WW8Sttb : public WW8Struct
{
typedef std::shared_ptr< void > ExtraPointer_t;
- bool bDoubleByteCharacters;
+ bool m_bDoubleByteCharacters;
std::vector<OUString> m_Strings;
std::vector< ExtraPointer_t > m_Extras;
@@ -70,13 +70,13 @@ namespace ww8
template <class T>
WW8Sttb<T>::WW8Sttb(SvStream& rSt, sal_Int32 nPos, sal_uInt32 nSize)
- : WW8Struct(rSt, nPos, nSize), bDoubleByteCharacters(false)
+ : WW8Struct(rSt, nPos, nSize), m_bDoubleByteCharacters(false)
{
sal_uInt32 nOffset = 0;
if (getU16(nOffset) == 0xffff)
{
- bDoubleByteCharacters = true;
+ m_bDoubleByteCharacters = true;
nOffset += 2;
}
@@ -86,7 +86,7 @@ namespace ww8
nOffset += 4;
for (sal_uInt16 i = 0; i < nCount; i++)
{
- if (bDoubleByteCharacters)
+ if (m_bDoubleByteCharacters)
{
sal_uInt16 nStrLen = getU16(nOffset);
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 6c8880aca65d..e3a05b346bda 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1044,7 +1044,7 @@ RtfExport::RtfExport(RtfExportFilter* pFilter, SwDoc&
rDocument,
// that just causes problems for RTF
m_bSubstituteBullets = false;
// needed to have a complete font table
- m_aFontHelper.bLoadAllFonts = true;
+ m_aFontHelper.m_bLoadAllFonts = true;
// the related SdrExport
m_pSdrExport = std::make_unique<RtfSdrExport>(*this);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index e9a00f95ec89..f776fdc10d2f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2988,7 +2988,7 @@ sal_uInt32 SwEscherEx::QueryTextID(
}
SwMSConvertControls::SwMSConvertControls( SfxObjectShell const *pDSh, SwPaM
*pP ) : oox
-::ole::MSConvertOCXControls( pDSh ? pDSh->GetModel() : nullptr ), pPaM( pP ),
mnObjectId(0)
+::ole::MSConvertOCXControls( pDSh ? pDSh->GetModel() : nullptr ), m_pPaM( pP
), mnObjectId(0)
{
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 7dc45d1c7114..44d437dbf772 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -896,7 +896,7 @@ void wwFontHelper::InitFontTable(const SwDoc& rDoc)
pFont->GetFamily(), pFont->GetCharSet()));
}
- if (!bLoadAllFonts)
+ if (!m_bLoadAllFonts)
return;
const sal_uInt16 aTypes[] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT,
RES_CHRATR_CTL_FONT, 0 };
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 28428a199eb6..f168ad7e2571 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -325,7 +325,7 @@ private:
std::vector< const wwFont* > AsVector() const;
public:
- wwFontHelper() : bLoadAllFonts(false) {}
+ wwFontHelper() : m_bLoadAllFonts(false) {}
/// rDoc used only to get the initial standard font(s) in use.
void InitFontTable(const SwDoc& rDoc);
sal_uInt16 GetId(const SvxFontItem& rFont);
@@ -335,7 +335,7 @@ public:
void WriteFontTable( const RtfAttributeOutput& rAttrOutput );
/// If true, all fonts are loaded before processing the document.
- bool bLoadAllFonts: 1;
+ bool m_bLoadAllFonts: 1;
};
class DrawObj
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 4e448abb440e..e0f68dbb7f8c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -738,7 +738,7 @@ public:
css::uno::Reference< css::drawing::XShape > *pShapeRef,
bool bFloatingCtrl=false );
private:
- SwPaM *pPaM;
+ SwPaM *m_pPaM;
sal_uInt32 mnObjectId;
};
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index db67528cdf5a..f512d99fecd3 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2578,7 +2578,7 @@ bool SwMSConvertControls::InsertControl(
uno::Reference< text::XText > xDummyTextRef;
uno::Reference< text::XTextRange > xTextRg =
- new SwXTextRange( *pPaM, xDummyTextRef );
+ new SwXTextRange( *m_pPaM, xDummyTextRef );
aTmp <<= xTextRg;
xShapePropSet->setPropertyValue("TextRange", aTmp );
