sw/source/uibase/config/barcfg.cxx | 8 ++---
sw/source/uibase/config/fontcfg.cxx | 50 ++++++++++++++++++------------------
sw/source/uibase/docvw/srcedtw.cxx | 24 ++++++++---------
sw/source/uibase/inc/barcfg.hxx | 2 -
sw/source/uibase/inc/fontcfg.hxx | 20 +++++++-------
sw/source/uibase/inc/srcedtw.hxx | 6 ++--
sw/source/uibase/inc/uiitems.hxx | 6 ++--
sw/source/uibase/utlui/uiitems.cxx | 36 ++++++++++++-------------
8 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit ebb4cee9b796313165e4362886516da971074556
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 27 08:24:37 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 27 09:14:50 2021 +0200
sw: prefix members of SwPageFootnoteInfoItem, SwStdFontConfig, ...
... SwToolbarConfigItem and TextViewOutWin
See tdf#94879 for motivation.
Change-Id: I0d13d501c6a18c4f4f56d163f0065dd4eae88f8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122672
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/uibase/config/barcfg.cxx
b/sw/source/uibase/config/barcfg.cxx
index f57a3b4dec2e..1f54b05cc113 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -36,7 +36,7 @@ SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) :
ConfigItemMode::ReleaseTree)
{
for(int i = 0; i <= SEL_TYPE_GRAPHIC; ++i)
- aTbxIdArray[i] = -1;
+ m_aTbxIdArray[i] = -1;
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
@@ -50,7 +50,7 @@ SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) :
{
sal_Int32 nVal = 0;
pValues[nProp] >>= nVal;
- aTbxIdArray[nProp] = nVal;
+ m_aTbxIdArray[nProp] = nVal;
}
}
}
@@ -84,7 +84,7 @@ void SwToolbarConfigItem::SetTopToolbar(SelectionType
nSelType, ToolbarId eBarId
sal_Int32 nProp = lcl_getArrayIndex(nSelType);
if(nProp >= 0)
{
- aTbxIdArray[nProp] = static_cast<sal_Int32>(eBarId);
+ m_aTbxIdArray[nProp] = static_cast<sal_Int32>(eBarId);
SetModified();
}
}
@@ -115,7 +115,7 @@ void SwToolbarConfigItem::ImplCommit()
Any* pValues = aValues.getArray();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
- pValues[nProp] <<= aTbxIdArray[nProp];
+ pValues[nProp] <<= m_aTbxIdArray[nProp];
PutProperties(aNames, aValues);
}
diff --git a/sw/source/uibase/config/fontcfg.cxx
b/sw/source/uibase/config/fontcfg.cxx
index d1f5059a3566..bd57d81e9792 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -88,9 +88,9 @@ SwStdFontConfig::SwStdFontConfig() :
for(sal_Int16 i = 0; i < DEF_FONT_COUNT; i++)
{
- sDefaultFonts[i] = GetDefaultFor(i,
+ m_sDefaultFonts[i] = GetDefaultFor(i,
lcl_LanguageOfType(i, eWestern, eCJK, eCTL));
- nDefaultFontHeight[i] = -1;
+ m_nDefaultFontHeight[i] = -1;
}
Sequence<OUString> aNames = GetPropertyNames();
@@ -108,12 +108,12 @@ SwStdFontConfig::SwStdFontConfig() :
{
OUString sVal;
pValues[nProp] >>= sVal;
- sDefaultFonts[nProp] = sVal;
+ m_sDefaultFonts[nProp] = sVal;
}
else
{
- pValues[nProp] >>= nDefaultFontHeight[nProp - DEF_FONT_COUNT];
- nDefaultFontHeight[nProp - DEF_FONT_COUNT] =
o3tl::toTwips(nDefaultFontHeight[nProp - DEF_FONT_COUNT], o3tl::Length::mm100);
+ pValues[nProp] >>= m_nDefaultFontHeight[nProp - DEF_FONT_COUNT];
+ m_nDefaultFontHeight[nProp - DEF_FONT_COUNT] =
o3tl::toTwips(m_nDefaultFontHeight[nProp - DEF_FONT_COUNT],
o3tl::Length::mm100);
}
}
}
@@ -138,13 +138,13 @@ void SwStdFontConfig::ImplCommit()
{
if( nProp < DEF_FONT_COUNT )
{
- if(GetDefaultFor(nProp, lcl_LanguageOfType(nProp, eWestern, eCJK,
eCTL)) != sDefaultFonts[nProp])
- pValues[nProp] <<= sDefaultFonts[nProp];
+ if(GetDefaultFor(nProp, lcl_LanguageOfType(nProp, eWestern, eCJK,
eCTL)) != m_sDefaultFonts[nProp])
+ pValues[nProp] <<= m_sDefaultFonts[nProp];
}
else
{
- if(nDefaultFontHeight[nProp - DEF_FONT_COUNT] > 0)
- pValues[nProp] <<=
static_cast<sal_Int32>(convertTwipToMm100(nDefaultFontHeight[nProp -
DEF_FONT_COUNT]));
+ if(m_nDefaultFontHeight[nProp - DEF_FONT_COUNT] > 0)
+ pValues[nProp] <<=
static_cast<sal_Int32>(convertTwipToMm100(m_nDefaultFontHeight[nProp -
DEF_FONT_COUNT]));
}
}
PutProperties(aNames, aValues);
@@ -173,40 +173,40 @@ bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType)
const
switch( nFontType )
{
case FONT_STANDARD:
- bSame = sDefaultFonts[nFontType] == sDefFont;
+ bSame = m_sDefaultFonts[nFontType] == sDefFont;
break;
case FONT_STANDARD_CJK:
- bSame = sDefaultFonts[nFontType] == sDefFontCJK;
+ bSame = m_sDefaultFonts[nFontType] == sDefFontCJK;
break;
case FONT_STANDARD_CTL:
- bSame = sDefaultFonts[nFontType] == sDefFontCTL;
+ bSame = m_sDefaultFonts[nFontType] == sDefFontCTL;
break;
case FONT_OUTLINE :
case FONT_OUTLINE_CJK :
case FONT_OUTLINE_CTL :
- bSame = sDefaultFonts[nFontType] ==
+ bSame = m_sDefaultFonts[nFontType] ==
GetDefaultFor(nFontType, eLang);
break;
case FONT_LIST :
case FONT_CAPTION :
case FONT_INDEX :
- bSame = sDefaultFonts[nFontType] == sDefFont &&
- sDefaultFonts[FONT_STANDARD] == sDefFont;
+ bSame = m_sDefaultFonts[nFontType] == sDefFont &&
+ m_sDefaultFonts[FONT_STANDARD] == sDefFont;
break;
case FONT_LIST_CJK :
case FONT_CAPTION_CJK :
case FONT_INDEX_CJK :
{
- bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
- bSame = b1 && sDefaultFonts[nFontType] == sDefFontCJK;
+ bool b1 = m_sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
+ bSame = b1 && m_sDefaultFonts[nFontType] == sDefFontCJK;
}
break;
case FONT_LIST_CTL :
case FONT_CAPTION_CTL :
case FONT_INDEX_CTL :
{
- bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
- bSame = b1 && sDefaultFonts[nFontType] == sDefFontCTL;
+ bool b1 = m_sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
+ bSame = b1 && m_sDefaultFonts[nFontType] == sDefFontCTL;
}
break;
}
@@ -270,7 +270,7 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16
nFontType, LanguageTyp
void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
{
OSL_ENSURE( nFontType < DEF_FONT_COUNT, "invalid index in
SwStdFontConfig::ChangeInt()");
- if( nFontType >= DEF_FONT_COUNT || nDefaultFontHeight[nFontType] ==
nHeight)
+ if( nFontType >= DEF_FONT_COUNT || m_nDefaultFontHeight[nFontType] ==
nHeight)
return;
SvtLinguOptions aLinguOpt;
@@ -284,22 +284,22 @@ void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType,
sal_Int32 nHeight )
// #i92090# default height value sets back to -1
const sal_Int32 nDefaultHeight = GetDefaultHeightFor(nFontType,
lcl_LanguageOfType(nFontType, eWestern, eCJK, eCTL));
const bool bIsDefaultHeight = nHeight == nDefaultHeight;
- if( bIsDefaultHeight && nDefaultFontHeight[nFontType] > 0 )
+ if( bIsDefaultHeight && m_nDefaultFontHeight[nFontType] > 0 )
{
SetModified();
- nDefaultFontHeight[nFontType] = -1;
+ m_nDefaultFontHeight[nFontType] = -1;
}
- else if( !bIsDefaultHeight && nHeight != nDefaultFontHeight[nFontType] )
+ else if( !bIsDefaultHeight && nHeight != m_nDefaultFontHeight[nFontType] )
{
SetModified();
- nDefaultFontHeight[nFontType] = nHeight;
+ m_nDefaultFontHeight[nFontType] = nHeight;
}
}
sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8
nScriptType, LanguageType eLang )
{
OSL_ENSURE(nFont + FONT_PER_GROUP * nScriptType < DEF_FONT_COUNT, "wrong
index in SwStdFontConfig::GetFontHeight()");
- sal_Int32 nRet = nDefaultFontHeight[nFont + FONT_PER_GROUP * nScriptType];
+ sal_Int32 nRet = m_nDefaultFontHeight[nFont + FONT_PER_GROUP *
nScriptType];
if(nRet <= 0)
return GetDefaultHeightFor(nFont + FONT_PER_GROUP * nScriptType,
eLang);
return nRet;
diff --git a/sw/source/uibase/docvw/srcedtw.cxx
b/sw/source/uibase/docvw/srcedtw.cxx
index 55c6753c6023..a7ce5f7916a3 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -379,9 +379,9 @@ void TextViewOutWin::DataChanged( const DataChangedEvent&
rDCEvt )
{
const Color &rCol =
GetSettings().GetStyleSettings().GetWindowColor();
SetBackground( rCol );
- vcl::Font aFont( pTextView->GetTextEngine()->GetFont() );
+ vcl::Font aFont( m_pTextView->GetTextEngine()->GetFont() );
aFont.SetFillColor( rCol );
- pTextView->GetTextEngine()->SetFont( aFont );
+ m_pTextView->GetTextEngine()->SetFont( aFont );
}
break;
default: break;
@@ -390,15 +390,15 @@ void TextViewOutWin::DataChanged( const DataChangedEvent&
rDCEvt )
void TextViewOutWin::MouseMove( const MouseEvent &rEvt )
{
- if ( pTextView )
- pTextView->MouseMove( rEvt );
+ if ( m_pTextView )
+ m_pTextView->MouseMove( rEvt );
}
void TextViewOutWin::MouseButtonUp( const MouseEvent &rEvt )
{
- if ( pTextView )
+ if ( m_pTextView )
{
- pTextView->MouseButtonUp( rEvt );
+ m_pTextView->MouseButtonUp( rEvt );
SfxViewFrame *pFrame =
static_cast<SwSrcEditWindow*>(GetParent())->GetSrcView()->GetViewFrame();
if ( pFrame )
{
@@ -413,8 +413,8 @@ void TextViewOutWin::MouseButtonUp( const MouseEvent &rEvt
)
void TextViewOutWin::MouseButtonDown( const MouseEvent &rEvt )
{
GrabFocus();
- if ( pTextView )
- pTextView->MouseButtonDown( rEvt );
+ if ( m_pTextView )
+ m_pTextView->MouseButtonDown( rEvt );
}
void TextViewOutWin::Command( const CommandEvent& rCEvt )
@@ -437,8 +437,8 @@ void TextViewOutWin::Command( const CommandEvent& rCEvt )
break;
default:
- if ( pTextView )
- pTextView->Command( rCEvt );
+ if ( m_pTextView )
+ m_pTextView->Command( rCEvt );
else
Window::Command(rCEvt);
}
@@ -450,7 +450,7 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
SwSrcEditWindow* pSrcEditWin = static_cast<SwSrcEditWindow*>(GetParent());
bool bChange = !pSrcEditWin->IsReadonly() ||
!TextEngine::DoesKeyChangeText( rKEvt );
if(bChange)
- bDone = pTextView->KeyInput( rKEvt );
+ bDone = m_pTextView->KeyInput( rKEvt );
SfxBindings& rBindings =
static_cast<SwSrcEditWindow*>(GetParent())->GetSrcView()->GetViewFrame()->GetBindings();
if ( !bDone )
@@ -484,7 +484,7 @@ void TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
void TextViewOutWin::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
- pTextView->Paint(rRenderContext, rRect);
+ m_pTextView->Paint(rRenderContext, rRect);
}
void SwSrcEditWindow::CreateTextEngine()
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index f194c431ccd0..96060ad28838 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.hxx
@@ -26,7 +26,7 @@ enum class SelectionType : sal_Int32;
class SwToolbarConfigItem final : public utl::ConfigItem
{
- sal_Int32 aTbxIdArray[5];
+ sal_Int32 m_aTbxIdArray[5];
static css::uno::Sequence<OUString> GetPropertyNames();
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index e752d90f08f6..3fede9ba949d 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -54,17 +54,17 @@
class SW_DLLPUBLIC SwStdFontConfig final : public utl::ConfigItem
{
- OUString sDefaultFonts[DEF_FONT_COUNT];
- sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT];
+ OUString m_sDefaultFonts[DEF_FONT_COUNT];
+ sal_Int32 m_nDefaultFontHeight[DEF_FONT_COUNT];
SAL_DLLPRIVATE static css::uno::Sequence<OUString> const &
GetPropertyNames();
void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
{
- if(sDefaultFonts[nFontType] != rSet)
+ if(m_sDefaultFonts[nFontType] != rSet)
{
SetModified();
- sDefaultFonts[nFontType] = rSet;
+ m_sDefaultFonts[nFontType] = rSet;
}
}
@@ -78,13 +78,13 @@ public:
virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames
) override;
- const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return
sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
- const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return
sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
- const OUString& GetFontList (sal_uInt8 nFontGroup) const {return
sDefaultFonts[FONT_LIST + FONT_PER_GROUP * nFontGroup];}
- const OUString& GetFontCaption(sal_uInt8 nFontGroup) const {return
sDefaultFonts[FONT_CAPTION + FONT_PER_GROUP * nFontGroup];}
- const OUString& GetFontIndex (sal_uInt8 nFontGroup) const {return
sDefaultFonts[FONT_INDEX + FONT_PER_GROUP * nFontGroup];}
+ const OUString& GetFontStandard(sal_uInt8 nFontGroup) const {return
m_sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
+ const OUString& GetFontOutline(sal_uInt8 nFontGroup) const {return
m_sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
+ const OUString& GetFontList (sal_uInt8 nFontGroup) const {return
m_sDefaultFonts[FONT_LIST + FONT_PER_GROUP * nFontGroup];}
+ const OUString& GetFontCaption(sal_uInt8 nFontGroup) const {return
m_sDefaultFonts[FONT_CAPTION + FONT_PER_GROUP * nFontGroup];}
+ const OUString& GetFontIndex (sal_uInt8 nFontGroup) const {return
m_sDefaultFonts[FONT_INDEX + FONT_PER_GROUP * nFontGroup];}
- const OUString& GetFontFor(sal_uInt16 nFontType) const {return
sDefaultFonts[nFontType];}
+ const OUString& GetFontFor(sal_uInt16 nFontType) const {return
m_sDefaultFonts[nFontType];}
bool IsFontDefault(sal_uInt16 nFontType) const;
void SetFontStandard(const OUString& rSet, sal_uInt8 nFontGroup)
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index 51457cd7c97f..9217bb296a8d 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -37,7 +37,7 @@ class DataChangedEvent;
class TextViewOutWin final : public vcl::Window
{
- TextView* pTextView;
+ TextView* m_pTextView;
virtual void Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& ) override;
virtual void KeyInput( const KeyEvent& rKeyEvt ) override;
@@ -49,9 +49,9 @@ class TextViewOutWin final : public vcl::Window
public:
TextViewOutWin(vcl::Window* pParent, WinBits nBits) :
- Window(pParent, nBits), pTextView(nullptr){}
+ Window(pParent, nBits), m_pTextView(nullptr){}
- void SetTextView( TextView* pView ) {pTextView = pView;}
+ void SetTextView( TextView* pView ) {m_pTextView = pView;}
};
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index c108c9e915c3..ad4b9239ac9f 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -31,7 +31,7 @@ class SwPaM;
// container for FootNote
class SW_DLLPUBLIC SwPageFootnoteInfoItem final : public SfxPoolItem
{
- SwPageFootnoteInfo aFootnoteInfo;
+ SwPageFootnoteInfo m_aFootnoteInfo;
public:
@@ -54,8 +54,8 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
- SwPageFootnoteInfo& GetPageFootnoteInfo() { return
aFootnoteInfo; }
- const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return
aFootnoteInfo; }
+ SwPageFootnoteInfo& GetPageFootnoteInfo() { return
m_aFootnoteInfo; }
+ const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return
m_aFootnoteInfo; }
};
class SW_DLLPUBLIC SwPtrItem final : public SfxPoolItem
diff --git a/sw/source/uibase/utlui/uiitems.cxx
b/sw/source/uibase/utlui/uiitems.cxx
index 64de71e62684..7558bf36ba0e 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const &
rInfo) :
SfxPoolItem( FN_PARAM_FTN_INFO ),
- aFootnoteInfo(rInfo)
+ m_aFootnoteInfo(rInfo)
{
}
@@ -52,7 +52,7 @@ SwPageFootnoteInfoItem* SwPageFootnoteInfoItem::Clone(
SfxItemPool * /*pPool*/ )
bool SwPageFootnoteInfoItem::operator==( const SfxPoolItem& rAttr ) const
{
return SfxPoolItem::operator==(rAttr)
- && aFootnoteInfo == static_cast<const
SwPageFootnoteInfoItem&>(rAttr).aFootnoteInfo;
+ && m_aFootnoteInfo == static_cast<const
SwPageFootnoteInfoItem&>(rAttr).m_aFootnoteInfo;
}
bool SwPageFootnoteInfoItem::GetPresentation
@@ -79,22 +79,22 @@ bool SwPageFootnoteInfoItem::QueryValue( Any& rVal,
sal_uInt8 nMemberId ) const
bool bRet = true;
switch(nMemberId & ~CONVERT_TWIPS)
{
- case MID_FTN_HEIGHT : rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetHeight()));break;
- case MID_LINE_WEIGHT : rVal <<=
static_cast<sal_Int16>(convertTwipToMm100(aFootnoteInfo.GetLineWidth()));break;
- case MID_LINE_COLOR : rVal <<=
aFootnoteInfo.GetLineColor();break;
+ case MID_FTN_HEIGHT : rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(m_aFootnoteInfo.GetHeight()));break;
+ case MID_LINE_WEIGHT : rVal <<=
static_cast<sal_Int16>(convertTwipToMm100(m_aFootnoteInfo.GetLineWidth()));break;
+ case MID_LINE_COLOR : rVal <<=
m_aFootnoteInfo.GetLineColor();break;
case MID_LINE_RELWIDTH :
{
Fraction aTmp( 100, 1 );
- aTmp *= aFootnoteInfo.GetWidth();
+ aTmp *= m_aFootnoteInfo.GetWidth();
rVal <<= static_cast<sal_Int8>(static_cast<tools::Long>(aTmp));
}
break;
- case MID_LINE_ADJUST : rVal <<=
static_cast<sal_Int16>(aFootnoteInfo.GetAdj());break;//text::HorizontalAdjust
- case MID_LINE_TEXT_DIST : rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetTopDist()));break;
- case MID_LINE_FOOTNOTE_DIST: rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetBottomDist()));break;
+ case MID_LINE_ADJUST : rVal <<=
static_cast<sal_Int16>(m_aFootnoteInfo.GetAdj());break;//text::HorizontalAdjust
+ case MID_LINE_TEXT_DIST : rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(m_aFootnoteInfo.GetTopDist()));break;
+ case MID_LINE_FOOTNOTE_DIST: rVal <<=
static_cast<sal_Int32>(convertTwipToMm100(m_aFootnoteInfo.GetBottomDist()));break;
case MID_FTN_LINE_STYLE :
{
- switch ( aFootnoteInfo.GetLineStyle( ) )
+ switch ( m_aFootnoteInfo.GetLineStyle( ) )
{
default:
case SvxBorderLineStyle::NONE : rVal <<= sal_Int8(0); break;
@@ -119,7 +119,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
{
case MID_LINE_COLOR :
rVal >>= aColor;
- aFootnoteInfo.SetLineColor(aColor);
+ m_aFootnoteInfo.SetLineColor(aColor);
break;
case MID_FTN_HEIGHT:
case MID_LINE_TEXT_DIST :
@@ -132,9 +132,9 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
nSet32 = o3tl::toTwips(nSet32, o3tl::Length::mm100);
switch(nMemberId & ~CONVERT_TWIPS)
{
- case MID_FTN_HEIGHT:
aFootnoteInfo.SetHeight(nSet32); break;
- case MID_LINE_TEXT_DIST:
aFootnoteInfo.SetTopDist(nSet32);break;
- case MID_LINE_FOOTNOTE_DIST:
aFootnoteInfo.SetBottomDist(nSet32);break;
+ case MID_FTN_HEIGHT:
m_aFootnoteInfo.SetHeight(nSet32); break;
+ case MID_LINE_TEXT_DIST:
m_aFootnoteInfo.SetTopDist(nSet32);break;
+ case MID_LINE_FOOTNOTE_DIST:
m_aFootnoteInfo.SetBottomDist(nSet32);break;
}
}
break;
@@ -143,7 +143,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
sal_Int16 nSet = 0;
rVal >>= nSet;
if(nSet >= 0)
- aFootnoteInfo.SetLineWidth(o3tl::toTwips(nSet,
o3tl::Length::mm100));
+ m_aFootnoteInfo.SetLineWidth(o3tl::toTwips(nSet,
o3tl::Length::mm100));
else
bRet = false;
}
@@ -155,7 +155,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
if(nSet < 0)
bRet = false;
else
- aFootnoteInfo.SetWidth(Fraction(nSet, 100));
+ m_aFootnoteInfo.SetWidth(Fraction(nSet, 100));
}
break;
case MID_LINE_ADJUST :
@@ -163,7 +163,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
sal_Int16 nSet = 0;
rVal >>= nSet;
if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
-
aFootnoteInfo.SetAdj(static_cast<css::text::HorizontalAdjust>(nSet));
+
m_aFootnoteInfo.SetAdj(static_cast<css::text::HorizontalAdjust>(nSet));
else
bRet = false;
}
@@ -180,7 +180,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
case 3: eStyle = SvxBorderLineStyle::DASHED; break;
default: break;
}
- aFootnoteInfo.SetLineStyle( eStyle );
+ m_aFootnoteInfo.SetLineStyle( eStyle );
}
break;
default:
