[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/fldbas.hxx                  |    8 ++++----
 sw/source/uibase/docvw/edtwin2.cxx |   10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 6cd775cc0be0d09209c9a60d5a26bc9a52fea01f
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Sep 20 10:15:59 2018 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Sep 20 12:37:01 2018 +0200

    Scope breaks; and add number comments to SwFieldIds
    
    SwFieldIds is fixed, so add number comments to easier find the ID
    in the long list.
    
    Change-Id: I2b9fc00bd0ddc15fc327324c2895810d61e2870e
    Reviewed-on: https://gerrit.libreoffice.org/60795
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 4696f48fe88b..0204c99510a9 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -43,7 +43,7 @@ enum class SwFieldIds : sal_uInt16 {
     Author,
     Chapter,
     DocStat,
-    GetExp,
+    GetExp, // 10
     SetExp,
     GetRef,
     HiddenText,
@@ -53,7 +53,7 @@ enum class SwFieldIds : sal_uInt16 {
     Reg,
     VarReg,
     SetRef,
-    Input,
+    Input, // 20
     Macro,
     Dde,
     Table,
@@ -63,7 +63,7 @@ enum class SwFieldIds : sal_uInt16 {
     DbNextSet,
     DbNumSet,
     DbSetNumber,
-    ExtUser,
+    ExtUser, // 30
     RefPageSet,
     RefPageGet,
     Internet,
@@ -73,7 +73,7 @@ enum class SwFieldIds : sal_uInt16 {
     TableOfAuthorities,
     CombinedChars,
     Dropdown,
-    ParagraphSignature,
+    ParagraphSignature, // 40
     LAST = ParagraphSignature,
 
     Unknown = USHRT_MAX, // used as default value in some method calls
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 48b348cff00b..e9fa1aedd540 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -160,8 +160,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 sText = OStringToOUString(OString::number(
                             static_cast<const SwTableBoxValue*>(aContentAtPos.aFnd.pAttr)->GetValue()),
                             osl_getThreadTextEncoding());
+                break;
             }
-            break;
             case IsAttrAtPos::CurrAttrs:
                 sText = aContentAtPos.sStr;
                 break;
@@ -241,8 +241,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 aModStr = aModStr.replaceFirst(aCode.GetName(), "");
                 aModStr = aModStr.replaceAll("+", "");
                 sText = SwResId(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
+                break;
             }
-            break;
 
             case IsAttrAtPos::Ftn:
                 if( aContentAtPos.pFndTextAttr && aContentAtPos.aFnd.pAttr )
@@ -264,8 +264,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 const bool bShowInlineTooltips = rSh.GetViewOptions()->IsShowInlineTooltips();
                 if ( bShowTrackChanges && bShowInlineTooltips )
                      sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon);
+                break;
             }
-            break;
 
             case IsAttrAtPos::ToxMark:
                 sText = aContentAtPos.sStr;
@@ -280,6 +280,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                     }
                 }
                 break;
+
             case IsAttrAtPos::RefMark:
                 if(aContentAtPos.aFnd.pAttr)
                 {
@@ -357,8 +358,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                     sText = static_cast<const SwGetRefField*>(pField)->GetSetRefName();
                                 }
                             }
+                            break;
                         }
-                        break;
+
                         default: break;
                         }
                     }