[Libreoffice-commits] core.git: sc/source shell/source starmath/source

Andrea Gelmini (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 8 20:19:08 UTC 2021


 sc/source/core/tool/interpr2.cxx                     |    1 -
 sc/source/core/tool/scmatrix.cxx                     |    4 ----
 sc/source/filter/excel/xestyle.cxx                   |    1 -
 sc/source/filter/oox/extlstcontext.cxx               |    1 -
 sc/source/filter/orcus/interface.cxx                 |    8 --------
 sc/source/filter/xcl97/XclExpChangeTrack.cxx         |    1 -
 shell/source/win32/shlxthandler/ooofilt/propspec.cxx |    3 ---
 starmath/source/ElementsDockingWindow.cxx            |    1 -
 8 files changed, 20 deletions(-)

New commits:
commit 60b4c9f1921ec4f7086d71ba8b41749d432a0961
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Feb 7 20:56:18 2021 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Feb 8 21:18:21 2021 +0100

    Remove unneeded breaks
    
    Extending this:
    https://gerrit.libreoffice.org/c/core/+/110512
    
    Change-Id: I90d15fa6992a566e89c76dfab5fc863b33e0078a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110523
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 2effe4baee9a..6bfd1884dbd0 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -408,7 +408,6 @@ FormulaError ScInterpreter::GetWeekendAndHolidayMasks_MS(
                 case svDoubleRef :
                 case svExternalDoubleRef :
                     return FormulaError::NoValue;
-                    break;
 
                 default :
                     {
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index a8874824da2f..0201c70b5f8b 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1686,16 +1686,12 @@ double evaluate( double fVal, ScQueryOp eOp )
             return fVal < 0.0 ? 1.0 : 0.0;
         case SC_GREATER:
             return fVal > 0.0 ? 1.0 : 0.0;
-        break;
         case SC_LESS_EQUAL:
             return fVal <= 0.0 ? 1.0 : 0.0;
-        break;
         case SC_GREATER_EQUAL:
             return fVal >= 0.0 ? 1.0 : 0.0;
-        break;
         case SC_NOT_EQUAL:
             return fVal != 0.0 ? 1.0 : 0.0;
-        break;
         default:
             ;
     }
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 642d1214ff36..6376371fb1da 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1043,7 +1043,6 @@ const char* getFontFamilyOOXValue(FontFamily eValue)
     {
         case FAMILY_DONTKNOW:
             return "0";
-        break;
         case FAMILY_SWISS:
         case FAMILY_SYSTEM:
             return "2";
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index fda1a0449e5e..e0c41c25dc8d 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -297,7 +297,6 @@ ContextHandlerRef ExtLstLocalContext::onCreateContext( sal_Int32 nElement, const
                 return this;
             else
                 return nullptr;
-            break;
         case XLS_TOKEN( ext ):
             if (nElement == XLS14_TOKEN( id ))
                 return this;
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 49ea4d07a2b3..35fb72548a4c 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -703,16 +703,12 @@ double translateToInternal(double nVal, orcus::length_unit_t unit)
     {
         case orcus::length_unit_t::inch:
             return nVal * 72.0 * 20.0;
-            break;
         case orcus::length_unit_t::twip:
             return nVal;
-            break;
         case orcus::length_unit_t::point:
             return nVal * 20.0;
-            break;
         case orcus::length_unit_t::centimeter:
             return nVal * 20.0 * 72.0 / 2.54;
-            break;
         case orcus::length_unit_t::unknown:
             if (nVal != 0)
                 SAL_WARN("sc.orcus", "unknown unit");
@@ -1434,16 +1430,12 @@ SvxBoxItemLine getDirection(os::border_direction_t dir)
     {
         case os::border_direction_t::right:
             return SvxBoxItemLine::RIGHT;
-        break;
         case os::border_direction_t::left:
             return SvxBoxItemLine::LEFT;
-        break;
         case os::border_direction_t::top:
             return SvxBoxItemLine::TOP;
-        break;
         case os::border_direction_t::bottom:
             return SvxBoxItemLine::BOTTOM;
-        break;
         default:
         break;
     }
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index bfb16a9d14c3..1efcd8b4f0e9 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -968,7 +968,6 @@ static const char* lcl_GetType( XclExpChTrData* pData )
     case EXC_CHTR_TYPE_RK:
     case EXC_CHTR_TYPE_DOUBLE:
         return "n";
-        break;
     case EXC_CHTR_TYPE_FORMULA:
         {
             ScFormulaCell* pFormulaCell = const_cast< ScFormulaCell* >( pData->mpFormulaCell );
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index dd83326f5e2c..f03cef033b2b 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -175,13 +175,10 @@ bool CFullPropSpec::operator==( CFullPropSpec const & prop ) const
     {
     case PRSPEC_LPWSTR:
         return( _wcsicmp( GetPropertyName(), prop.GetPropertyName() ) == 0 );
-        break;
     case PRSPEC_PROPID:
         return( GetPropertyPropid() == prop.GetPropertyPropid() );
-        break;
     default:
         return false;
-        break;
     }
 }
 bool CFullPropSpec::operator!=( CFullPropSpec const & prop ) const
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index f511d8b0192d..1c3cf9deb9f1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -832,7 +832,6 @@ bool SmElementsControl::KeyInput(const KeyEvent& rKEvt)
 
         default:
             return false;
-            break;
     }
     return true;
 }


More information about the Libreoffice-commits mailing list