[Libreoffice-commits] core.git: 2 commits - include/svx sw/source
Caolán McNamara
caolanm at redhat.com
Fri Apr 17 04:36:36 PDT 2015
include/svx/e3ditem.hxx | 2 +-
include/svx/e3dsceneupdater.hxx | 2 +-
include/svx/e3dundo.hxx | 6 +++---
include/svx/extedit.hxx | 4 ++--
include/svx/extrud3d.hxx | 2 +-
include/svx/extrusionbar.hxx | 2 +-
sw/source/filter/ww8/WW8TableInfo.hxx | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 06a9243ff34f0666141c9eabb322a2eedb4c331a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 17 12:16:17 2015 +0100
it has always been the case that RowSpans are signed
we just get away with this because we cast it to signed before use in
ww8
Change-Id: I646ea3a0eb84923dd9835f18356d67f4f72ba18d
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 34d56b3..ab5ff6c 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -44,7 +44,7 @@ typedef ::std::vector<const SwTableBox *> TableBoxVector;
typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
typedef ::std::vector<sal_uInt32> GridCols;
typedef boost::shared_ptr<GridCols> GridColsPtr;
-typedef ::std::vector<sal_uInt32> RowSpans;
+typedef ::std::vector<sal_Int32> RowSpans;
typedef boost::shared_ptr<RowSpans> RowSpansPtr;
typedef ::std::vector<sal_uInt32> Widths;
typedef boost::shared_ptr<Widths> WidthsPtr;
commit 350f11a8bd089698e004e0f288417108131ce74e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 16 09:44:09 2015 +0100
add some SAL_WARN_UNUSED
Change-Id: I41ba1bed4f49a122a15213edf41e094254bfb282
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 6b4c8ff..15dd162 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -26,7 +26,7 @@
class SvStream;
-class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxB3DVectorItem : public SfxPoolItem
{
basegfx::B3DVector aVal;
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index 54e5dcc..3208eb8 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer { namespace geometry {
// 3D content and tu use it. This is only wanted if changes to the scene's
// content are intended to change the scene's 2D geometry attributes
-class SVX_DLLPUBLIC E3DModifySceneSnapRectUpdater
+class SVX_DLLPUBLIC SAL_WARN_UNUSED E3DModifySceneSnapRectUpdater
{
// the scene which may be changed. This gets set to the outmost scene
// of the to-be-changed 3D object when the scene has a 3d transformation
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 40a22fa..29e2eb5 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -29,7 +29,7 @@
|* Base class for all 3D undo actions.
|*
\************************************************************************/
-class E3dUndoAction : public SdrUndoAction
+class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction
{
protected :
@@ -54,7 +54,7 @@ class E3dUndoAction : public SdrUndoAction
|* Undo for 3D rotation through the rotation matrices
|*
\************************************************************************/
-class E3dRotateUndoAction : public E3dUndoAction
+class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction
{
basegfx::B3DHomMatrix aMyOldRotation;
basegfx::B3DHomMatrix aMyNewRotation;
@@ -83,7 +83,7 @@ class E3dRotateUndoAction : public E3dUndoAction
|* Undo for 3D attributes (implemented using Set3DAttributes())
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
+class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dAttributesUndoAction : public SdrUndoAction
{
using SdrUndoAction::Repeat;
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index 65e178d..ab3e4cf 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -19,7 +19,7 @@ class Graphic;
class GraphicObject;
class FileChangedChecker;
-class SVX_DLLPUBLIC ExternalToolEdit
+class SVX_DLLPUBLIC SAL_WARN_UNUSED ExternalToolEdit
{
protected:
OUString m_aFileName;
@@ -42,7 +42,7 @@ public:
class FmFormView;
class SdrObject;
-class SVX_DLLPUBLIC SdrExternalToolEdit
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SdrExternalToolEdit
: public ExternalToolEdit
, public SfxListener
{
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index cdade62..3982014 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -29,7 +29,7 @@
|*
\************************************************************************/
-class SVX_DLLPUBLIC E3dExtrudeObj : public E3dCompoundObject
+class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dExtrudeObj : public E3dCompoundObject
{
private:
// to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 921c1a2..9a42d6c 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -35,7 +35,7 @@ namespace svx
SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded );
-class SVX_DLLPUBLIC ExtrusionBar : public SfxShell
+class SVX_DLLPUBLIC SAL_WARN_UNUSED ExtrusionBar : public SfxShell
{
public:
TYPEINFO_OVERRIDE();
More information about the Libreoffice-commits
mailing list