[Libreoffice-commits] core.git: chart2/source connectivity/source cui/source dbaccess/source editeng/source filter/source fpicker/source oox/source sc/qa sc/source sd/source svx/source sw/source vcl/osx vcl/source vcl/unx writerfilter/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 6 10:30:29 UTC 2020
chart2/source/view/charttypes/VSeriesPlotter.cxx | 4 +--
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 2 -
cui/source/options/treeopt.cxx | 4 +--
dbaccess/source/core/api/RowSet.cxx | 2 -
editeng/source/uno/unofield.cxx | 2 -
filter/source/graphicfilter/itga/itga.cxx | 2 -
filter/source/graphicfilter/itiff/itiff.cxx | 2 -
filter/source/svg/svgfilter.cxx | 2 -
fpicker/source/office/PlacesListBox.cxx | 2 -
fpicker/source/office/RemoteFilesDialog.cxx | 4 +--
fpicker/source/office/iodlg.cxx | 2 -
oox/source/export/chartexport.cxx | 2 -
sc/qa/unit/subsequent_export-test.cxx | 2 -
sc/source/filter/excel/xestyle.cxx | 2 -
sc/source/ui/vba/vbavalidation.cxx | 2 -
sd/source/filter/eppt/pptexanimations.cxx | 2 -
svx/source/sdr/properties/customshapeproperties.cxx | 2 -
svx/source/toolbars/fontworkbar.cxx | 2 -
sw/source/core/layout/tabfrm.cxx | 2 -
sw/source/core/text/xmldump.cxx | 2 -
sw/source/core/undo/undobj.cxx | 2 -
sw/source/core/unocore/unosrch.cxx | 2 -
sw/source/filter/ww8/wrtww8.cxx | 22 ++++++++---------
vcl/osx/a11yfocustracker.cxx | 2 -
vcl/osx/salinst.cxx | 2 -
vcl/source/app/salvtables.cxx | 6 ++--
vcl/source/app/svapp.cxx | 2 -
vcl/source/control/edit.cxx | 2 -
vcl/source/window/builder.cxx | 2 -
vcl/source/window/toolbox.cxx | 2 -
vcl/unx/generic/printer/ppdparser.cxx | 4 +--
writerfilter/source/dmapper/CellColorHandler.cxx | 4 +--
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 8 +++---
33 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 744903b8c8c5a31d304a3191869b7bd76000f36c
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Jan 3 15:40:40 2020 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jan 6 11:29:45 2020 +0100
Removed redundant semicolons
Change-Id: Ife14b8c3f7d121deb390deb5f405dd42d3016acf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86156
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 8189ece987e9..34036f3dd0ed 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2570,7 +2570,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries(
break;
default:
break;
- };
+ }
Reference< drawing::XShape > xShape( VLegendSymbolFactory::createSymbol( rEntryKeyAspectRatio,
xTarget, eLegendSymbolStyle, xShapeFactory
, rSeries.getPropertiesOfSeries(), ePropType, aExplicitSymbol ));
@@ -2601,7 +2601,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
break;
default:
break;
- };
+ }
// the default properties for the data point are the data series properties.
// If a data point has own attributes overwrite them
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index fe1db432f284..bdb3ec58df0a 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -167,7 +167,7 @@ jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key )
}
else
{
- return static_cast<unsigned char>(aData[0]);;
+ return static_cast<unsigned char>(aData[0]);
}
}
return -1;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5f694550c083..d45cded0040f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -583,7 +583,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
xTreeLB->iter_nth_sibling(*xParent, nGroup);
OptionsPageInfo* pPageInfo = new OptionsPageInfo( nId );
- OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pPageInfo)));;
+ OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pPageInfo)));
xTreeLB->insert(xParent.get(), -1, &rPageName, &sId, nullptr, nullptr, nullptr, false, nullptr);
return pPageInfo;
}
@@ -596,7 +596,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName,
{
OptionsGroupInfo* pInfo =
new OptionsGroupInfo( pCreateShell, pCreateModule, nDialogId );
- OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pInfo)));;
+ OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pInfo)));
xTreeLB->append(sId, rGroupName);
sal_uInt16 nRet = 0;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 955dbc54cf50..6272822bbd10 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -363,7 +363,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
break;
default:
break;
- };
+ }
}
void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 740f71249db8..1a2c722012f9 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -547,7 +547,7 @@ std::unique_ptr<SvxFieldData> SvxUnoTextField::CreateFieldData() const throw()
case text::textfield::Type::DOCINFO_CUSTOM:
pData.reset( new editeng::CustomPropertyField(mpImpl->msString1, mpImpl->msString2) );
break;
- };
+ }
return pData;
}
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index f7748022fadb..571237aef5f3 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -252,7 +252,7 @@ bool TGAReader::ImplReadHeader()
case 11 :
mbEncoding = true;
break;
- };
+ }
if ( mpFileHeader->nImageIDLength ) // skip the Image ID
m_rTGA.SeekRel( mpFileHeader->nImageIDLength );
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index bfd06303f3a1..d16410ad04c6 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1336,7 +1336,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{
pTIFF->ResetError();
break;
- };
+ }
nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
pTIFF->ReadUInt16( nNumTags );
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index f5d7149db41a..b7e6bcb66e53 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -362,7 +362,7 @@ bool SVGFilter::filterImpressOrDraw( const Sequence< PropertyValue >& rDescripto
// always leave helper endless loop
break;
- };
+ }
}
else if( mxSrcDoc.is() )
{
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index da3e304dce3e..2fc919f9b1d9 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -134,7 +134,7 @@ IMPL_LINK_NOARG( PlacesListBox, DoubleClick, weld::TreeView&, bool )
}
default:
break;
- };
+ }
}
return true;
}
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 27ed01464204..d2698983e6b9 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -552,7 +552,7 @@ void RemoteFilesDialog::AddService()
default :
// Do Nothing
break;
- };
+ }
}
IMPL_LINK_NOARG( RemoteFilesDialog, SelectServiceHdl, weld::ComboBox&, void )
@@ -609,7 +609,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, const OString&, rIdent, void
default :
// Do Nothing
break;
- };
+ }
}
}
if( sIdent == "delete_service" && m_xServices_lb->get_count() > 0 )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 1915a1d66aa6..519b21329f65 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -991,7 +991,7 @@ IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl, weld::Button&, void
default :
// Do Nothing
break;
- };
+ }
}
IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl, weld::Button&, void )
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 9b4e33963fcd..60172be93a38 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1560,7 +1560,7 @@ void ChartExport::exportGradientFill( const Reference< XPropertySet >& xPropSet
{
uno::Reference< container::XNameAccess > xTransparenceGradient(xFact->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY);
uno::Any rTransparenceValue = xTransparenceGradient->getByName(sFillTransparenceGradientName);
- rTransparenceValue >>= aTransparenceGradient;;
+ rTransparenceValue >>= aTransparenceGradient;
WriteGradientFill(aGradient, aTransparenceGradient);
}
else
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index c9e15f8514c7..d10dc4244a0e 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -4059,7 +4059,7 @@ void ScExportTest::testConditionalFormatPriorityCheckXLSX()
{
OString aIdx = OString::number(nIdx);
OUString aCellAddr = getXPath(pDoc, "//x:conditionalFormatting[" + aIdx + "]", "sqref");
- OUString aPriority = getXPath(pDoc, "//x:conditionalFormatting[" + aIdx + "]/x:cfRule", "priority");;
+ OUString aPriority = getXPath(pDoc, "//x:conditionalFormatting[" + aIdx + "]/x:cfRule", "priority");
CPPUNIT_ASSERT_MESSAGE("conditionalFormatting sqref must be either A1 or A3", aCellAddr == "A1" || aCellAddr == "A3");
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 9d52b28fa795..353d8148327c 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3173,7 +3173,7 @@ void XclExpDxf::SaveXmlExt( XclExpXmlStream& rStrm )
mpBorder->SaveXml(rStrm);
if (mpProt)
mpProt->SaveXml(rStrm);
- rStyleSheet->endElementNS( XML_x14, XML_dxf );;
+ rStyleSheet->endElementNS( XML_x14, XML_dxf );
}
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 651ce16eb2ef..d3d166643221 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -357,7 +357,7 @@ ScVbaValidation::getType()
case sheet::ValidationType::ValidationType_MAKE_FIXED_SIZE:
default:
break;
- };
+ }
}
return nExcelType;
}
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 58a2ad938db6..f2ef8866df8b 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1337,7 +1337,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
}
}
break;
- };
+ }
if ( bCreateEvent )
{
EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, i + 1 );
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index a51fb7359b6c..9252cee5f581 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -215,7 +215,7 @@ namespace sdr
bRemoveRenderGeometry = true;
break;
default: break;
- };
+ }
}
else if ( rHint.GetId() == SfxHintId::DataChanged )
{
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 8ca8a1c33f7e..ef2fef09e452 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -537,7 +537,7 @@ void FontworkBar::execute( SdrView& rSdrView, SfxRequest const & rReq, SfxBindin
}
}
break;
- };
+ }
}
void FontworkBar::getState( SdrView const * pSdrView, SfxItemSet& rSet )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0fcbd1e77a42..26d834113ee8 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -5205,7 +5205,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder
case text::VertOrientation::CENTER: lTopOfst = nDiff / 2; break;
case text::VertOrientation::BOTTOM: lTopOfst = nDiff; break;
default: break;
- };
+ }
}
long nTmp = aRectFnSet.YInc(
aRectFnSet.GetPrtTop(*this), lTopOfst );
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index d9c2336613f0..510615b08a1f 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -308,7 +308,7 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const
name = "notxt";
break;
default: break;
- };
+ }
if ( name != nullptr )
{
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 22794f5316d5..ec345897a303 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -647,7 +647,7 @@ OUString GetUndoComment(SwUndoId eId)
case SwUndoId::INSERT_FORM_FIELD:
pId = STR_UNDO_INSERT_FORM_FIELD;
break;
- };
+ }
assert(pId);
return SwResId(pId);
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 314b55d4ac85..f6994690a03f 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -560,7 +560,7 @@ SET_BOOL:
SET_UINT16:
aRet <<= nSet;
break;
- };
+ }
return aRet;
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 84c69998fab8..1b251d6b569f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3500,18 +3500,18 @@ ErrCode WW8Export::ExportDocument_Impl()
}
m_pGrf.reset();
- m_pMagicTable.reset();;
- m_pFieldFootnote.reset();;
- m_pFieldTextBxs.reset();;
- m_pFieldHFTextBxs.reset();;
- m_pFieldAtn.reset();;
- m_pFieldEdn.reset();;
- m_pFieldHdFt.reset();;
- m_pFieldMain.reset();;
- m_pStyles.reset();;
+ m_pMagicTable.reset();
+ m_pFieldFootnote.reset();
+ m_pFieldTextBxs.reset();
+ m_pFieldHFTextBxs.reset();
+ m_pFieldAtn.reset();
+ m_pFieldEdn.reset();
+ m_pFieldHdFt.reset();
+ m_pFieldMain.reset();
+ m_pStyles.reset();
pO.reset();
- m_pChpPlc.reset();;
- m_pPapPlc.reset();;
+ m_pChpPlc.reset();
+ m_pPapPlc.reset();
pSepx.reset();
delete m_pRedlAuthors;
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index b62c27edfbc7..057169a3016d 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -85,7 +85,7 @@ void AquaA11yFocusTracker::WindowEventHandler(void * pThis, VclSimpleEvent& rEve
break;
default:
break;
- };
+ }
}
AquaA11yFocusTracker::AquaA11yFocusTracker() :
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 6b5c177bc755..c1b11ebfaa58 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -475,7 +475,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
default:
OSL_FAIL( "unhandled NSApplicationDefined event" );
break;
- };
+ }
}
bool AquaSalInstance::RunInMainYield( bool bHandleAllCurrentEvents )
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 15630fe70503..cb6f6d5f0087 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -723,12 +723,12 @@ public:
virtual void set_stack_background() override
{
- set_background(m_xWidget->GetSettings().GetStyleSettings().GetWindowColor());;
+ set_background(m_xWidget->GetSettings().GetStyleSettings().GetWindowColor());
}
virtual void set_highlight_background() override
{
- set_background(m_xWidget->GetSettings().GetStyleSettings().GetHighlightColor());;
+ set_background(m_xWidget->GetSettings().GetStyleSettings().GetHighlightColor());
}
SystemWindow* getSystemWindow()
@@ -1033,7 +1033,7 @@ public:
auto aPopup = m_aMenus.find(nItemId);
if (aPopup != m_aMenus.end())
{
- return PopupMenu::GetActivePopupMenu() == aPopup->second;;
+ return PopupMenu::GetActivePopupMenu() == aPopup->second;
}
return false;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index cf8a9c98bcb0..f295c634543c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -950,7 +950,7 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void )
nEvent = SalEvent::NONE;
pEventData = nullptr;
break;
- };
+ }
if( pData->mpWin && pData->mpWin->mpWindowImpl->mpFrameWindow.get() && pEventData )
ImplWindowFrameProc( pData->mpWin->mpWindowImpl->mpFrameWindow.get(), nEvent, pEventData );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 4525eb630613..34b92941a587 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1536,7 +1536,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
bGoEnd = true;break;
default:
break;
- };
+ }
// range is checked in ImplSetSelection ...
if ( bGoLeft && aSel.Max() )
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8211c6069c78..63cbe782d435 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -4251,7 +4251,7 @@ void VclBuilder::set_response(const OString& sID, short nResponse)
default:
assert(nResponse >= 100 && "keep non-canned responses in range 100+ to avoid collision with vcl RET_*");
break;
- };
+ }
for (const auto & child : m_aChildren)
{
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9f4a33456a4e..4b0d02493448 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3786,7 +3786,7 @@ bool ToolBox::EventNotify( NotifyEvent& rNEvt )
}
default:
break;
- };
+ }
}
else if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 6fb3911f9aee..96f2bdc0e253 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -771,7 +771,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
case PPDKey::SetupType::JCLSetup: pSetupType = "JCLSetup";break;
case PPDKey::SetupType::AnySetup: pSetupType = "AnySetup";break;
default: break;
- };
+ }
SAL_INFO("vcl.unx.print", "\t\"" << pKey->getKey() << "\" ("
<< pKey->countValues() << "values) OrderDependency: "
<< pKey->m_nOrderDependency << pSetupType );
@@ -787,7 +787,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
case eSymbol: pVType = "symbol";break;
case eNo: pVType = "no";break;
default: break;
- };
+ }
SAL_INFO("vcl.unx.print", "\t\t"
<< (pValue == pKey->m_pDefaultValue ? "(Default:) " : "")
<< "option: \"" << pValue->m_aOption
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index a830b5783116..f96737efd082 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -201,7 +201,7 @@ TablePropertyMapPtr CellColorHandler::getProperties()
case NS_ooxml::LN_Value_ST_Shd_pct85: nWW8BrushStyle = 850; break;
case NS_ooxml::LN_Value_ST_Shd_pct87: nWW8BrushStyle = 875; break;
case NS_ooxml::LN_Value_ST_Shd_pct95: nWW8BrushStyle = 950; break;
- };
+ }
sal_Int32 nApplyColor = 0;
if( !nWW8BrushStyle )
@@ -270,7 +270,7 @@ TablePropertyMapPtr CellColorHandler::getProperties()
case NS_ooxml::LN_Value_ST_Shd_pct85: nShadingPattern = drawing::ShadingPattern::PCT85; break;
case NS_ooxml::LN_Value_ST_Shd_pct87: nShadingPattern = drawing::ShadingPattern::PCT87; break;
case NS_ooxml::LN_Value_ST_Shd_pct95: nShadingPattern = drawing::ShadingPattern::PCT95; break;
- };
+ }
// Write the shading pattern property
pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( nShadingPattern ));
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 2ae01bdeb742..339727689782 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -100,7 +100,7 @@ namespace dmapper {
case NS_ooxml::LN_CT_TrPr_del:
nToken = XML_tableRowDelete;
break;
- };
+ }
std::shared_ptr<TrackChangesHandler> pTrackChangesHandler( new TrackChangesHandler( nToken ) );
pProperties->resolve(*pTrackChangesHandler);
TablePropertyMapPtr pPropMap( new TablePropertyMap );
@@ -131,7 +131,7 @@ namespace dmapper {
default:
throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0);
break;
- };
+ }
std::shared_ptr<TrackChangesHandler> pTrackChangesHandler( new TrackChangesHandler( nToken ) );
pProperties->resolve(*pTrackChangesHandler);
TablePropertyMapPtr pPropMap( new TablePropertyMap );
@@ -160,7 +160,7 @@ namespace dmapper {
case NS_ooxml::LN_Value_ST_VerticalJc_center: nVertOrient = text::VertOrientation::CENTER; break;
case NS_ooxml::LN_Value_ST_VerticalJc_bottom: nVertOrient = text::VertOrientation::BOTTOM; break;
default:;
- };
+ }
TablePropertyMapPtr pCellPropMap( new TablePropertyMap() );
pCellPropMap->Insert( PROP_VERT_ORIENT, uno::makeAny( nVertOrient ) );
//todo: in ooxml import the value of m_ncell is wrong
@@ -174,7 +174,7 @@ namespace dmapper {
case NS_ooxml::LN_Value_ST_VerticalJc_center: aVertOrient = "center"; break;
case NS_ooxml::LN_Value_ST_VerticalJc_both: aVertOrient = "both"; break;
case NS_ooxml::LN_Value_ST_VerticalJc_bottom: aVertOrient = "bottom"; break;
- };
+ }
if (!aVertOrient.isEmpty())
{
beans::PropertyValue aValue;
More information about the Libreoffice-commits
mailing list