mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: prefix members of InsCaptionOpt

Browse Source 
Change-Id: I639381781745493a9320cdf4a7a0be61f09446c7
Reviewed-on: https://gerrit.libreoffice.org/54469
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2018-05-17 08:46:37 +02:00
parent 8385e511aa
commit 8fde560d58
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sw/source/uibase/config/caption.cxx
View File

@@ -22,18 +22,18 @@
#include <caption.hxx> #include <caption.hxx>
InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) : InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
bUseCaption(false), m_bUseCaption(false),
eObjType(eType), m_eObjType(eType),
nNumType(SVX_NUM_ARABIC), m_nNumType(SVX_NUM_ARABIC),
sNumberSeparator(". "), m_sNumberSeparator(". "),
nPos(1), m_nPos(1),
nLevel(0), m_nLevel(0),
sSeparator( OUString(": ") ), m_sSeparator( OUString(": ") ),
bIgnoreSeqOpts(false), m_bIgnoreSeqOpts(false),
bCopyAttributes(false) m_bCopyAttributes(false)
{ {
if (pOleId) if (pOleId)
aOleId = *pOleId; m_aOleId = *pOleId;
} }
InsCaptionOpt::~InsCaptionOpt() = default; InsCaptionOpt::~InsCaptionOpt() = default;

74
sw/source/uibase/inc/caption.hxx
View File

@@ -27,62 +27,62 @@
class SW_DLLPUBLIC InsCaptionOpt class SW_DLLPUBLIC InsCaptionOpt
{ {
private: private:
bool bUseCaption; bool m_bUseCaption;
SwCapObjType eObjType; SwCapObjType m_eObjType;
SvGlobalName aOleId; SvGlobalName m_aOleId;
OUString sCategory; OUString m_sCategory;
sal_uInt16 nNumType; sal_uInt16 m_nNumType;
OUString sNumberSeparator; OUString m_sNumberSeparator;
OUString sCaption; OUString m_sCaption;
sal_uInt16 nPos; sal_uInt16 m_nPos;
sal_uInt16 nLevel; sal_uInt16 m_nLevel;
OUString sSeparator; OUString m_sSeparator;
OUString sCharacterStyle; OUString m_sCharacterStyle;
bool bIgnoreSeqOpts; // is not being saved bool m_bIgnoreSeqOpts; // is not being saved
bool bCopyAttributes; // -""- bool m_bCopyAttributes; // -""-
public: public:
InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = nullptr); InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = nullptr);
~InsCaptionOpt(); ~InsCaptionOpt();
bool& UseCaption() { return bUseCaption; } bool& UseCaption() { return m_bUseCaption; }
bool UseCaption() const { return bUseCaption; } bool UseCaption() const { return m_bUseCaption; }
SwCapObjType GetObjType() const { return eObjType; } SwCapObjType GetObjType() const { return m_eObjType; }
const SvGlobalName& GetOleId() const { return aOleId; } const SvGlobalName& GetOleId() const { return m_aOleId; }
const OUString& GetCategory() const { return sCategory; } const OUString& GetCategory() const { return m_sCategory; }
void SetCategory(const OUString& rCat) { sCategory = rCat; } void SetCategory(const OUString& rCat) { m_sCategory = rCat; }
sal_uInt16 GetNumType() const { return nNumType; } sal_uInt16 GetNumType() const { return m_nNumType; }
void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } void SetNumType(const sal_uInt16 nNT) { m_nNumType = nNT; }
const OUString& GetNumSeparator() const { return sNumberSeparator; } const OUString& GetNumSeparator() const { return m_sNumberSeparator; }
void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;} void SetNumSeparator(const OUString& rSet) {m_sNumberSeparator = rSet;}
const OUString& GetCaption() const { return sCaption; } const OUString& GetCaption() const { return m_sCaption; }
void SetCaption(const OUString& rCap) { sCaption = rCap; } void SetCaption(const OUString& rCap) { m_sCaption = rCap; }
sal_uInt16 GetPos() const { return nPos; } sal_uInt16 GetPos() const { return m_nPos; }
void SetPos(const sal_uInt16 nP) { nPos = nP; } void SetPos(const sal_uInt16 nP) { m_nPos = nP; }
sal_uInt16 GetLevel() const { return nLevel; } sal_uInt16 GetLevel() const { return m_nLevel; }
void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } void SetLevel(const sal_uInt16 nLvl) { m_nLevel = nLvl; }
const OUString& GetSeparator() const { return sSeparator; } const OUString& GetSeparator() const { return m_sSeparator; }
void SetSeparator(const OUString& rSep) { sSeparator = rSep; } void SetSeparator(const OUString& rSep) { m_sSeparator = rSep; }
const OUString& GetCharacterStyle() const { return sCharacterStyle; } const OUString& GetCharacterStyle() const { return m_sCharacterStyle; }
void SetCharacterStyle(const OUString& rStyle) void SetCharacterStyle(const OUString& rStyle)
{ sCharacterStyle = rStyle; } { m_sCharacterStyle = rStyle; }
bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } bool& IgnoreSeqOpts() { return m_bIgnoreSeqOpts; }
bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } bool IgnoreSeqOpts() const { return m_bIgnoreSeqOpts; }
bool& CopyAttributes() { return bCopyAttributes; } bool& CopyAttributes() { return m_bCopyAttributes; }
bool CopyAttributes() const { return bCopyAttributes; } bool CopyAttributes() const { return m_bCopyAttributes; }
}; };
#endif #endif