[Libreoffice-commits] .: 2 commits - svx/inc
David Tardon
dtardon at kemper.freedesktop.org
Thu Feb 17 00:36:39 PST 2011
svx/inc/svx/xtable.hxx | 39 ++++++++++++---------------------------
1 file changed, 12 insertions(+), 27 deletions(-)
New commits:
commit 3d77416018239f994b6d2bba59ac1b4adb855754
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 17 09:32:52 2011 +0100
one-param ctors should be explicit
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 752d4fa..053bf13 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -297,7 +297,7 @@ public:
class SVX_DLLPUBLIC XColorTable : public XPropertyTable
{
public:
- XColorTable( const String& rPath,
+ explicit XColorTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -326,7 +326,7 @@ public:
class XColorList : public XPropertyList
{
public:
- XColorList( const String& rPath,
+ explicit XColorList( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -353,7 +353,7 @@ public:
class XLineEndTable : public XPropertyTable
{
public:
- XLineEndTable( const String& rPath,
+ explicit XLineEndTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -387,7 +387,7 @@ private:
void impDestroy();
public:
- XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+ explicit XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
virtual ~XLineEndList();
using XPropertyList::Replace;
@@ -411,7 +411,7 @@ public:
class XDashTable : public XPropertyTable
{
public:
- XDashTable( const String& rPath,
+ explicit XDashTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -445,7 +445,7 @@ private:
void impDestroy();
public:
- XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+ explicit XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
virtual ~XDashList();
using XPropertyList::Replace;
@@ -469,7 +469,7 @@ public:
class XHatchTable : public XPropertyTable
{
public:
- XHatchTable( const String& rPath,
+ explicit XHatchTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -503,7 +503,7 @@ private:
void impDestroy();
public:
- XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+ explicit XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
~XHatchList();
using XPropertyList::Replace;
@@ -527,7 +527,7 @@ public:
class XGradientTable : public XPropertyTable
{
public:
- XGradientTable( const String& rPath,
+ explicit XGradientTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -561,7 +561,7 @@ private:
void impDestroy();
public:
- XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+ explicit XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
virtual ~XGradientList();
using XPropertyList::Replace;
@@ -585,7 +585,7 @@ public:
class XBitmapTable : public XPropertyTable
{
public:
- XBitmapTable( const String& rPath,
+ explicit XBitmapTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
@@ -612,7 +612,7 @@ public:
class SVX_DLLPUBLIC XBitmapList : public XPropertyList
{
public:
- XBitmapList( const String& rPath,
+ explicit XBitmapList( const String& rPath,
XOutdevItemPool* pXPool = NULL,
USHORT nInitSize = 16,
USHORT nReSize = 16 );
commit 32748a9fc88e70757eec1fd8af22d6b4777d33f7
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 17 09:27:20 2011 +0100
no need for explicit copy ctor
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 1cce2de..752d4fa 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -90,8 +90,6 @@ class XColorEntry : public XPropertyEntry
public:
XColorEntry(const Color& rColor, const String& rName) :
XPropertyEntry(rName), aColor(rColor) {}
- XColorEntry(const XColorEntry& rOther) :
- XPropertyEntry(rOther), aColor(rOther.aColor) {}
void SetColor(const Color& rColor) { aColor = rColor; }
Color& GetColor() { return aColor; }
@@ -111,11 +109,6 @@ public:
aB2DPolyPolygon(rB2DPolyPolygon)
{}
- XLineEndEntry(const XLineEndEntry& rOther)
- : XPropertyEntry(rOther),
- aB2DPolyPolygon(rOther.aB2DPolyPolygon)
- {}
-
void SetLineEnd(const basegfx::B2DPolyPolygon& rB2DPolyPolygon)
{
aB2DPolyPolygon = rB2DPolyPolygon;
@@ -138,8 +131,6 @@ class XDashEntry : public XPropertyEntry
public:
XDashEntry(const XDash& rDash, const String& rName) :
XPropertyEntry(rName), aDash(rDash) {}
- XDashEntry(const XDashEntry& rOther) :
- XPropertyEntry(rOther), aDash(rOther.aDash) {}
void SetDash(const XDash& rDash) { aDash = rDash; }
XDash& GetDash() { return aDash; }
@@ -156,8 +147,6 @@ class XHatchEntry : public XPropertyEntry
public:
XHatchEntry(const XHatch& rHatch, const String& rName) :
XPropertyEntry(rName), aHatch(rHatch) {}
- XHatchEntry(const XHatchEntry& rOther) :
- XPropertyEntry(rOther), aHatch(rOther.aHatch) {}
void SetHatch(const XHatch& rHatch) { aHatch = rHatch; }
XHatch& GetHatch() { return aHatch; }
@@ -174,8 +163,6 @@ class XGradientEntry : public XPropertyEntry
public:
XGradientEntry(const XGradient& rGradient, const String& rName):
XPropertyEntry(rName), aGradient(rGradient) {}
- XGradientEntry(const XGradientEntry& rOther) :
- XPropertyEntry(rOther), aGradient(rOther.aGradient) {}
void SetGradient(const XGradient& rGrad) { aGradient = rGrad; }
XGradient& GetGradient() { return aGradient; }
@@ -192,8 +179,6 @@ class XBitmapEntry : public XPropertyEntry
public:
XBitmapEntry( const XOBitmap& rXOBitmap, const String& rName ):
XPropertyEntry( rName ), aXOBitmap( rXOBitmap ) {}
- XBitmapEntry( const XBitmapEntry& rOther ) :
- XPropertyEntry( rOther ), aXOBitmap( rOther.aXOBitmap ) {}
void SetXBitmap(const XOBitmap& rXOBitmap) { aXOBitmap = rXOBitmap; }
XOBitmap& GetXBitmap() { return aXOBitmap; }
More information about the Libreoffice-commits
mailing list