chart2/source/view/charttypes/PieChart.cxx | 2 +- chart2/source/view/main/ChartView.cxx | 2 +- comphelper/source/container/embeddedobjectcontainer.cxx | 2 +- cppcanvas/source/mtfrenderer/emfplus.cxx | 9 ++++++++- desktop/source/deployment/registry/package/dp_package.cxx | 2 +- sd/source/ui/dlg/RemoteDialog.cxx | 5 ++++- sfx2/source/control/templatelocalview.cxx | 2 +- sfx2/source/control/templateremoteview.cxx | 2 +- sfx2/source/doc/zoomitem.cxx | 1 - svx/source/svdraw/svdobj.cxx | 2 +- vbahelper/source/vbahelper/vbacommandbars.cxx | 1 - 11 files changed, 19 insertions(+), 11 deletions(-)
New commits: commit 0d6ccbc6530ba6eeb9530352708a116bca966cc0 Author: Stephan Bergmann <[email protected]> Date: Wed Dec 5 15:46:28 2012 +0100 warning C4702: unreachable code Change-Id: I93b5a0c938b8c0bdf69a03aea0f1aa6bac9fc414 (cherry picked from commit dfd474710f959dcf78038deb990c3618b467ec67) Signed-off-by: Michael Stahl <[email protected]> diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index f9cff1b..2765eb2 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -63,9 +63,12 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) return CloseHdl( 0 ); } else + { return 1; + } +#else + return 0; #endif - return 0; } IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) commit 585cc4b74190f6b5c260a07ffb8ebd6979308779 Author: Michael Stahl <[email protected]> Date: Sun Apr 7 22:55:33 2013 +0200 warning C4702: unreachable code Change-Id: Id08a2e295d340095651daa1161efd7603947254a (cherry picked from commit 0083dd24eb50e9305808c5edaf61dbc97fb2367b) Signed-off-by: Michael Stahl <[email protected]> diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index a1515fb..1f73a99 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -73,7 +73,6 @@ public: } else throw container::NoSuchElementException(); - return uno::Any(); } }; commit 75ecb390ceaead08828ddc05a2f6fdd8b6bb3b33 Author: Michael Stahl <[email protected]> Date: Thu Mar 14 17:15:11 2013 +0100 warning C4101: unreferenced local variable Change-Id: I43a0a1dbe37eb76a3d89ace8222cd5f5e3357579 (cherry picked from commit 51a18f9bbd0191936e5137f9fe86161e7d87c8da) Signed-off-by: Michael Stahl <[email protected]> diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 916199e..931b1d4 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -349,7 +349,7 @@ void PieChart::createShapes() uno::Any aAny = xPropertySet->getPropertyValue( C2U("3DRelativeHeight") ); aAny >>= n3DRelativeHeight; } - catch(const uno::Exception& e) {} + catch (const uno::Exception&) { } } //============================================================================= commit 6ae7185e030ca8f025d95665818c9e2b59274a0c Author: Michael Stahl <[email protected]> Date: Thu Mar 14 16:31:18 2013 +0100 warning C4101: unreferenced local variable Change-Id: I61fb72e824a43d28756edfff7a6655443fe2ee82 (cherry picked from commit 6d2f041a6569671a98f42272b1798171af211c75) Signed-off-by: Michael Stahl <[email protected]> diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 82ca2d9..fbd6009 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -683,7 +683,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( if (n3DRelativeHeightOldValue != n3DRelativeHeight) xPropertySet->setPropertyValue( C2U("3DRelativeHeight"), uno::makeAny(n3DRelativeHeight) ); } - catch(const uno::Exception& e){} + catch (const uno::Exception&) { } } } commit 74c64de09c6fd2d476e8601b646e69f502834083 Author: Tor Lillqvist <[email protected]> Date: Fri May 24 20:10:58 2013 +0300 WaE: 'static_cast' : truncation of constant value Change-Id: Icbb624b1441330406c0930aa6f1f15ffc9b138b8 (cherry picked from commit f55c6464fb9ee3ff8c011e815e0b75162ebea3fd) Signed-off-by: Michael Stahl <[email protected]> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index e0efb3c..c151f9f 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -498,7 +498,7 @@ SdrObject::~SdrObject() mpViewContact = 0L; } - mnLayerID = static_cast<SdrLayerID>(0xdead); + mnLayerID = 59; // random value } void SdrObject::Free( SdrObject*& _rpObject ) commit 7c44e3469ebac56fdab379df26b1ceaf29a9d959 Author: Stephan Bergmann <[email protected]> Date: Thu Apr 18 16:30:22 2013 +0200 warning C4702: unreachable code Change-Id: Ica48a91c0b8b55c984e59dbe9771d604bc77cdaf (cherry picked from commit 5a274ac7e0f12829cc0264df7a1f9cc4df776e77) Signed-off-by: Michael Stahl <[email protected]> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 7849e59..ee28560 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -210,7 +210,6 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMem OSL_FAIL("sfx2::SvxZoomItem::PutValue(), Wrong MemberId!"); return false; } - return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 6e29b200a7f8c6b3652bc57ea0aa5232640f1d4f Author: Stephan Bergmann <[email protected]> Date: Wed Mar 27 13:43:35 2013 +0100 MSC fixes Change-Id: I5ea1e75a637e8f4fc51ff31321213267669f8bc9 (cherry picked from commit f5442623090dd535a1a561f1ecfdb09f2dff129b) Signed-off-by: Michael Stahl <[email protected]> diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index f1a3421..97caa9d 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -487,7 +487,7 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s sal_uInt16 nTargetIdx = mpDocTemplates->GetCount(nTargetRegion); // Next Idx std::vector<sal_uInt16> aItemIds; // List of moved items ids (also prevents the invalidation of rItems iterators when we remove them as we go) - std::set<const ThumbnailViewItem*,selection_cmp_fn>::iterator aSelIter; + std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator aSelIter; for ( aSelIter = rItems.begin(); aSelIter != rItems.end(); ++aSelIter, ++nTargetIdx ) { const TemplateViewItem *pViewItem = static_cast<const TemplateViewItem*>(*aSelIter); diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 3fc85a7..cbf5f10 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -62,7 +62,7 @@ void TemplateRemoteView::showRootRegion() //TODO: } -void TemplateRemoteView::showRegion(ThumbnailViewItem */*pItem*/) +void TemplateRemoteView::showRegion(ThumbnailViewItem * /*pItem*/) { //TODO: } commit 8334231910df9666d1f156c798108894df572765 Author: Tor Lillqvist <[email protected]> Date: Tue Mar 19 10:43:45 2013 +0200 WaE: Potentially uninitialized local variable (cherry picked from commit fe8eba5faa59ddf9ee82f3eb009daac72a0ec846) Conflicts: cppcanvas/source/mtfrenderer/emfplus.cxx Change-Id: I497c30dfd951132fe2f7998a158b6c14efe5ebf7 diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 81f7eb7..4282c47 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1334,7 +1334,14 @@ namespace cppcanvas case EmfPlusRecordTypeDrawEllipse: case EmfPlusRecordTypeFillEllipse: { - sal_uInt32 brushIndexOrColor; + // Intentionally very bogus initial value + // to avoid MSVC complaining about + // potentially uninitialized local + // variable. As long as the code stays as + // intended, this variable will be + // assigned a (real) value in the case + // when it is later used. + sal_uInt32 brushIndexOrColor = 1234567; if ( type == EmfPlusRecordTypeFillEllipse ) rMF >> brushIndexOrColor; commit ac6ff2f372b89ac8842d7e96ff243d61fafb5aec Author: Stephan Bergmann <[email protected]> Date: Thu Dec 20 10:02:29 2012 +0100 Spurious leftover from debugging experiments Change-Id: I538468b606cc29fd56362dbeb99c2698efac0f58 (cherry picked from commit 4882b97393288d903d9dc8a33a9a9b2fc26aa85a) Signed-off-by: Michael Stahl <[email protected]> diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index e2cdfad..1762986 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -866,7 +866,7 @@ void BackendImpl::PackageImpl::processPackage_( try { xPackage->registerPackage( startup, xSubAbortChannel, xCmdEnv ); } - catch (const Exception & e) + catch (const Exception &) { //We even try a rollback if the user cancelled the action (CommandAbortedException) //in order to prevent invalid database entries. commit 7f6fbbba615c6278b87af62e11c5a34cb9a694e6 Author: Tor Lillqvist <[email protected]> Date: Fri Apr 26 16:57:08 2013 +0300 WaE: 'e' : unreferenced local variable Change-Id: I06319bf6607ecc25a768f85de3ec142388bfa572 (cherry picked from commit 008b5c6ae6efd51b1e40a2efb41e49645b1d8ad0) Signed-off-by: Michael Stahl <[email protected]> diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 935bf33..310c363 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -1419,7 +1419,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo { xPersist->storeAsEntry( _xStorage, xPersist->getEntryName(), uno::Sequence< beans::PropertyValue >(), aArgs ); } - catch (const embed::WrongStateException& e) + catch (const embed::WrongStateException&) { SAL_WARN("comphelper", "failed to store '" << *pIter << "'"); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
