canvas/source/cairo/cairo_canvashelper.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 1 + editeng/source/items/frmitems.cxx | 3 +++ i18npool/source/indexentry/indexentrysupplier_default.cxx | 1 + jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 1 + sax/source/tools/converter.cxx | 1 + sc/source/core/tool/chgtrack.cxx | 2 +- sc/source/ui/unoobj/tokenuno.cxx | 1 + sd/source/filter/eppt/epptso.cxx | 4 ++++ sd/source/filter/eppt/pptexanimations.cxx | 3 ++- sfx2/source/doc/objserv.cxx | 1 + starmath/source/wordexportbase.cxx | 2 +- svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 ++ svx/source/dialog/svxruler.cxx | 1 + svx/source/fmcomp/gridcell.cxx | 2 +- sw/source/core/undo/undobj1.cxx | 1 + sw/source/filter/html/css1atr.cxx | 3 +++ sw/source/filter/html/htmltab.cxx | 1 + sw/source/filter/html/swhtml.cxx | 3 +++ 19 files changed, 30 insertions(+), 5 deletions(-)
New commits: commit a84173738175a07429278b9010f1fbcf70aac74c Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 10:00:39 2014 +0100 coverity#736092 Improper use of negative value Change-Id: Ia96ae18275082a5d5f891140b2648d19279f71fa diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index a9ccee7..067ff74 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1485,7 +1485,7 @@ void ScChangeActionContent::GetDescription( if (aTmpStr.isEmpty()) aTmpStr = ScGlobal::GetRscString( STR_CHANGED_BLANK ); - nPos = aRsc.indexOfAsciiL("#2", 2, nPos); + nPos = nPos >= 0 ? aRsc.indexOfAsciiL("#2", 2, nPos) : -1; if (nPos >= 0) { aRsc = aRsc.replaceAt(nPos, 2, aTmpStr); commit 2096096287396afa2385add5ba14ead88d21aa88 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:56:20 2014 +0100 coverity#1213144 Missing break in switch Change-Id: If42a7aabd34a18c23e6f22b1912242f723d9d9a8 diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index a2969cc..efa34d8 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3687,6 +3687,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, break; case SVX_ADJUST_LEFT: eSurround = SURROUND_RIGHT; + //fall-through default: eHori = text::HoriOrientation::LEFT; break; commit 7704d6f76d78e199a44d7e5e9cad04fb3c611434 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:55:04 2014 +0100 coverity#1213138 Missing break in switch Change-Id: Ia31045d8b79e8b7a7904a6114b8eb69f87315bcc diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 2fb457c..6ea4a0f 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2043,6 +2043,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, { case RES_CHRATR_FONT: rFont = true; + //fall-through case RES_CHRATR_FONTSIZE: case RES_CHRATR_LANGUAGE: case RES_CHRATR_POSTURE: @@ -2052,6 +2053,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, break; case RES_CHRATR_CJK_FONT: rFont = true; + //fall-through case RES_CHRATR_CJK_FONTSIZE: case RES_CHRATR_CJK_LANGUAGE: case RES_CHRATR_CJK_POSTURE: @@ -2061,6 +2063,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, break; case RES_CHRATR_CTL_FONT: rFont = true; + //fall-through case RES_CHRATR_CTL_FONTSIZE: case RES_CHRATR_CTL_LANGUAGE: case RES_CHRATR_CTL_POSTURE: commit 41ce668f901daa0828349c8aa89a145a529b6e7a Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:53:45 2014 +0100 coverity#1209647 Missing break in switch Change-Id: I1942735bd2c8922abc95e927a249fd82ecdb31c5 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index bf8bd4f..3208bfb 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1937,12 +1937,16 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat { case ::com::sun::star::presentation::ClickAction_STOPPRESENTATION : nJump += 2; + //fall-through case ::com::sun::star::presentation::ClickAction_LASTPAGE : nJump++; + //fall-through case ::com::sun::star::presentation::ClickAction_FIRSTPAGE : nJump++; + //fall-through case ::com::sun::star::presentation::ClickAction_PREVPAGE : nJump++; + //fall-through case ::com::sun::star::presentation::ClickAction_NEXTPAGE : { nJump++; commit 32e3789816de22452417685eb36538efc06a208a Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:51:48 2014 +0100 coverity#1130407 Missing break in switch Change-Id: Ic4261e6ed9ea44ef8b4fad174b40febe4ff795fd diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 5cd4944..2b7b884 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -476,6 +476,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, break; default: OSL_TRACE( "ScTokenConversion::ConvertToTokenSequence: unhandled token type SvStackVar %d", rToken.GetType()); + //fall-through case svSep: // occurs with ocSep, ocOpen, ocClose, ocArray* case svJump: // occurs with ocIf, ocChose case svMissing: // occurs with ocMissing commit 5b2aaefb896dfe50d9cd1551ef46cacaddcf92b7 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:47:34 2014 +0100 coverity#982640 Missing break in switch Change-Id: If2a14edafb72844061dcdd1ee3507d7a215220f1 diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index d332de0..20643c6 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -349,6 +349,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, case MeasureUnit::MM_10TH: OSL_ENSURE( MeasureUnit::INCH == nTargetUnit, "output unit not supported for 1/100mm values" ); + //fall-through case MeasureUnit::MM: // 0.01mm = 1 mm/100 (exactly) nMul = 10; commit 55029129aa92f7906bb8b91464fb74aa4d9e72e3 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:45:21 2014 +0100 coverity#982631 Missing break in switch Change-Id: I1c21dfb48f4ecdcc3c599d69fe76bde006a85313 diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index ef07b26..edd1e79 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1746,6 +1746,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons case DataType::DOUBLE: case DataType::TIMESTAMP: bSetZero = true; + //fall-through case DataType::LONGVARBINARY: case DataType::DATE: case DataType::BIT: commit aed9462a9e8e50de363557aac284947a07ad16dc Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:43:03 2014 +0100 coverity#736062 Missing break in switch Change-Id: I61d6fa3b5a825dd5a99b7f6a2d700524ea4e1fb3 diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index d0674a2..f20010d 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -324,6 +324,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, case FUNIT_TWIP: OSL_ENSURE( FUNIT_POINT == eUnit, "Measuring unit not supported" ); + //fall-through case FUNIT_POINT: // 0.1pt = 2.0twip (not exact, but the UI is also not exact) nMul = 100; commit d7e96dc7475f320dba563f1061b3348c2648f95a Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:42:39 2014 +0100 coverity#736061 Missing break in switch Change-Id: I764ff930af91d1de9a9b2dc0eb1b6005e0dd83db diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index f2dd202..d0674a2 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -313,6 +313,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, case FUNIT_M: case FUNIT_KM: OSL_ENSURE( FUNIT_CM == eUnit, "Measuring unit not supported" ); + //fall-through case FUNIT_CM: // 0.01cm = 5.7twip (not exact, but the UI is also not exact) nMul = 2540; // 2.54 * 1000 commit c5802b51c0707adffd7b7e261aa2d82f459674bf Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:41:26 2014 +0100 coverity#736060 Missing break in switch Change-Id: Iac2903acfa44a144c3686cea227fd8f101b727f5 diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 2a9f969..f2dd202 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -301,6 +301,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, { case FUNIT_100TH_MM: OSL_ENSURE( FUNIT_MM == eUnit, "Measuring unit not supported" ); + //fall-through case FUNIT_MM: // 0.01mm = 0.57twip nMul = 25400; // 25.4 * 1000 commit 014ba79eeb4ea2756b398c61a285c0a7319df857 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:40:42 2014 +0100 coverity#736052 Missing break in switch Change-Id: I9e067659dea49683ceda9553b3d35254576079db diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index ccdae33..26af5a9 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -171,8 +171,8 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int nLevel) { case TDIVIDEBY: case TACUTE: - // these are handled elsewhere, e.g. when handling BINHOR OSL_ASSERT(false); + // the above are handled elsewhere, e.g. when handling BINHOR default: HandleText(pNode, nLevel); break; commit b446c561b1ca7d1b8838a14ce218f58acb718911 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:39:36 2014 +0100 coverity#736029 Missing break in switch Change-Id: I12dcf88cc2b54c89cc9d56299b17730ad19a4854 diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 170d927..82af9a3 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1211,9 +1211,9 @@ namespace cairocanvas switch( strokeAttributes.JoinType ) { - // cairo doesn't have join type NONE so we use MITER as it's pretty close case rendering::PathJoinType::NONE: bNoLineJoin = true; + // cairo doesn't have join type NONE so we use MITER as it's pretty close case rendering::PathJoinType::MITER: cairo_set_line_join( mpCairo.get(), CAIRO_LINE_JOIN_MITER ); break; commit 25059614396d14b81a28830ef2719e6b2e611124 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:37:26 2014 +0100 coverity#705269 Missing break in switch Change-Id: I574ea32f23d60a185e915d32bd163fe4ea7bd6aa diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index ce25ce7..126807d 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -660,6 +660,7 @@ void SwUndoSetFlyFmt::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ) case FLY_AS_CHAR: case FLY_AT_CHAR: nNewCntnt = pAnchor->GetCntntAnchor()->nContent.GetIndex(); + //fall-through case FLY_AT_PARA: case FLY_AT_FLY: nNewNode = pAnchor->GetCntntAnchor()->nNode.GetIndex(); commit 4e0b45d2756bd11a99f97d9b3676d814c8692e5e Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:36:41 2014 +0100 coverity#705259 Missing break in switch Change-Id: Ib9199750db79f9d7eb964709649fdd357d36ba0e diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 158d460..fa7dcc3 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -156,7 +156,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s case DataType::TIME: case DataType::TIMESTAMP: m_bDateTime = true; - + //fall-through case DataType::BIT: case DataType::BOOLEAN: case DataType::TINYINT: commit 83f760d566d61a563025ec0ca38a2f9793e0d211 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:36:00 2014 +0100 coverity#705258 Missing break in switch Change-Id: I96dbefbc5ecc006b4ec456290cabed5026c18b03 diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index c11f0f1..1406ab0 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1833,6 +1833,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin)) { default: ;//prevent warning OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" ); + //fall-through case RULER_TYPE_BORDER: if(mpRulerImpl->bIsTableRows) { commit b96086f197c0cc47c45ac70329d931db61fa3c7e Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:35:06 2014 +0100 coverity#705254 Missing break in switch Change-Id: I5dc24b0f811042732a31f1d0fff42bf400505a1a diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 906538f..03b45d26 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2108,6 +2108,7 @@ void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::ve case mso_sptAccentCallout3 : case mso_sptAccentBorderCallout3 : bAccent = false; + //fall-through case mso_sptCallout3 : case mso_sptBorderCallout3 : { commit 84d84594ea4abf1056a8c2a6be7e1ff224400cc9 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:34:40 2014 +0100 coverity#705253 Missing break in switch Change-Id: I372299fa9f4fb5a41fed88cba8b23557be24eb3b diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index c39428e..906538f 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2080,6 +2080,7 @@ void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::ve case mso_sptAccentCallout2 : case mso_sptAccentBorderCallout2 : bAccent = true; + //fall-through case mso_sptCallout2 : case mso_sptBorderCallout2 : { commit e576deff6a276e2319f0d62c9fa51faecdae9a4c Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:32:58 2014 +0100 coverity#705232 Missing break in switch Change-Id: Ifa6de9e9d1138e4962cd8cf0716fd6e06894c34f diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 9dc181c..707fd3c 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -536,6 +536,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) case SID_EXPORTDOCASPDF: case SID_DIRECTEXPORTDOCASPDF: bIsPDFExport = true; + //fall-through case SID_EXPORTDOC: case SID_SAVEASDOC: case SID_SAVEDOC: commit 51d6b42e4c16e9bb54cc191e5e8a5862f7869b12 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:31:52 2014 +0100 coverity#705221 Missing break in switch Change-Id: Ib798371f42dff6fcc67ea16c3f0ddf579160a87e diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 777472f..40e1caa 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -835,8 +835,9 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima aAnim.mnGroupType = mso_Anim_GroupType_SEQ; switch( xNode->getType() ) { - case AnimationNodeType::PAR : // PASSTROUGH!!! (as it was intended) + case AnimationNodeType::PAR : aAnim.mnGroupType = mso_Anim_GroupType_PAR; + // PASSTROUGH!!! (as it was intended) case AnimationNodeType::SEQ : { sal_Int16 nType = 0; commit 15befeb90cbbae3c644eda7640d2b97b1346269f Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:29:55 2014 +0100 coverity#705191 Missing break in switch Change-Id: I3e6b081711a45e6e0d77c6288ad26214b95b3dc7 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index fa1dc19..0c21124 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -250,6 +250,7 @@ FileHandleReader::readLine(OString * pLine) { case osl_File_E_PIPE: //HACK! for windows nRead = 0; + //fall-through case osl_File_E_None: if (nRead == 0) { commit 0eeaf228abf9aa8ef3858b4181c36650127ccd92 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:28:55 2014 +0100 coverity#705186 Missing break in switch Change-Id: I57e5f96fe9b385de852006e4b5bb830c782f93d6 diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 567da90..13ce777 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -215,6 +215,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm break; case sal_Unicode('{'): close = '}'; + //fall-through case sal_Unicode('('): if (key_count > 0) { sal_Int16 end = i+1; commit bd7d32bf1ce15dfc08b029ec1c9ace0c53cab5b9 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:25:52 2014 +0100 coverity#705152 Missing break in switch Change-Id: I9b56f5fe890d0d60e451cd35b69dcfb68e7b86b4 diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 3a6e33e..a621837 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1937,6 +1937,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) break; case BOTTOM_BORDER_DISTANCE: bDistMember = true; + //fall-through case BOTTOM_BORDER: case MID_BOTTOM_BORDER: nLine = BOX_LINE_BOTTOM; commit 48eab8e0dbd818ec3eb2f5f91f41b0cd5fac2ce5 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:25:13 2014 +0100 coverity#705151 Missing break in switch Change-Id: I7bfddf3bb7be3ade65c8b33c6d41901522498d56 diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 2f1f310..3a6e33e 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1943,6 +1943,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) break; case TOP_BORDER_DISTANCE: bDistMember = true; + //fall-through case TOP_BORDER: case MID_TOP_BORDER: nLine = BOX_LINE_TOP; commit 56eadf4789dea2387c7d2279381fc4b850374c35 Author: Caolán McNamara <caol...@redhat.com> Date: Mon May 26 09:24:40 2014 +0100 coverity#705150 Missing break in switch Change-Id: I09249504ace6b38ae3dac677678995bbb5080a28 diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 6fca87b..2f1f310 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1924,6 +1924,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } case LEFT_BORDER_DISTANCE: bDistMember = true; + //fall-through case LEFT_BORDER: case MID_LEFT_BORDER: nLine = BOX_LINE_LEFT;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits