[Libreoffice-commits] core.git: canvas/source drawinglayer/source framework/source include/basegfx include/comphelper sd/source svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 31 12:05:49 UTC 2017
canvas/source/opengl/ogl_canvascustomsprite.cxx | 8 --------
canvas/source/opengl/ogl_canvashelper.cxx | 1 -
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 2 --
framework/source/jobs/helponstartup.cxx | 1 -
include/basegfx/matrix/b2dhommatrix.hxx | 2 +-
include/basegfx/polygon/b2dpolygon.hxx | 2 +-
include/basegfx/range/b2drange.hxx | 2 +-
include/basegfx/range/b3drange.hxx | 2 +-
include/basegfx/vector/b3dvector.hxx | 2 +-
include/comphelper/sequenceashashmap.hxx | 2 +-
sd/source/ui/presenter/PresenterCanvas.cxx | 2 --
svx/source/engine3d/float3d.cxx | 2 --
svx/source/sdr/contact/viewcontactofe3dsphere.cxx | 1 -
13 files changed, 6 insertions(+), 23 deletions(-)
New commits:
commit 0681a6ee2813dd5e8bcf5053cc1f0a2f6b4f8c97
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jan 31 14:04:06 2017 +0200
more SAL_WARN_UNUSED
Change-Id: Idf44fe0302b4504c443f083e527b63b2461ada85
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index d166598..2a794ad 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -195,14 +195,6 @@ namespace oglcanvas
::basegfx::triangulator::triangulate(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(mxClip)));
- basegfx::B2DPolygon rTriangleList(
- basegfx::tools::clipTriangleListOnRange(
- rTriangulatedPolygon,
- basegfx::B2DRange(
- 0,0,
- aSpriteSizePixel.getX(),
- aSpriteSizePixel.getY())));
-
glBegin(GL_TRIANGLES);
for( sal_uInt32 i=0; i<rTriangulatedPolygon.count(); i++ )
{
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index a82e73d..67707bb 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -886,7 +886,6 @@ namespace oglcanvas
// setup overall transform only now. View clip above was
// relative to view transform
- ::basegfx::B2DHomMatrix aTransform;
::canvas::tools::mergeViewAndRenderTransform(o_action.maTransform,
viewState,
renderState);
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 8040594..85caf51 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -602,8 +602,6 @@ namespace drawinglayer
basegfx::B2DRange PolygonStrokeArrowPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
{
- basegfx::B2DRange aRetval;
-
if(getStart().isActive() || getEnd().isActive())
{
// use decomposition when line start/end is used
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 8384ae3..6a0cc10 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -161,7 +161,6 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
{
::comphelper::SequenceAsHashMap lArgs (lArguments);
::comphelper::SequenceAsHashMap lEnvironment = lArgs.getUnpackedValueOrDefault("Environment", css::uno::Sequence< css::beans::NamedValue >());
- ::comphelper::SequenceAsHashMap lJobConfig = lArgs.getUnpackedValueOrDefault("JobConfig", css::uno::Sequence< css::beans::NamedValue >());
// check for right environment.
// If it's not a DocumentEvent, which triggered this job,
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx
index 51479aa..524be07 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -29,7 +29,7 @@ namespace basegfx
class B2DTuple;
class Impl2DHomMatrix;
- class BASEGFX_DLLPUBLIC B2DHomMatrix
+ class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2DHomMatrix
{
public:
typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType;
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index 4e868c1..b4a44e0 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -41,7 +41,7 @@ namespace basegfx
namespace basegfx
{
- class BASEGFX_DLLPUBLIC B2DPolygon
+ class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2DPolygon
{
public:
typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
diff --git a/include/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx
index 4d65879..e664e2c 100644
--- a/include/basegfx/range/b2drange.hxx
+++ b/include/basegfx/range/b2drange.hxx
@@ -50,7 +50,7 @@ namespace basegfx
@see B1DRange
*/
- class B2DRange
+ class SAL_WARN_UNUSED B2DRange
{
public:
typedef double ValueType;
diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index 351dea8..881dce6 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -30,7 +30,7 @@ namespace basegfx
{
class B3DHomMatrix;
- class B3DRange
+ class SAL_WARN_UNUSED B3DRange
{
typedef ::basegfx::BasicRange< double, DoubleTraits > MyBasicRange;
diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx
index 59d7d79..efb37aa 100644
--- a/include/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
@@ -35,7 +35,7 @@ namespace basegfx
@see B3DTuple
*/
- class BASEGFX_DLLPUBLIC B3DVector : public ::basegfx::B3DTuple
+ class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B3DVector : public ::basegfx::B3DTuple
{
public:
/** Create a 3D Vector
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index aaa45fd..d31ae21 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -47,7 +47,7 @@ struct SequenceAsHashMapBase : public std::unordered_map<
{
};
-class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
+class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
{
public:
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 99634cd..a17ee1f6 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -589,8 +589,6 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind
const css::geometry::AffineMatrix2D& rViewTransform,
const awt::Point& rOffset)
{
- ::basegfx::B2DRectangle aClipRectangle;
-
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(mxWindow);
if (!pWindow)
return ::basegfx::B2DRectangle();
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 6791a73..8159a9c 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -937,7 +937,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// Lighting
Color aColor;
- basegfx::B3DVector aVector;
// Light 1 (Color)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_1);
if( eState != SfxItemState::DONTCARE )
@@ -1848,7 +1847,6 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
rAttrs.InvalidateItem(SDRATTR_3DSCENE_FOCAL_LENGTH);
// Lighting
- basegfx::B3DVector aVector;
Color aColor;
const SfxItemSet aLightItemSet(m_pCtlLightPreview->GetSvx3DLightControl().Get3DAttributes());
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index ca2af43..18a818d 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
@@ -47,7 +47,6 @@ namespace sdr
drawinglayer::primitive2d::createNewSdrLineFillShadowAttribute(rItemSet, false));
// get sphere center and size for geometry
- basegfx::B3DRange aSphereRange;
const basegfx::B3DPoint aSpherePosition(GetE3dSphereObj().Center());
const basegfx::B3DVector aSphereSize(GetE3dSphereObj().Size());
basegfx::B3DHomMatrix aWorldTransform;
More information about the Libreoffice-commits
mailing list