summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-04-04 21:11:26 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-04-06 20:10:51 +0200
commit837aa67861275dd56831cbba03a989b5ad71db4b (patch)
tree9abd6318ef4a2179c2b3f1e3201f4a5c21fd0dd5 /sw
parentd6bc02f8c4cd0f50f0a2631ac7634dab408efc1f (diff)
reduce overzealous naming
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/ui/misc/num.cxx3
3 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index da74753db95f..39218c4bc566 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -67,7 +67,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, sal_uInt8 nNumLvl )
int nLvlTxtLevel = 0, nLvlNumberLevel = 0;
String sLvlText, sLvlNumber;
SwNumFmt* pCurNumFmt;
- SvxNumberFormat::SvxNumLabelFollowedBy eFollowedBy = SvxNumberFormat::NOTHING;
+ SvxNumberFormat::LabelFollowedBy eFollowedBy = SvxNumberFormat::NOTHING;
if( MAXLEVEL >= nNumLvl )
{
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f50f321d542c..4a39b5d82318 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -904,7 +904,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
rNumFmt.SetListtabPos( nTabPos );
else
rNumFmt.SetListtabPos( aLVL.nV6Indent );
- SvxNumberFormat::SvxNumLabelFollowedBy eNumLabelFollowedBy = SvxNumberFormat::LISTTAB;
+ SvxNumberFormat::LabelFollowedBy eNumLabelFollowedBy = SvxNumberFormat::LISTTAB;
switch ( ixchFollow )
{
case 0:
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 7fa8388877d2..80a6173ddfd7 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -743,8 +743,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl)
{
// determine value to be set at the chosen list levels
- SvxNumberFormat::SvxNumLabelFollowedBy eLabelFollowedBy =
- SvxNumberFormat::LISTTAB;
+ SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
{
const sal_uInt16 nPos = aLabelFollowedByLB.GetSelectEntryPos();
if ( nPos == 1 )