dbaccess/source/ui/control/FieldDescControl.cxx | 20 +++++----- dbaccess/source/ui/inc/FieldDescControl.hxx | 6 +-- dbaccess/source/ui/misc/WTypeSelect.cxx | 2 - filter/source/svg/svgexport.cxx | 18 ++++----- forms/source/component/formcontrolfont.cxx | 2 + framework/source/uiconfiguration/windowstateconfiguration.cxx | 1 idl/source/objects/types.cxx | 1 sc/source/ui/vba/vbarange.cxx | 5 ++ sfx2/source/appl/appcfg.cxx | 1 sfx2/source/view/viewfrm.cxx | 2 - svgio/source/svgreader/svgusenode.cxx | 1 svtools/source/config/optionsdrawinglayer.cxx | 1 svx/source/fmcomp/gridcell.cxx | 1 svx/source/unodraw/unoshape.cxx | 1 sw/source/filter/xml/xmlimpit.cxx | 2 + sw/source/ui/uno/SwXDocumentSettings.cxx | 1 xmloff/source/draw/ximpshap.cxx | 2 + xmloff/source/style/cdouthdl.cxx | 1 xmloff/source/transform/OOo2Oasis.cxx | 2 + 19 files changed, 46 insertions(+), 24 deletions(-)
New commits: commit 5d38824834b68e32062984f30acac7a741eda535 Author: Noel Grandin <n...@peralex.com> Date: Wed Feb 12 08:58:15 2014 +0200 cid#736038 missing break in switch Change-Id: Icca673a955441da87921e530c4bfe6c8f0e79723 diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f7c67ea..3aa17b3 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -231,7 +231,7 @@ public: { switch( eDateFormat ) { - case SVXDATEFORMAT_STDSMALL: ; + case SVXDATEFORMAT_STDSMALL: case SVXDATEFORMAT_A: // 13.02.96 sDateFormat = ""; break; commit 78ec17eb6bbaa5518ce2bc0a08a6d7a6f27cc8b3 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:44:43 2014 +0200 cid#705350 missing break in switch Change-Id: I8f01d7b3406eed629b08082c5a1c9e1466d954f1 diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 1b2661e..5e3f849 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1749,6 +1749,7 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions( case OOO_DATAPILOT_LEVEL_ACTIONS: m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS] = new XMLTransformerActions( aDataPilotLevelActionTable ); + break; case OOO_SOURCE_SERVICE_ACTIONS: m_aActions[OOO_SOURCE_SERVICE_ACTIONS] = new XMLTransformerActions( aSourceServiceActionTable ); commit 69b31ea3d88f831fb771f4f160a7e227dd373478 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:40:35 2014 +0200 cid#705349 missing break in switch Change-Id: I1e76cb8878968adffb1c8bebfc90786025a2b7c3 diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index e956b4d..1b2661e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1745,6 +1745,7 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions( case OOO_DATAPILOT_MEMBER_ACTIONS: m_aActions[OOO_DATAPILOT_MEMBER_ACTIONS] = new XMLTransformerActions( aDataPilotMemberActionTable ); + break; case OOO_DATAPILOT_LEVEL_ACTIONS: m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS] = new XMLTransformerActions( aDataPilotLevelActionTable ); commit a9cb2af8c29accba8dc1573859965ccca3e2edd7 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:34:51 2014 +0200 cid#705344 missing break in switch Change-Id: I734d4ed0dbb7b1cdf7640b76d88ea1ff2d19da4c diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index d559eb8..9b4dd7d 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -230,6 +230,7 @@ bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno::An eNewStrikeout = eStrikeout; break; } + break; default: OSL_ENSURE( bRet, "unexpected line type value" ); break; commit 746028f5c56eb80ad6b9474e5927a62b0c4855a6 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:32:35 2014 +0200 cid#705343 missing break in switch Change-Id: I0fe11a71223c15937917a1a06a9078e856f0f67f diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 80e2df9..f4bb6a0 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -1892,6 +1892,8 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS mnTransform.SetString(rValue, GetImport().GetMM100UnitConverter()); } } + break; + case XML_NAMESPACE_SVG: { if( IsXMLToken( rLocalName, XML_X1 ) ) commit fc9460b55fb96a8727ae77c7ef63e4598b9a9565 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:22:11 2014 +0200 cid#705318 missing break in switch Change-Id: I0501c028bbb930870d9132a23f78e2dc4c77843f diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index df53341..0297caa 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -552,6 +552,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); mpDoc->set(IDocumentSettingAccess::OLD_NUMBERING, bTmp); } + break; case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); commit 05e029801c7908e9460c055701bff6a9b1ddc365 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 15:13:40 2014 +0200 cid#705311 missing break in switch Change-Id: Ib7533b0af88c2bf8b7fbeccc92525721b376bb71 diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 9f6935c..a675610 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -295,6 +295,7 @@ bool SvXMLImportItemMapper::PutXMLValue( } } break; + case MID_FIRST_LINE_INDENT: { sal_Int32 nProp = 100; @@ -308,6 +309,7 @@ bool SvXMLImportItemMapper::PutXMLValue( pLRSpace->SetTxtFirstLineOfst( (short)nAbs, (sal_uInt16)nProp ); } + break; case MID_FIRST_AUTO: { commit 73fd2bb1979c37d03619391f95f3075dcb6eca4e Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:50:57 2014 +0200 cid#705265 missing break in switch Change-Id: I1e2b7f0b8484bb872ca0a0d745b97e1927295662 diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 031be92..f9bae61 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2744,6 +2744,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl bMirror = ((SdrGrafObj*)mpObj.get())->IsMirrored(); rValue <<= bMirror; + break; } case OWN_ATTR_EDGE_START_OBJ: commit 7724fb35e7e8d80e80b30874183a851a512555b7 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:47:40 2014 +0200 cid#705260 missing break in switch Change-Id: I4191520694105e16c1fa5d6cc6af3dd7225f3f5f diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 95bdb6d..6b2adc5 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1473,6 +1473,7 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso ((FormattedField*)m_pPainter)->SetDefaultText(sDefault); } } + break; default: OSL_FAIL( "DbFormattedField::Init: unexpected value type!" ); break; commit 124e69df7b064d12aed866c48ae2812c69b75478 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:35:55 2014 +0200 cid#705248 missing break in switch Change-Id: I325b95900e7a5ec927e8c38a687a7fe8058bbdfa diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index d3c4a55..ea47930 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -534,6 +534,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" ); seqValues[nProperty] >>= m_nTransparentSelectionPercent; } + break; case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT: { commit 83c51ee1adc7884f18b5927a39bf6629054e56e8 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:28:01 2014 +0200 cid#705240 missing break in switch Change-Id: I285234d31b027ca7862fbcb77dc9f13ca4e10463 diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index b07e6b4..e2a5c9f 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -121,6 +121,7 @@ namespace svgio setHeight(aNum); } } + break; } case SVGTokenXlinkHref: { commit 5c046a008345e35941271a25fd0995bf01c30c3b Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:22:39 2014 +0200 cid#705226 missing break in switch Change-Id: Id9457d2e7a6778fee9fa5ec32d2bb97cb8b7d296 diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index fbf0f5b..58c8456 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -478,6 +478,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if ( rSet.Put(aNames) || rSet.Put(aValues) ) bRet = sal_True; } + break; default: DBG_WARNING( "W1:Wrong ID while getting Options!" ); commit 49ba7d0e6572a021566f7f11838213f530be7a16 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 14:09:07 2014 +0200 cid#705213 missing break in switch Change-Id: If38d94453adb5014e9f044d2e6b518f6dd6468d7 diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index acd640b..39848d4 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1413,14 +1413,17 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, } } } + break; + case uno::TypeClass_INTERFACE: { uno::Reference< excel::XRange > xRange; aParam >>= xRange; if ( xRange.is() ) xRange->getCellRange() >>= xRangeParam; - break; } + break; + default: throw uno::RuntimeException("Can't extact CellRangeAddress from type", uno::Reference< uno::XInterface >() ); } commit a3682484c69500886931d921b886d63fa289d853 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:45:18 2014 +0200 cid#705188 missing break in switch Change-Id: I5e777801a7df934f61182f6df8f66fc18d00073c diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 2e1c509..b9f54cc 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1669,6 +1669,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, rOutStm.WriteCharPtr( pBaseType->GetOdlName().getStr() ); } } + break; default: { commit 25c1e9cca2e43e84e11122cf3175bec76fa58934 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:37:41 2014 +0200 cid#705176 missing break in switch Change-Id: Iaa331cc259aed93ffa7c3544586f800a795cc25d diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index a0c3060..f825e9d 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -944,6 +944,7 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat aWindowStateInfo.nStyle = sal_uInt16( nValue ); } } + break; default: DBG_ASSERT( false, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" ); commit 28820607754239b9344c858dcad5f71a0aa85abe Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:34:54 2014 +0200 cid#705175 missing break in switch Change-Id: I4565f3eab411a706eddc665b5b35f3b940b4a52c diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 148dd7e..02c8bdb 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -532,6 +532,7 @@ namespace frm case PROPERTY_ID_FONT_WORDLINEMODE: aReturn = makeBoolAny(sal_False); + break; case PROPERTY_ID_FONT_NAME: case PROPERTY_ID_FONT_STYLENAME: commit a3395aab4a2371a12aa722ea2bef9152d3096880 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:34:18 2014 +0200 cid#705174 missing break in switch Change-Id: Id3563f949a210ea4af59a96bbbbbb615368b06c2 diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 4b85cae..148dd7e 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -536,6 +536,7 @@ namespace frm case PROPERTY_ID_FONT_NAME: case PROPERTY_ID_FONT_STYLENAME: aReturn <<= OUString(); + break; case PROPERTY_ID_FONT_FAMILY: case PROPERTY_ID_FONT_CHARSET: commit d99b187fb756f9151f5f99e653b403407661698e Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:29:38 2014 +0200 coverity#705173 missing break in switch actually just some extra semi-colons Change-Id: I859b03c98b3ccbb0320a85ed8ca7894ca51c36d6 diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 85023ee..f7c67ea 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2098,27 +2098,27 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) eCurDateFormat = (SvxDateFormat)( (int)( *aChar ) & 0x0f ); switch( eDateFormat ) { - case SVXDATEFORMAT_STDSMALL: ; - case SVXDATEFORMAT_A: ; // 13.02.96 + case SVXDATEFORMAT_STDSMALL: + case SVXDATEFORMAT_A: // 13.02.96 case SVXDATEFORMAT_B: // 13.02.1996 switch( eCurDateFormat ) { - case SVXDATEFORMAT_C: ; // 13.Feb 1996 + case SVXDATEFORMAT_C: // 13.Feb 1996 case SVXDATEFORMAT_D: // 13.February 1996 - case SVXDATEFORMAT_E: ; // Tue, 13.February 1996 - case SVXDATEFORMAT_STDBIG: ; + case SVXDATEFORMAT_E: // Tue, 13.February 1996 + case SVXDATEFORMAT_STDBIG: case SVXDATEFORMAT_F: // Tuesday, 13.February 1996 eDateFormat = eCurDateFormat; break; default: break; } - case SVXDATEFORMAT_C: ; // 13.Feb 1996 + case SVXDATEFORMAT_C: // 13.Feb 1996 case SVXDATEFORMAT_D: // 13.February 1996 switch( eCurDateFormat ) { - case SVXDATEFORMAT_E: ; // Tue, 13.February 1996 - case SVXDATEFORMAT_STDBIG: ; + case SVXDATEFORMAT_E: // Tue, 13.February 1996 + case SVXDATEFORMAT_STDBIG: case SVXDATEFORMAT_F: // Tuesday, 13.February 1996 eDateFormat = eCurDateFormat; break; commit 45529c976bc834e1b9b6556daf529a19d006485e Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:09:16 2014 +0200 coverity#705143 missing break in switch Change-Id: I3155c4a61b63d2b0717b135d692141029fef5c73 diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 5dfcc96..2f33b16 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -501,6 +501,7 @@ OUString OFieldDescControl::GetControlText( sal_uInt16 nControlId ) case FIELD_PROPERTY_TEXTLEN: if (pTextLen) return OUString::number(pTextLen->GetValue()); + break; case FIELD_PROPERTY_NUMTYPE: if (pNumType) return pNumType->GetSelectEntry(); commit 878748d82dbad62781f0c81618781262fe0a149a Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:08:08 2014 +0200 coverity#705142 missing break in switch Change-Id: I32a819a5689f0818866d6920b1ad86328e8e97e3 diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 9ffdf70..5dfcc96 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -524,6 +524,7 @@ OUString OFieldDescControl::GetControlText( sal_uInt16 nControlId ) case FIELD_PROPERTY_COLUMNNAME: if(m_pColumnName) return m_pColumnName->GetText(); + break; case FIELD_PROPERTY_TYPE: if(m_pType) return m_pType->GetSelectEntry(); commit d91226da029b1707b794c2326321aab29bc95446 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 13:05:26 2014 +0200 fix spelling of property constants Change-Id: I6e40105815f7a2fa7d6b9492e121ea010a75583a diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 0c4e450..9ffdf70 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -521,14 +521,14 @@ OUString OFieldDescControl::GetControlText( sal_uInt16 nControlId ) if (pFormatSample) return pFormatSample->GetText(); break; - case FIELD_PRPOERTY_COLUMNNAME: + case FIELD_PROPERTY_COLUMNNAME: if(m_pColumnName) return m_pColumnName->GetText(); - case FIELD_PRPOERTY_TYPE: + case FIELD_PROPERTY_TYPE: if(m_pType) return m_pType->GetSelectEntry(); break; - case FIELD_PRPOERTY_AUTOINCREMENT: + case FIELD_PROPERTY_AUTOINCREMENT: if(m_pAutoIncrementValue) return m_pAutoIncrementValue->GetText(); } @@ -597,15 +597,15 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r if (pActFieldDescr) UpdateFormatSample(pActFieldDescr); break; - case FIELD_PRPOERTY_COLUMNNAME: + case FIELD_PROPERTY_COLUMNNAME: if(m_pColumnName) m_pColumnName->SetText(rText); break; - case FIELD_PRPOERTY_TYPE: + case FIELD_PROPERTY_TYPE: if(m_pType) m_pType->SelectEntry(rText); break; - case FIELD_PRPOERTY_AUTOINCREMENT: + case FIELD_PROPERTY_AUTOINCREMENT: if(m_pAutoIncrementValue) m_pAutoIncrementValue->SetText(rText); break; @@ -816,7 +816,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) return; m_nPos++; m_pAutoIncrementValueText = CreateText(STR_AUTOINCREMENT_VALUE); - m_pAutoIncrementValue = new OPropEditCtrl( this, STR_HELP_AUTOINCREMENT_VALUE, FIELD_PRPOERTY_AUTOINCREMENT, WB_BORDER ); + m_pAutoIncrementValue = new OPropEditCtrl( this, STR_HELP_AUTOINCREMENT_VALUE, FIELD_PROPERTY_AUTOINCREMENT, WB_BORDER ); m_pAutoIncrementValue->SetText( getAutoIncrementValue() ); InitializeControl(m_pAutoIncrementValue,HID_TAB_AUTOINCREMENTVALUE,false); break; @@ -867,7 +867,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) return; m_nPos++; m_pTypeText = CreateText(STR_TAB_FIELD_DATATYPE); - m_pType = new OPropListBoxCtrl( this, STR_HELP_AUTOINCREMENT, FIELD_PRPOERTY_TYPE, WB_DROPDOWN ); + m_pType = new OPropListBoxCtrl( this, STR_HELP_AUTOINCREMENT, FIELD_PROPERTY_TYPE, WB_DROPDOWN ); m_pType->SetDropDownLineCount(20); { const OTypeInfoMap* pTypeInfo = getTypeInfo(); @@ -903,7 +903,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) m_pColumnName = new OPropColumnEditCtrl( this, aTmpString, STR_HELP_DEFAULT_VALUE, - FIELD_PRPOERTY_COLUMNNAME, + FIELD_PROPERTY_COLUMNNAME, WB_BORDER ); m_pColumnName->SetMaxTextLen(nMax ? nMax : EDIT_NOLIMIT); m_pColumnName->setCheck( isSQL92CheckEnabled(getConnection()) ); diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index b4156de..c45f18a 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -42,9 +42,9 @@ #define FIELD_PROPERTY_SCALE 11 #define FIELD_PROPERTY_BOOL_DEFAULT 12 #define FIELD_PROPERTY_FORMAT 13 -#define FIELD_PRPOERTY_COLUMNNAME 14 -#define FIELD_PRPOERTY_TYPE 15 -#define FIELD_PRPOERTY_AUTOINCREMENT 16 +#define FIELD_PROPERTY_COLUMNNAME 14 +#define FIELD_PROPERTY_TYPE 15 +#define FIELD_PROPERTY_AUTOINCREMENT 16 class FixedText; class PushButton; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 4b16adf..3095349 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -105,7 +105,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) switch(nColId) { - case FIELD_PRPOERTY_COLUMNNAME: + case FIELD_PROPERTY_COLUMNNAME: { OCopyTableWizard* pWiz = static_cast<OCopyTableWizard*>(GetParentDialog()); // first we have to check if this name already exists commit 609f2cd62086da67d9a9dd85a5b7b2a7348318b4 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 11 11:44:30 2014 +0200 coverity#1130420 improper use of negative Change-Id: I463764faffb1013a8c8d10c64695289080c3205c diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index e8eeb39..f6944a9 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2570,7 +2570,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } - if ( bEraseTrailingEmptyLines ) + if ( bEraseTrailingEmptyLines && nStartPos != -1 ) { sal_Int32 n = nStartPos; sal_Int32 nLen = rStr.getLength(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits