[Libreoffice-commits] .: cui/source editeng/inc editeng/source sw/source

[Lubos Lunak]

 cui/source/tabpages/numpages.cxx |    3 +--
 editeng/inc/editeng/numitem.hxx  |    8 ++++----
 editeng/source/items/numitem.cxx |    4 ++--
 sw/source/filter/rtf/rtfnum.cxx  |    2 +-
 sw/source/filter/ww8/ww8par3.cxx |    2 +-
 sw/source/ui/misc/num.cxx        |    3 +--
 6 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 837aa67861275dd56831cbba03a989b5ad71db4b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Apr 4 21:11:26 2012 +0200

    reduce overzealous naming

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e85b5fd..bf9b1f2 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3364,8 +3364,7 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
 IMPL_LINK_NOARG(SvxNumPositionTabPage, 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 )
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index cf7d344..a6ef8e6 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -109,7 +109,7 @@ public:
         LABEL_WIDTH_AND_POSITION,
         LABEL_ALIGNMENT
     };
-    enum SvxNumLabelFollowedBy
+    enum LabelFollowedBy
     {
         LISTTAB,
         SPACE,
@@ -147,7 +147,7 @@ private:
 
     // specifies what follows the list label before the text of the first line
     // of the list item starts
-    SvxNumLabelFollowedBy       meLabelFollowedBy;
+    LabelFollowedBy       meLabelFollowedBy;
     // specifies an additional list tab stop position for meLabelFollowedBy = LISTTAB
     long                        mnListtabPos;
     // specifies the first line indent
@@ -224,8 +224,8 @@ public:
     void            SetCharTextDistance(short nSet) { nCharTextDistance = nSet; }
     short           GetCharTextDistance() const;
 
-    void SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy );
-    SvxNumLabelFollowedBy GetLabelFollowedBy() const;
+    void SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy );
+    LabelFollowedBy GetLabelFollowedBy() const;
     void SetListtabPos( const long nListtabPos );
     long GetListtabPos() const;
     void SetFirstLineIndent( const long nFirstLineIndent );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7346805..fc081b2 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -438,11 +438,11 @@ short SvxNumberFormat::GetCharTextDistance() const
     return mePositionAndSpaceMode == LABEL_WIDTH_AND_POSITION ? nCharTextDistance : 0;
 }
 
-void SvxNumberFormat::SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy )
+void SvxNumberFormat::SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy )
 {
     meLabelFollowedBy = eLabelFollowedBy;
 }
-SvxNumberFormat::SvxNumLabelFollowedBy SvxNumberFormat::GetLabelFollowedBy() const
+SvxNumberFormat::LabelFollowedBy SvxNumberFormat::GetLabelFollowedBy() const
 {
     return meLabelFollowedBy;
 }
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index da74753..39218c4 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 f50f321..4a39b5d 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 7fa8388..80a6173 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 )