[Libreoffice-commits] core.git: avmedia/source chart2/source connectivity/source cppu/source cui/source dbaccess/source editeng/source filter/source forms/source hwpfilter/source i18nlangtag/source oox/source reportdesign/source sc/source sdext/source sd/source sfx2/source stoc/source svx/source sw/source toolkit/source vcl/source vcl/unx
Stephan Bergmann
sbergman at redhat.com
Tue May 10 12:57:55 UTC 2016
avmedia/source/gstreamer/gstplayer.cxx | 1 +
chart2/source/tools/ObjectIdentifier.cxx | 3 ++-
chart2/source/tools/RelativePositionHelper.cxx | 1 +
connectivity/source/drivers/jdbc/ResultSet.cxx | 3 ++-
connectivity/source/drivers/odbc/OTools.cxx | 1 +
connectivity/source/parse/sqlnode.cxx | 1 +
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 3 ++-
cui/source/tabpages/tabline.cxx | 1 +
dbaccess/source/ui/app/AppController.cxx | 1 +
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2 ++
dbaccess/source/ui/tabledesign/TableController.cxx | 2 ++
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 1 +
filter/source/graphicfilter/icgm/actimpr.cxx | 1 +
filter/source/graphicfilter/ieps/ieps.cxx | 1 +
filter/source/graphicfilter/ipsd/ipsd.cxx | 1 +
filter/source/msfilter/msdffimp.cxx | 2 ++
filter/source/msfilter/svdfppt.cxx | 3 +++
filter/source/msfilter/util.cxx | 1 +
filter/source/svg/svgreader.cxx | 2 ++
forms/source/component/ListBox.cxx | 1 +
hwpfilter/source/formula.cxx | 3 +--
i18nlangtag/source/isolang/mslangid.cxx | 1 +
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 1 +
oox/source/ole/axcontrol.cxx | 1 +
oox/source/ppt/pptgraphicshapecontext.cxx | 1 +
oox/source/ppt/pptshapecontext.cxx | 1 +
reportdesign/source/filter/xml/xmlHelper.cxx | 3 ++-
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1 +
sc/source/core/data/column3.cxx | 1 +
sc/source/core/data/documen4.cxx | 3 ++-
sc/source/core/data/dpoutputgeometry.cxx | 1 +
sc/source/core/tool/scmatrix.cxx | 3 +++
sc/source/core/tool/token.cxx | 1 +
sc/source/filter/excel/xeextlst.cxx | 1 +
sc/source/filter/excel/xeformula.cxx | 1 +
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 3 ++-
sc/source/ui/view/output2.cxx | 1 +
sd/source/filter/eppt/eppt.cxx | 1 +
sd/source/ui/sidebar/LayoutMenu.cxx | 1 +
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 1 +
sd/source/ui/sidebar/MasterPagesSelector.cxx | 1 +
sd/source/ui/table/tablefunction.cxx | 1 +
sd/source/ui/view/drviews2.cxx | 3 ++-
sd/source/ui/view/drviews3.cxx | 1 +
sd/source/ui/view/sdview3.cxx | 1 +
sdext/source/presenter/PresenterController.cxx | 1 +
sfx2/source/doc/iframe.cxx | 1 +
stoc/source/typeconv/convert.cxx | 5 +++--
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 1 +
svx/source/dialog/imapwnd.cxx | 1 +
sw/source/core/layout/flowfrm.cxx | 2 ++
sw/source/core/tox/tox.cxx | 1 +
sw/source/filter/html/htmlsect.cxx | 3 ++-
sw/source/filter/html/htmltab.cxx | 3 ++-
sw/source/filter/html/svxcss1.cxx | 6 ++++--
sw/source/filter/ww8/docxattributeoutput.cxx | 1 +
sw/source/filter/ww8/ww8par.cxx | 1 +
sw/source/filter/ww8/ww8scan.cxx | 1 +
sw/source/ui/config/optload.cxx | 1 +
sw/source/ui/config/optpage.cxx | 1 +
sw/source/uibase/app/docstyle.cxx | 11 +++++++++--
sw/source/uibase/shells/tabsh.cxx | 1 +
sw/source/uibase/uno/unotxvw.cxx | 2 ++
toolkit/source/awt/vclxwindow.cxx | 4 +++-
vcl/source/filter/wmf/winmtf.cxx | 2 ++
vcl/source/window/window.cxx | 1 +
vcl/unx/kde4/KDESalGraphics.cxx | 1 +
67 files changed, 102 insertions(+), 18 deletions(-)
New commits:
commit 0f3ac23d732239b50207cfbb8cf810ef41fa9835
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue May 10 14:49:37 2016 +0200
Insert explicit "break" when falling through to empty next case
...which itself only contains a "break" (or nothing at all at the end of the
"switch"), as otherwise Clang -Wimplicit-fallthrough would warn about these.
Change-Id: I25c1cf2ca74dfeba7ca0385ca8f1c1bf30bbf91b
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 620f5e0..24722f0 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -422,6 +422,7 @@ void Player::processMessage( GstMessage *message )
if (mbPlayPending)
mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
}
+ break;
default:
break;
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 7ef0a95..23db4ea 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -73,8 +73,9 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType
case OBJECTTYPE_DATA_ERRORS_Y: //parent is intended to be OBJECTTYPE_DATA_ERRORS
case OBJECTTYPE_DATA_ERRORS_Z: //parent is intended to be OBJECTTYPE_DATA_ERRORS
aRet=m_aMultiClick;
+ break;
default:
- ;//empty string
+ break;//empty string
}
if( !rDragMethodServiceName.isEmpty() )
{
diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx
index 0d4edec..185dc24 100644
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -227,6 +227,7 @@ awt::Point RelativePositionHelper::getCenterOfAnchoredObject(
case drawing::Alignment_TOP:
case drawing::Alignment_TOP_RIGHT:
fYDelta += aUnrotatedObjectSize.Height/2;
+ break;
default:
// nothing to do
break;
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index d872258..3cef4b7 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -917,8 +917,9 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue(
break;
case PROPERTY_ID_FETCHSIZE:
bRet = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchSize());
+ break;
default:
- ;
+ break;
}
return bRet;
}
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 4b93785..71109fb 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -319,6 +319,7 @@ void OTools::ThrowException(const OConnection* _pConnection,
case SQL_NO_DATA_FOUND:
if(_bNoFound)
return; // no need to throw a exception
+ break;
case SQL_ERROR: break;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 61d4b5f..bc20db4 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -826,6 +826,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType, OSQLParseNode* pLiteral)
case DataType::CLOB:
if ( !SQL_ISRULE(pReturn,char_value_exp) && !buildStringNodes(pReturn) )
pReturn = nullptr;
+ break;
default:
break;
}
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 5067a2f..0b81cea 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -91,9 +91,10 @@ static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
TYPELIB_DANGER_RELEASE( pTD );
if (bRel)
return true;
+ break;
}
default:
- ;
+ break;
}
}
if (pComp->pBaseTypeDescription)
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 4db2bbc..65a2e52 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -80,6 +80,7 @@ SvxLineTabDialog::SvxLineTabDialog
case OBJ_MEASURE:
case OBJ_EDGE:
bLineOnly = true;
+ break;
default:
break;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index d6b9627..db224ff 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -541,6 +541,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt
break;
case RET_CANCEL:
bCanSuspend = false;
+ break;
default:
break;
}
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index fa86cea1..e237f4a 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -331,6 +331,7 @@ namespace dbaui
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
+ break;
}
default:
break;
@@ -355,6 +356,7 @@ namespace dbaui
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
+ break;
}
default:
break;
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index a56e787..16b94c9 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -562,6 +562,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
break;
case RET_CANCEL:
bCheck = false;
+ break;
default:
break;
}
@@ -589,6 +590,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
break;
case RET_CANCEL:
bCheck = false;
+ break;
default:
break;
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 0e7c1a6..b036de0 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -964,6 +964,7 @@ namespace accessibility
case text::textfield::Type::EXTENDED_FILE:
case text::textfield::Type::DOCINFO_TITLE:
strFldType = "file name";
+ break;
default:
break;
}
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 124bba8..de256ba 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -718,6 +718,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
case TAV_BOTTOM :
case TAV_NORMAL :
aTextPos.Y -= static_cast<sal_Int32>( mpCGM->pElement->nCharacterHeight * 1.5 );
+ break;
case TAV_TOP :
break;
case TAV_CAP:
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 08b6795..ef132bb 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -632,6 +632,7 @@ ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
case 0x0a :
if ( --nScanLines < 0 )
bIsValid = false;
+ break;
case 0x09 :
case 0x0d :
case 0x20 :
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 3a899001..249ecfb 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -209,6 +209,7 @@ bool PSDReader::ImplReadHeader()
{
case 2 :
mbTransparent = true;
+ break;
case 1 :
break;
case 4 :
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 56a25dd..af1a021 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2486,6 +2486,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
case mso_sptTextCircleCurve :
case mso_sptTextButtonCurve :
bTextPathFitShape = false;
+ break;
default : break;
}
}
@@ -5133,6 +5134,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
case mso_txflHorzA:
bVerticalText = true;
nTextRotationAngle = 9000;
+ break;
case mso_txflHorzN:
default :
break;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 5320b57..b72a659 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3258,6 +3258,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
#ifdef DBG_UTIL
default :
OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ)" );
+ break;
case PPT_PST_MasterText : // first seen in: ms-tt02.ppt
case PPT_PST_SrKinsoku :
case PPT_PST_TextDefaults9Atom :
@@ -3312,6 +3313,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
break;
default :
OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
+ break;
case PPT_PST_HashCodeAtom :
case PPT_PST_BuildList :
case PPT_PST_SlideFlags10Atom :
@@ -6555,6 +6557,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
// fall-through
case PPT_MASTERPAGE :
nInstance++;
+ break;
case PPT_SLIDEPAGE :
break;
default :
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 36046fb..1b7bac4 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -549,6 +549,7 @@ EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam)
}
}
}
+ break;
}
default:
break;
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 48ebaeb..8b09bad 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1605,6 +1605,7 @@ struct ShapeWritingVisitor
break;
case XML_R:
r = convLength(sAttributeValue,maCurrState,'r');
+ break;
default:
// skip
break;
@@ -1643,6 +1644,7 @@ struct ShapeWritingVisitor
break;
case XML_RY:
ry = convLength(sAttributeValue,maCurrState,'v');
+ break;
default:
// skip
break;
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 3275718..6b3f1b4 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1316,6 +1316,7 @@ namespace frm
default:
break;
}
+ break;
}
default:
break;
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index 0022efe..3b114f7 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -178,9 +178,8 @@ void Formula::makeExpr(Node *res)
break;
case ID_BLOCK:
makeBlock(tmp);
- //fall-through
+ break;
case ID_BEGIN:
- //fall-through
case ID_END:
break;
}
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index cec8d9f..ef5dc27 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -263,6 +263,7 @@ bool MsLangId::isTraditionalChinese( LanguageType nLang )
case LANGUAGE_CHINESE_HONGKONG:
case LANGUAGE_CHINESE_MACAU:
bRet = true;
+ break;
default:
break;
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 51b58da..2df07c2 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -354,6 +354,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
}
rShape->setSize(aTotalSize);
+ break;
}
default:
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 64993a2..fe2c9df 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -430,6 +430,7 @@ void ControlConverter::convertToAxBorder( PropertySet& rPropSet,
break;
case API_BORDER_SUNKEN:
nSpecialEffect = AX_SPECIALEFFECT_SUNKEN;
+ break;
case API_BORDER_NONE:
default:
break;
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 8fca405..bfe2a6c 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -123,6 +123,7 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
case XML_sldImg : // notes/notesmaster
case XML_pic : // slide/layout
nFirstPlaceholder = nSubType;
+ break;
default:
break;
}
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 935fdec..c850838 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -118,6 +118,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
case XML_sldImg : // notes/notesmaster
case XML_pic : // slide/layout
nFirstPlaceholder = nSubType;
+ break;
default:
break;
}
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 5d1410c..f11c01e 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -91,8 +91,9 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
break;
case (XML_SD_TYPES_START+34):
pHandler = new xmloff::ImageScaleModeHandler();
+ break;
default:
- ;
+ break;
}
if ( !pHandler )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 535fa58..2cad0b5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -663,6 +663,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
Value >>= sValue;
aNewValue <<= impl_ConvertUIToMimeType_nothrow(sValue);
}
+ break;
default:
break;
}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index a86cffe..27abbbf 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2329,6 +2329,7 @@ public:
break;
case CELLTYPE_STRING:
rColumn.SetRawString(aBlockPos, r.mnRow, *r.maValue.mpString, false);
+ break;
default:
;
}
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 11fba58..3f91377 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -461,8 +461,9 @@ bool setCacheTableReferenced(formula::FormulaToken& rToken, ScExternalRefManager
* have to be marked as well, if so. Mechanism would be
* different. */
OSL_FAIL("ScDocument::MarkUsedExternalReferences: implement the svExternalName case!");
+ break;
default:
- ;
+ break;
}
return false;
}
diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx
index f0ec629..53a6000 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -179,6 +179,7 @@ void ScDPOutputGeometry::adjustFieldsForDataLayout(sal_uInt32& rColumnFields, sa
case Row:
if (rRowFields > 0)
rRowFields -= 1;
+ break;
default:
;
}
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 9ed1445..1f5ace8 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -684,6 +684,7 @@ ScMatrixValue ScMatrixImpl::Get(SCSIZE nC, SCSIZE nR) const
assert(false);
}
aVal.fVal = 0.0;
+ break;
default:
;
}
@@ -1554,6 +1555,7 @@ public:
for (size_t i = 0; i < node.size; ++i)
compare();
}
+ break;
default:
;
}
@@ -1792,6 +1794,7 @@ public:
*miPos = op(*miPos, 0.0);
}
}
+ break;
default:
;
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 11005ea..ebd17a0 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1564,6 +1564,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case svUnknown:
// We don't support vectorization on these.
meVectorState = FormulaVectorDisabled;
+ break;
default:
;
}
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index c9a3214..921642a 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -276,6 +276,7 @@ XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry&
mxEntry.reset(new XclExpExtIconSet(*this, rIconSet, rPos));
pType = "iconSet";
}
+ break;
default:
break;
}
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 031ff47..fb747cb 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2143,6 +2143,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData )
mxData->mpLinkMgr->StoreCellRange(
nFileId, pScToken->GetString().getString(), aRefData.toAbs(*mxData->mpScBasePos));
}
+ break;
default:
; // nothing, avoid compiler warning
}
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 10d0c18..c559b4f 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -286,8 +286,9 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
mpEdDecimals->SetValue(nPrecision);
mpEdLeadZeroes->SetValue(nLeadZeroes);
}
+ break;
default:
- ;
+ break;
}
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d110c1d..2cc4f5a 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3519,6 +3519,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
case SVX_VER_JUSTIFY_TOP:
// align to top
aLogicStart.Y() -= nGap;
+ break;
default:
;
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 0e7e340..eef315c 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -201,6 +201,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
// fall-through
case 2 : // semi-automatic
mnDiaMode++;
+ break;
default :
case 0 : // manual
break;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 55a51c2..539cee5 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -400,6 +400,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
if (pDrawViewShell != nullptr)
if (pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
bMasterPageMode = true;
+ break;
}
default:
break;
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
index 43e60a1..5f591e4 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx
@@ -90,6 +90,7 @@ void MasterPageContainerFiller::RunNextStep()
mrContainerAdapter.FillingDone();
mpScannerTask.reset();
}
+ break;
default:
break;
}
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 2f61b25..c547dc3 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -446,6 +446,7 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC
{
int nIndex (GetIndexForToken(rEvent.maChildToken));
SetItem(nIndex, MasterPageContainer::NIL_TOKEN);
+ break;
}
default:
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index fd58cd4..948cdd1 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -243,6 +243,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
Cancel();
rReq.Done ();
+ break;
}
default:
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e610c44..b72d9b2 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3088,9 +3088,10 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
FuText::ChangeFontSize( nSId == SID_GROW_FONT_SIZE, nullptr, pFontList, mpView );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
}
+ break;
}
default:
- ;
+ break;
}
mpDrawView->SetAttributes(aNewAttr);
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 6da4626..307ee4f 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -473,6 +473,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
UpdatePreview( mpActualPage );
rReq.Done();
}
+ break;
default:
break;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index a88e240..95badc5 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -229,6 +229,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo
break;
default: break;
}
+ break;
default: break;
}
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 133901e..b90b396 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1038,6 +1038,7 @@ void PresenterController::HandleNumericKeyPress (
// Ignore unsupported key.
break;
}
+ break;
default:
// Ignore unsupported modifiers.
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 1094114..10fa37f 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -379,6 +379,7 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName)
{
aAny <<= (sal_Int32 ) maFrmDescr.GetMargin().Height();
}
+ break;
default: ;
}
return aAny;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 1c864f0..e7795c5 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -120,6 +120,7 @@ static bool getNumericValue( double & rfVal, const OUString & rStr )
bNeg = true;
else if (trim[0] != '+')
return false;
+ break;
case 1: // 0x...
break;
default:
@@ -200,6 +201,7 @@ static bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
bNeg = true;
else if (trim[0] != '+')
return false;
+ break;
case 1: // 0x...
break;
default:
@@ -728,9 +730,8 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
switch (aSourceClass)
{
default:
- {
aRet <<= (toDouble( rVal ) != 0.0);
- }
+ break;
case TypeClass_ENUM: // exclude enums
break;
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index bd3e3da..9608dc4 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6223,6 +6223,7 @@ sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType )
case mso_sptVerticalScroll :
case mso_sptHorizontalScroll :
nGluePointType = css::drawing::EnhancedCustomShapeGluePointType::RECT;
+ break;
default: break;
}
}
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 2c034e4..59e25e6 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -753,6 +753,7 @@ IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool )
case MN_DELETE1:
pView->DeleteMarked();
+ break;
default :
break;
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 1464542..c9698bd 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -194,6 +194,7 @@ bool SwFlowFrame::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKee
case SVX_BREAK_PAGE_BOTH:
{
bKeep = false;
+ break;
}
default: break;
}
@@ -247,6 +248,7 @@ bool SwFlowFrame::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKee
case SVX_BREAK_PAGE_BEFORE:
case SVX_BREAK_PAGE_BOTH:
bKeep = false;
+ break;
default: break;
}
}
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f13961a..171755e 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -635,6 +635,7 @@ OUString SwFormToken::GetString() const
{
sData = OUString::number( nAuthorityField ) + sData;
}
+ break;
default:
break;
}
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 03f3333..c3703db 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -820,8 +820,9 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
if( bFormatBreak )
pDestContentNd->SetAttr( *pItem );
pSrcContentNd->ResetAttr( RES_BREAK );
+ break;
default:
- ;
+ break;
}
}
}
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 068cba4..0d64d8b 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3726,8 +3726,9 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
case SVX_BREAK_PAGE_BOTH:
pFrameFormat->SetFormatAttr( *pItem2 );
pOldTextNd->ResetAttr( RES_BREAK );
+ break;
default:
- ;
+ break;
}
}
}
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 41c9da1..23fce2f 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1264,9 +1264,10 @@ static void ParseCSS1_font_variant( const CSS1Expression *pExpr,
rItemSet.Put( SvxCaseMapItem( (SvxCaseMap)nCaseMap,
aItemIds.nCaseMap ) );
}
+ break;
}
default:
- ;
+ break;
}
}
@@ -1290,9 +1291,10 @@ static void ParseCSS1_text_transform( const CSS1Expression *pExpr,
rItemSet.Put( SvxCaseMapItem( (SvxCaseMap)nCaseMap,
aItemIds.nCaseMap ) );
}
+ break;
}
default:
- ;
+ break;
}
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4bb1527..8bee909 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2553,6 +2553,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData )
case nsRedlineType_t::REDLINE_FORMAT:
OSL_TRACE( "TODO DocxAttributeOutput::StartRedline()" );
+ break;
default:
break;
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a6346c3..9724028 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -786,6 +786,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
case mso_txflHorzA:
bVerticalText = true;
nTextRotationAngle = 9000;
+ break;
case mso_txflHorzN:
default :
break;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index aaa4ed4..dfe1b5d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1304,6 +1304,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const
case 5:
case 22:
OSL_FAIL("Can't create these from the menus, please report");
+ break;
default:
case 23: //Only 3pt in the menus, but honours the size setting.
break;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index f21acd0..4fa9271 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -99,6 +99,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
// use only these metrics
sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric );
m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) );
+ break;
}
default:; //prevent warning
}
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 22742be..9a0d509 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -155,6 +155,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
sal_Int32 nPos = m_pVMetric->InsertEntry( sMetric );
m_pVMetric->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) );
}
+ break;
}
default:;//prevent warning
}
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index d948c5d..b1795c1 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -578,7 +578,10 @@ void SwDocStyleSheet::SetHidden( bool bValue )
bChg = true;
}
}
- default:;
+ break;
+
+ default:
+ break;
}
if( bChg )
@@ -625,7 +628,9 @@ bool SwDocStyleSheet::IsHidden( ) const
SwNumRule* pRule = rDoc.FindNumRulePtr( aName );
bRet = pRule && pRule->IsHidden( );
}
- default:;
+ break;
+ default:
+ break;
}
return bRet;
@@ -717,6 +722,7 @@ bool SwDocStyleSheet::HasParentSupport() const
case SfxStyleFamily::Char :
case SfxStyleFamily::Para :
case SfxStyleFamily::Frame: bRet = true;
+ break;
default:; //prevent warning
}
return bRet;
@@ -730,6 +736,7 @@ bool SwDocStyleSheet::HasClearParentSupport() const
case SfxStyleFamily::Para :
case SfxStyleFamily::Char :
case SfxStyleFamily::Frame: bRet = true;
+ break;
default:; //prevent warning
}
return bRet;
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index d686b78..91199fc 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1009,6 +1009,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
case HEADLINE_BOXATTRCOPY:
case HEADLINE_BOXATRCOLLCOPY:
rSh.SplitTable(pType->GetValue()) ;
+ break;
default: ;//wrong parameter, do nothing
}
}
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 3411f39..c3b9838 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1436,6 +1436,7 @@ OUString SwXTextViewCursor::getString()
SwWrtShell& rSh = m_pView->GetWrtShell();
SwPaM* pShellCursor = rSh.GetCursor();
SwUnoCursorHelper::GetTextFromPam(*pShellCursor, uRet);
+ break;
}
default:;//prevent warning
}
@@ -1467,6 +1468,7 @@ void SwXTextViewCursor::setString(const OUString& aString)
SwWrtShell& rSh = m_pView->GetWrtShell();
SwCursor* pShellCursor = rSh.GetSwCursor();
SwUnoCursorHelper::SetString(*pShellCursor, aString);
+ break;
}
default:;//prevent warning
}
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 2b0269c..3494aad 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1637,7 +1637,9 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
case WINDOW_GROUPBOX:
case WINDOW_FIXEDLINE:
pWindow->SetPaintTransparent( false );
- default: ;
+ break;
+ default:
+ break;
}
pWindow->Invalidate(); // Invalidate if control does not respond to it
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index e6f610a..ac6fac9 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1815,6 +1815,8 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList )
SetRasterOp( R2_NOT );
DrawRect( aRect, false );
}
+ break;
+
case 0xa : // no operation
break;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index cd44a21..4575b22 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -983,6 +983,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
case WINDOW_ERRORBOX:
case WINDOW_QUERYBOX:
nFrameStyle |= SalFrameStyleFlags::DIALOG;
+ break;
default:
break;
}
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 5ac9cc4..9bbebce 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -903,6 +903,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
contentRect = boundingRect = rect;
retVal = true;
}
+ break;
}
default:
break;
More information about the Libreoffice-commits
mailing list