Skip to content

C
core
Kaydet (Commit) f7d65772 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwFormatChain, SwFormatHeader, SwFormatFooter and ... 

... SwFormatFootnoteEndAtTextEnd

Change-Id: I2b092c8a6d713e2741e99f334b2e9d2247cde6c2
Reviewed-on: https://gerrit.libreoffice.org/69380Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
üst f4a1dfe2
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
sw/inc/fmtcnct.hxx
Dosyayı görüntüle @ f7d65772
...@@ -30,8 +30,8 @@ class IntlWrapper; ...@@ -30,8 +30,8 @@ class IntlWrapper;
/// Connection (text flow) between two FlyFrames. /// Connection (text flow) between two FlyFrames.
class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
{ {
SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent). SwClient m_aPrev, ///< Previous SwFlyFrameFormat (if existent).
aNext; ///< Next SwFlyFrameFormat (if existent). m_aNext; ///< Next SwFlyFrameFormat (if existent).
public: public:
SwFormatChain() : SfxPoolItem( RES_CHAIN ) {} SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
...@@ -50,8 +50,8 @@ public: ...@@ -50,8 +50,8 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); } SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aPrev.GetRegisteredIn())); }
SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); } SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aNext.GetRegisteredIn())); }
void SetPrev( SwFlyFrameFormat *pFormat ); void SetPrev( SwFlyFrameFormat *pFormat );
void SetNext( SwFlyFrameFormat *pFormat ); void SetNext( SwFlyFrameFormat *pFormat );
......
sw/inc/fmtftntx.hxx
Dosyayı görüntüle @ f7d65772
...@@ -36,14 +36,14 @@ enum SwFootnoteEndPosEnum ...@@ -36,14 +36,14 @@ enum SwFootnoteEndPosEnum
class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem<SwFootnoteEndPosEnum> class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem<SwFootnoteEndPosEnum>
{ {
OUString sPrefix; OUString m_sPrefix;
OUString sSuffix; OUString m_sSuffix;
SvxNumberType aFormat; SvxNumberType m_aFormat;
sal_uInt16 nOffset; sal_uInt16 m_nOffset;
protected: protected:
SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos ) SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
: SfxEnumItem( nWhichL, ePos ), nOffset( 0 ) : SfxEnumItem( nWhichL, ePos ), m_nOffset( 0 )
{} {}
public: public:
...@@ -66,19 +66,19 @@ public: ...@@ -66,19 +66,19 @@ public:
SwFormatFootnoteEndAtTextEnd(SwFormatFootnoteEndAtTextEnd const &) = default; SwFormatFootnoteEndAtTextEnd(SwFormatFootnoteEndAtTextEnd const &) = default;
// SfxPoolItem copy function dichotomy // SfxPoolItem copy function dichotomy
SvxNumType GetNumType() const { return aFormat.GetNumberingType(); } SvxNumType GetNumType() const { return m_aFormat.GetNumberingType(); }
void SetNumType( SvxNumType eType ) { aFormat.SetNumberingType(eType); } void SetNumType( SvxNumType eType ) { m_aFormat.SetNumberingType(eType); }
const SvxNumberType& GetSwNumType() const { return aFormat; } const SvxNumberType& GetSwNumType() const { return m_aFormat; }
sal_uInt16 GetOffset() const { return nOffset; } sal_uInt16 GetOffset() const { return m_nOffset; }
void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; } void SetOffset( sal_uInt16 nOff ) { m_nOffset = nOff; }
const OUString& GetPrefix() const { return sPrefix; } const OUString& GetPrefix() const { return m_sPrefix; }
void SetPrefix(const OUString& rSet) { sPrefix = rSet; } void SetPrefix(const OUString& rSet) { m_sPrefix = rSet; }
const OUString& GetSuffix() const { return sSuffix; } const OUString& GetSuffix() const { return m_sSuffix; }
void SetSuffix(const OUString& rSet) { sSuffix = rSet; } void SetSuffix(const OUString& rSet) { m_sSuffix = rSet; }
}; };
class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
......
sw/inc/fmthdft.hxx
Dosyayı görüntüle @ f7d65772
...@@ -32,7 +32,7 @@ class IntlWrapper; ...@@ -32,7 +32,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
{ {
bool const bActive; ///< Only for controlling (creation of content). bool const m_bActive; ///< Only for controlling (creation of content).
public: public:
SwFormatHeader( bool bOn = false ); SwFormatHeader( bool bOn = false );
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
void RegisterToFormat( SwFormat& rFormat ); void RegisterToFormat( SwFormat& rFormat );
bool IsActive() const { return bActive; } bool IsActive() const { return m_bActive; }
}; };
/**Footer, for pageformats /**Footer, for pageformats
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
{ {
bool const bActive; // Only for controlling (creation of content). bool const m_bActive; // Only for controlling (creation of content).
public: public:
SwFormatFooter( bool bOn = false ); SwFormatFooter( bool bOn = false );
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
void RegisterToFormat( SwFormat& rFormat ); void RegisterToFormat( SwFormat& rFormat );
bool IsActive() const { return bActive; } bool IsActive() const { return m_bActive; }
}; };
inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
......
sw/source/core/layout/atrfrm.cxx
Dosyayı görüntüle @ f7d65772
...@@ -449,21 +449,21 @@ sal_uInt16 SwFormatFillOrder::GetValueCount() const ...@@ -449,21 +449,21 @@ sal_uInt16 SwFormatFillOrder::GetValueCount() const
SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat ) SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat )
: SfxPoolItem( RES_HEADER ), : SfxPoolItem( RES_HEADER ),
SwClient( pHeaderFormat ), SwClient( pHeaderFormat ),
bActive( pHeaderFormat ) m_bActive( pHeaderFormat )
{ {
} }
SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy ) SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy )
: SfxPoolItem( RES_HEADER ), : SfxPoolItem( RES_HEADER ),
SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
bActive( rCpy.IsActive() ) m_bActive( rCpy.IsActive() )
{ {
} }
SwFormatHeader::SwFormatHeader( bool bOn ) SwFormatHeader::SwFormatHeader( bool bOn )
: SfxPoolItem( RES_HEADER ), : SfxPoolItem( RES_HEADER ),
SwClient( nullptr ), SwClient( nullptr ),
bActive( bOn ) m_bActive( bOn )
{ {
} }
...@@ -477,7 +477,7 @@ bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const ...@@ -477,7 +477,7 @@ bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const
{ {
assert(SfxPoolItem::operator==(rAttr)); assert(SfxPoolItem::operator==(rAttr));
return ( GetRegisteredIn() == static_cast<const SwFormatHeader&>(rAttr).GetRegisteredIn() && return ( GetRegisteredIn() == static_cast<const SwFormatHeader&>(rAttr).GetRegisteredIn() &&
bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() ); m_bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() );
} }
SfxPoolItem* SwFormatHeader::Clone( SfxItemPool* ) const SfxPoolItem* SwFormatHeader::Clone( SfxItemPool* ) const
...@@ -494,21 +494,21 @@ void SwFormatHeader::RegisterToFormat( SwFormat& rFormat ) ...@@ -494,21 +494,21 @@ void SwFormatHeader::RegisterToFormat( SwFormat& rFormat )
SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat ) SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat )
: SfxPoolItem( RES_FOOTER ), : SfxPoolItem( RES_FOOTER ),
SwClient( pFooterFormat ), SwClient( pFooterFormat ),
bActive( pFooterFormat ) m_bActive( pFooterFormat )
{ {
} }
SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy ) SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy )
: SfxPoolItem( RES_FOOTER ), : SfxPoolItem( RES_FOOTER ),
SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ), SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
bActive( rCpy.IsActive() ) m_bActive( rCpy.IsActive() )
{ {
} }
SwFormatFooter::SwFormatFooter( bool bOn ) SwFormatFooter::SwFormatFooter( bool bOn )
: SfxPoolItem( RES_FOOTER ), : SfxPoolItem( RES_FOOTER ),
SwClient( nullptr ), SwClient( nullptr ),
bActive( bOn ) m_bActive( bOn )
{ {
} }
...@@ -527,7 +527,7 @@ bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const ...@@ -527,7 +527,7 @@ bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const
{ {
assert(SfxPoolItem::operator==(rAttr)); assert(SfxPoolItem::operator==(rAttr));
return ( GetRegisteredIn() == static_cast<const SwFormatFooter&>(rAttr).GetRegisteredIn() && return ( GetRegisteredIn() == static_cast<const SwFormatFooter&>(rAttr).GetRegisteredIn() &&
bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() ); m_bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() );
} }
SfxPoolItem* SwFormatFooter::Clone( SfxItemPool* ) const SfxPoolItem* SwFormatFooter::Clone( SfxItemPool* ) const
...@@ -1916,10 +1916,10 @@ SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=( ...@@ -1916,10 +1916,10 @@ SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=(
const SwFormatFootnoteEndAtTextEnd& rAttr ) const SwFormatFootnoteEndAtTextEnd& rAttr )
{ {
SfxEnumItem::SetValue( rAttr.GetValue() ); SfxEnumItem::SetValue( rAttr.GetValue() );
aFormat = rAttr.aFormat; m_aFormat = rAttr.m_aFormat;
nOffset = rAttr.nOffset; m_nOffset = rAttr.m_nOffset;
sPrefix = rAttr.sPrefix; m_sPrefix = rAttr.m_sPrefix;
sSuffix = rAttr.sSuffix; m_sSuffix = rAttr.m_sSuffix;
return *this; return *this;
} }
...@@ -1927,10 +1927,10 @@ bool SwFormatFootnoteEndAtTextEnd::operator==( const SfxPoolItem& rItem ) const ...@@ -1927,10 +1927,10 @@ bool SwFormatFootnoteEndAtTextEnd::operator==( const SfxPoolItem& rItem ) const
{ {
const SwFormatFootnoteEndAtTextEnd& rAttr = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rItem); const SwFormatFootnoteEndAtTextEnd& rAttr = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rItem);
return SfxEnumItem::operator==( rAttr ) && return SfxEnumItem::operator==( rAttr ) &&
aFormat.GetNumberingType() == rAttr.aFormat.GetNumberingType() && m_aFormat.GetNumberingType() == rAttr.m_aFormat.GetNumberingType() &&
nOffset == rAttr.nOffset && m_nOffset == rAttr.m_nOffset &&
sPrefix == rAttr.sPrefix && m_sPrefix == rAttr.m_sPrefix &&
sSuffix == rAttr.sSuffix; m_sSuffix == rAttr.m_sSuffix;
} }
bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
...@@ -1944,13 +1944,13 @@ bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMember ...@@ -1944,13 +1944,13 @@ bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMember
case MID_RESTART_NUM : case MID_RESTART_NUM :
rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ; rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
break; break;
case MID_NUM_START_AT: rVal <<= static_cast<sal_Int16>(nOffset); break; case MID_NUM_START_AT: rVal <<= static_cast<sal_Int16>(m_nOffset); break;
case MID_OWN_NUM : case MID_OWN_NUM :
rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT; rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
break; break;
case MID_NUM_TYPE : rVal <<= static_cast<sal_Int16>(aFormat.GetNumberingType()); break; case MID_NUM_TYPE : rVal <<= static_cast<sal_Int16>(m_aFormat.GetNumberingType()); break;
case MID_PREFIX : rVal <<= sPrefix; break; case MID_PREFIX : rVal <<= m_sPrefix; break;
case MID_SUFFIX : rVal <<= sSuffix; break; case MID_SUFFIX : rVal <<= m_sSuffix; break;
default: return false; default: return false;
} }
return true; return true;
...@@ -1985,7 +1985,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe ...@@ -1985,7 +1985,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
sal_Int16 nVal = 0; sal_Int16 nVal = 0;
rVal >>= nVal; rVal >>= nVal;
if(nVal >= 0) if(nVal >= 0)
nOffset = nVal; m_nOffset = nVal;
else else
bRet = false; bRet = false;
} }
...@@ -2007,7 +2007,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe ...@@ -2007,7 +2007,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
(nVal <= SVX_NUM_ARABIC || (nVal <= SVX_NUM_ARABIC ||
SVX_NUM_CHARS_UPPER_LETTER_N == nVal || SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
SVX_NUM_CHARS_LOWER_LETTER_N == nVal )) SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
aFormat.SetNumberingType(static_cast<SvxNumType>(nVal)); m_aFormat.SetNumberingType(static_cast<SvxNumType>(nVal));
else else
bRet = false; bRet = false;
} }
...@@ -2015,13 +2015,13 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe ...@@ -2015,13 +2015,13 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
case MID_PREFIX : case MID_PREFIX :
{ {
OUString sVal; rVal >>= sVal; OUString sVal; rVal >>= sVal;
sPrefix = sVal; m_sPrefix = sVal;
} }
break; break;
case MID_SUFFIX : case MID_SUFFIX :
{ {
OUString sVal; rVal >>= sVal; OUString sVal; rVal >>= sVal;
sSuffix = sVal; m_sSuffix = sVal;
} }
break; break;
default: bRet = false; default: bRet = false;
...@@ -2071,17 +2071,17 @@ SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const ...@@ -2071,17 +2071,17 @@ SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const
void SwFormatChain::SetPrev( SwFlyFrameFormat *pFormat ) void SwFormatChain::SetPrev( SwFlyFrameFormat *pFormat )
{ {
if ( pFormat ) if ( pFormat )
pFormat->Add( &aPrev ); pFormat->Add( &m_aPrev );
else else
aPrev.EndListeningAll(); m_aPrev.EndListeningAll();
} }
void SwFormatChain::SetNext( SwFlyFrameFormat *pFormat ) void SwFormatChain::SetNext( SwFlyFrameFormat *pFormat )
{ {
if ( pFormat ) if ( pFormat )
pFormat->Add( &aNext ); pFormat->Add( &m_aNext );
else else
aNext.EndListeningAll(); m_aNext.EndListeningAll();
} }
bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment