[Libreoffice-commits] .: 11 commits - basegfx/inc basegfx/source desktop/unx drawinglayer/inc drawinglayer/source extensions/source hwpfilter/source Module_tail_build.mk postprocess/prj sal/osl slideshow/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Jul 3 08:49:27 PDT 2012
Module_tail_build.mk | 5 ++++-
basegfx/inc/basegfx/color/bcolor.hxx | 2 +-
basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 2 +-
basegfx/inc/basegfx/point/b2dpoint.hxx | 2 +-
basegfx/inc/basegfx/range/basicbox.hxx | 2 +-
basegfx/inc/basegfx/range/basicrange.hxx | 2 +-
basegfx/inc/basegfx/vector/b2dvector.hxx | 2 +-
basegfx/source/inc/hommatrixtemplate.hxx | 2 +-
basegfx/source/polygon/b2dpolygontriangulator.cxx | 2 +-
basegfx/source/polygon/b2dpolypolygon.cxx | 2 +-
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4 ++--
basegfx/source/polygon/b2dtrapezoid.cxx | 2 +-
basegfx/source/polygon/b3dpolypolygon.cxx | 2 +-
basegfx/source/range/b2drange.cxx | 4 ++--
desktop/unx/source/start.c | 2 +-
drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx | 2 +-
drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx | 2 +-
drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx | 2 +-
drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 10 +++++-----
drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx | 2 +-
drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx | 2 +-
drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx | 2 +-
drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx | 2 +-
drawinglayer/source/attribute/sdrlineattribute.cxx | 2 +-
drawinglayer/source/geometry/viewinformation2d.cxx | 2 +-
drawinglayer/source/geometry/viewinformation3d.cxx | 2 +-
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2 +-
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +-
drawinglayer/source/primitive3d/baseprimitive3d.cxx | 2 +-
extensions/source/nsplugin/source/so_env.cxx | 5 +++--
hwpfilter/source/hcode.cxx | 2 +-
postprocess/prj/build.lst | 2 +-
sal/osl/unx/pipe.c | 6 +++---
sal/osl/unx/util.c | 3 +++
slideshow/source/engine/slide/slideimpl.cxx | 6 +++---
slideshow/source/engine/slideshowimpl.cxx | 4 ++--
slideshow/source/engine/transitions/slidechangebase.cxx | 10 +++++-----
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 6 +++---
48 files changed, 72 insertions(+), 65 deletions(-)
New commits:
commit 3425a9777f6d06d4ef1c6d1f0883dc2254dff295
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 12:21:33 2012 +0200
move testtools to tail_build
Change-Id: I7dfd5b1f059f7f254a28d2d627365a0b650e33d1
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 61d0f89..533dd24 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
sw \
swext \
test \
+ testtools \
toolkit \
tools \
touch \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 36a375a..8038e87 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk MORE_FONTS:more_fonts DICTIONARIES:dictionaries LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
commit db2bfb53bd1e1dc71f38576951a1aa3576a9aa3d
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 12:21:03 2012 +0200
pyuno is in tail_build
Change-Id: I00c34b552aa1773c21accd9a22a13969e993e2d4
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index a967514..36a375a 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
commit d2bd6c90c4249530f196710f876034794577b697
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 12:20:49 2012 +0200
only build pyuno when configuration says so
Change-Id: Ic20057a1874a6ca959304423688d6ce2d13a5829
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index f6b9a9d..61d0f89 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -78,7 +78,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
package \
padmin \
psprint_config \
- pyuno \
+ $(if $(filter PYUNO,$(BUILD_TYPE)),\
+ pyuno \
+ ) \
$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
qadevOOo \
) \
commit 0b379def831a0caf3641f0a4e125dd697c00c8e9
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 11:33:26 2012 +0200
coverity: protect against buffer overflow
Change-Id: I467e328ddb4786996ea81cdce2b76498fe8f1c61
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index a04b873..9dac248 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -256,7 +256,7 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch
/* .. now in $HOME */
#endif // LINUX
- sprintf(lnkFileName, "%s/.mozilla/plugins/libnpsoplugin%s", getenv("HOME"), SAL_DLLEXTENSION);
+ snprintf(lnkFileName, NPP_PATH_MAX - 1, "%s/.mozilla/plugins/libnpsoplugin%s", getenv("HOME"), SAL_DLLEXTENSION);
#ifdef LINUX
ssize_t len = readlink(lnkFileName, realFileName, NPP_PATH_MAX-1);
if (-1 == len)
commit 38b39d3f86ac5b3afae7de3b3246544ee7412973
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 11:31:21 2012 +0200
coverity: protect against buffer overflow
Change-Id: Id3b47712ee1457bda5313a0665a9bb34db035cb0
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index 7411e7f..d402575 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -130,6 +130,9 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
struct ifreq ifr;
int so = socket(AF_INET, SOCK_DGRAM, 0);
+ if (strlen(ifname) >= sizeof(ifr.ifr_name))
+ return 0;
+
strcpy(ifr.ifr_name, ifname);
/*
commit ac45c9867a7ccd6f4df9c981b617249c6537b86f
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 11:24:38 2012 +0200
coverity: protect against buffer overflow
Change-Id: Ibf56341b2e52d341ba06708c232947db5191a486
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index 37d8ee3..a04b873 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -431,7 +431,8 @@ char* NSP_getProductName()
(NULL == (pEnd = strchr( pStart, '\r' ))))
continue;
*pEnd = 0;
- strcpy(productName, pStart);
+ if (static_cast<size_t>(pEnd - pStart) <= sizeof(productName))
+ strcpy(productName, pStart);
}
fclose(fp);
if ((*productName == 0) ||
commit 2d58399e50395ed2b045f45986554c9914a696a9
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 10:45:22 2012 +0200
coverity: idx == 0x1F cannot be true
Change-Id: I6b0cf900003beb9931d6acad229166e44cc7f0bc
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index cc75797..a9e9eba 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -426,7 +426,7 @@ static hchar s_hh2ks(hchar hh)
}
return (idx << 8) | (i + 160);
}
- if ((idx == 0x1F && (hh & 0xff) >= 0xC0) || (hh == 0x1F00))
+ if (((hh & 0xff) >= 0xC0) || (hh == 0x1F00))
return 0;
if (idx < 0x34 || idx >= 0x38)
return 0x2020;
commit 0fa47c8614dd4e76a91e78cf35aed44396e893ed
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 10:38:05 2012 +0200
coverity: ensure the string is null-terminated
Change-Id: Iaaa0e60ca99e2beef7c70d38343917c4549d1eea
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d1a09a7..2ecb779 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -386,7 +386,7 @@ connect_pipe( rtl_uString *pPipePath )
fcntl( fd, F_SETFD, FD_CLOEXEC );
addr.sun_family = AF_UNIX;
- strncpy( addr.sun_path, rtl_string_getStr( pPipeStr ), sizeof( addr.sun_path ) );
+ strncpy( addr.sun_path, rtl_string_getStr( pPipeStr ), sizeof( addr.sun_path ) - 1 );
rtl_string_release( pPipeStr );
/* cut / paste from osl's pipe.c */
commit aea8838e25a72b08e9b79cf9876719f1941fe3cb
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 10:35:47 2012 +0200
coverity: ensure the string is null-terminated
Change-Id: I88040319f931598ca4fa17e440e0dba214109dfa
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index fd472fa..48b3f38 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -279,7 +279,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
OSL_TRACE("osl_createPipe : Pipe Name '%s'",name);
addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, name, sizeof(addr.sun_path));
+ strncpy(addr.sun_path, name, sizeof(addr.sun_path) - 1);
#if defined(FREEBSD)
len = SUN_LEN(&addr);
#else
@@ -321,7 +321,7 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions
chmod(name,S_IRWXU | S_IRWXG |S_IRWXO);
- strncpy(pPipe->m_Name, name, sizeof(pPipe->m_Name));
+ strncpy(pPipe->m_Name, name, sizeof(pPipe->m_Name) - 1);
if ( listen(pPipe->m_Socket, 5) < 0 )
{
@@ -409,7 +409,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
OSL_TRACE("osl_destroyPipe : Pipe Name '%s'",pPipe->m_Name);
addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
+ strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path) - 1);
len = sizeof(addr);
nRet = connect( fd, (struct sockaddr *)&addr, len);
commit 9bd1acd164a9f8f4188ca06527ccc0fece7d0c19
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 3 08:53:24 2012 +0200
sprinkle explicit over constructors
Change-Id: I6599147a74e5c99f964b08935ec7c77f2d4cadef
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx
index 1a1c6ea..4527310 100644
--- a/basegfx/inc/basegfx/color/bcolor.hxx
+++ b/basegfx/inc/basegfx/color/bcolor.hxx
@@ -81,7 +81,7 @@ namespace basegfx
@param fLuminosity
The parameter is used to initialize the red, green and blue intensities of the color
*/
- BColor(double fLuminosity)
+ explicit BColor(double fLuminosity)
: B3DTuple(fLuminosity, fLuminosity, fLuminosity)
{}
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 821cc33..a6eda0a 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -52,7 +52,7 @@ namespace basegfx
sal_uInt32 mnEdgeCount;
public:
- B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
+ explicit B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
double getLength() const { if(!maLengthArray.empty()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
index c5b69b8..9c8056a 100644
--- a/basegfx/inc/basegfx/point/b2dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dpoint.hxx
@@ -87,7 +87,7 @@ namespace basegfx
@param rPoint
The 2D Point which will be copied.
*/
- B2DPoint(const ::basegfx::B2IPoint& rPoint)
+ explicit B2DPoint(const ::basegfx::B2IPoint& rPoint)
: B2DTuple(rPoint)
{}
diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx
index 8e2e0ef..4b000b5 100644
--- a/basegfx/inc/basegfx/range/basicbox.hxx
+++ b/basegfx/inc/basegfx/range/basicbox.hxx
@@ -47,7 +47,7 @@ namespace basegfx
public:
BasicBox() {}
- BasicBox( sal_Int32 nValue ) :
+ explicit BasicBox( sal_Int32 nValue ) :
Base( nValue )
{
}
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index daf552f..d9fded6 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -52,7 +52,7 @@ namespace basegfx
{
}
- BasicRange( T nValue ) :
+ explicit BasicRange( T nValue ) :
mnMinimum(nValue),
mnMaximum(nValue)
{
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
index 109f646..4c003eb 100644
--- a/basegfx/inc/basegfx/vector/b2dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b2dvector.hxx
@@ -86,7 +86,7 @@ namespace basegfx
@param rVec
The 2D Vector which will be copied.
*/
- B2DVector(const ::basegfx::B2IVector& rVec)
+ explicit B2DVector(const ::basegfx::B2IVector& rVec)
: B2DTuple(rVec)
{}
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index d1e461f..6342677 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -48,7 +48,7 @@ namespace basegfx
{
}
- ImplMatLine(sal_uInt16 nRow, ImplMatLine< RowSize >* pToBeCopied = 0L)
+ explicit ImplMatLine(sal_uInt16 nRow, ImplMatLine< RowSize >* pToBeCopied = 0L)
{
if(pToBeCopied)
{
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 121211d..d2e6ef0 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -138,7 +138,7 @@ namespace basegfx
void createTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC);
public:
- Triangulator(const B2DPolyPolygon& rCandidate);
+ explicit Triangulator(const B2DPolyPolygon& rCandidate);
~Triangulator();
const B2DPolygon getResult() const { return maResult; }
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 3ec0ed8..02dce17 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -50,7 +50,7 @@ public:
{
}
- ImplB2DPolyPolygon(const basegfx::B2DPolygon& rToBeCopied) :
+ explicit ImplB2DPolyPolygon(const basegfx::B2DPolygon& rToBeCopied) :
maPolygons(1,rToBeCopied)
{
}
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 522bc37..05e555f 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -466,7 +466,7 @@ namespace basegfx
}
public:
- solver(const B2DPolygon& rOriginal)
+ explicit solver(const B2DPolygon& rOriginal)
: maOriginal(B2DPolyPolygon(rOriginal)),
mbIsCurve(false),
mbChanged(false)
@@ -501,7 +501,7 @@ namespace basegfx
}
}
- solver(const B2DPolyPolygon& rOriginal)
+ explicit solver(const B2DPolyPolygon& rOriginal)
: maOriginal(rOriginal),
mbIsCurve(false),
mbChanged(false)
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index fc2a43b..4185f19 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -449,7 +449,7 @@ namespace basegfx
}
public:
- TrapezoidSubdivider(
+ explicit TrapezoidSubdivider(
const B2DPolyPolygon& rSourcePolyPolygon)
: mnInitialEdgeEntryCount(0),
maTrDeEdgeEntries(),
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index f4bcf80..b19a691 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -49,7 +49,7 @@ public:
{
}
- ImplB3DPolyPolygon(const ::basegfx::B3DPolygon& rToBeCopied) :
+ explicit ImplB3DPolyPolygon(const ::basegfx::B3DPolygon& rToBeCopied) :
maPolygons(1,rToBeCopied)
{
}
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index fbdf449..80a8374 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -30,8 +30,8 @@ namespace basegfx
{
if( !rRange.isEmpty() )
{
- maRangeX = rRange.getMinX();
- maRangeY = rRange.getMinY();
+ maRangeX = MyBasicRange(rRange.getMinX());
+ maRangeY = MyBasicRange(rRange.getMinY());
maRangeX.expand(rRange.getMaxX());
maRangeY.expand(rRange.getMaxY());
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index cdc1642..92bdaaf 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -388,7 +388,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra
xComponentContext ),
mrCursorManager( rCursorManager ),
maAnimations( maContext,
- getSlideSizeImpl() ),
+ basegfx::B2DSize( getSlideSizeImpl() ) ),
maPolygons(rPolyPolygonVector),
maUserPaintColor(aUserPaintColor),
mdUserPaintStrokeWidth(dUserPaintStrokeWidth),
@@ -659,7 +659,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
SlideBitmapSharedPtr& rBitmap( aIter->second.at( meAnimationState ));
const ::basegfx::B2ISize& rSlideSize(
- getSlideSizePixel( getSlideSize(),
+ getSlideSizePixel( ::basegfx::B2DSize( getSlideSize() ),
rView ));
// is the bitmap valid (actually existent, and of correct
@@ -1092,7 +1092,7 @@ bool SlideImpl::applyInitialShapeAttributes(
extractValue( bVisible,
rShapeProps[j].Value,
pShape,
- getSlideSize() ))
+ ::basegfx::B2DSize( getSlideSize() ) ))
{
pAttrShape->setVisibility( bVisible );
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 238cee2..8e2ffb4 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -886,7 +886,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
0.0,
0.0,
ShapeSharedPtr(),
- rEnteringSlide->getSlideSize() ),
+ basegfx::B2DSize( rEnteringSlide->getSlideSize() ) ),
pTransition,
true ));
}
@@ -1132,7 +1132,7 @@ void SlideShowImpl::displaySlide(
{
basegfx::B2DSize oldSlideSize;
if( mpPreviousSlide )
- oldSlideSize = mpPreviousSlide->getSlideSize();
+ oldSlideSize = basegfx::B2DSize( mpPreviousSlide->getSlideSize() );
basegfx::B2DSize const slideSize( mpCurrentSlide->getSlideSize() );
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index 41fd445..211616d 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -107,7 +107,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
// create empty, black-filled bitmap
const basegfx::B2ISize slideSizePixel(
- getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
rView ));
cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() );
@@ -151,7 +151,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
::basegfx::B2ISize SlideChangeBase::getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const
{
- return getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ return getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
pView );
}
@@ -496,7 +496,7 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry )
getLeavingBitmap( rEntry )->getSize() );
rEntry.mpOutSprite = createSprite( rEntry.mpView,
- leavingSlideSizePixel,
+ basegfx::B2DSize( leavingSlideSizePixel ),
100 );
}
@@ -504,11 +504,11 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry )
{
// create entering sprite:
const basegfx::B2ISize enteringSlideSizePixel(
- getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
rEntry.mpView ));
rEntry.mpInSprite = createSprite( rEntry.mpView,
- enteringSlideSizePixel,
+ basegfx::B2DSize( enteringSlideSizePixel ),
101 );
}
}
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index c76527f..a88dbaf 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -369,7 +369,7 @@ void ClippedSlideChange::performIn(
// of the view transformation (e.g. rotation) from the transition.
rSprite->setClipPixel(
maClippingFunctor( t,
- getEnteringSlideSizePixel(rViewEntry.mpView) ) );
+ ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) ) );
}
void ClippedSlideChange::performOut(
@@ -464,7 +464,7 @@ void FadingSlideChange::performOut(
// clear page to given fade color. 'Leaving' slide is
// painted atop of that, but slowly fading out.
fillPage( rDestinationCanvas,
- getEnteringSlideSizePixel( rViewEntry.mpView ),
+ ::basegfx::B2DSize( getEnteringSlideSizePixel( rViewEntry.mpView ) ),
*maFadeColor );
}
@@ -550,7 +550,7 @@ void CutSlideChange::performOut(
// clear page to given fade color. 'Leaving' slide is
// painted atop of that
fillPage( rDestinationCanvas,
- getEnteringSlideSizePixel( rViewEntry.mpView ),
+ ::basegfx::B2DSize( getEnteringSlideSizePixel( rViewEntry.mpView ) ),
maFadeColor );
}
commit fddd006495f0c8584c85ff22ad0041094ea9a8cd
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jul 2 17:52:13 2012 +0200
sprinkle explicit over constructors
Change-Id: I92f7ccb1512362171b524ade0e8c36cbe9d332d5
diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
index f9d7142..5602475 100644
--- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
@@ -57,7 +57,7 @@ namespace drawinglayer
public:
/// constructors/assignmentoperator/destructor
- LineAttribute(
+ explicit LineAttribute(
const basegfx::BColor& rColor,
double fWidth = 0.0,
basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLINEJOIN_ROUND);
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
index d4f5499..637244c 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
@@ -64,7 +64,7 @@ namespace drawinglayer
const basegfx::BColor& rColor,
const basegfx::B3DVector& rDirection,
bool bSpecular);
- Sdr3DLightAttribute(const basegfx::BColor& rColor);
+ explicit Sdr3DLightAttribute(const basegfx::BColor& rColor);
Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate);
~Sdr3DLightAttribute();
diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
index 99e35ce..0fbb5cd 100644
--- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
@@ -54,7 +54,7 @@ namespace drawinglayer
public:
/// constructors/assignmentoperator/destructor
- StrokeAttribute(
+ explicit StrokeAttribute(
const ::std::vector< double >& rDotDashArray,
double fFullDotDashLen = 0.0);
StrokeAttribute();
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
index 0a6b21e..a2b2db5 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
@@ -115,7 +115,7 @@ namespace drawinglayer
other parameters. This constructor is feeded completely with a sequence of PropertyValues
which will be parsed to be able to offer the most used ones in a convenient way.
*/
- ViewInformation2D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
+ explicit ViewInformation2D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
/// default (empty) constructor
ViewInformation2D();
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
index 8364577..9c23ff8 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
@@ -120,7 +120,7 @@ namespace drawinglayer
other parameters. This constructor is feeded completely with a sequence of PropertyValues
which will be parsed to be able to offer the most used ones in a convenient way.
*/
- ViewInformation3D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
+ explicit ViewInformation3D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
/// default (empty) constructor
ViewInformation3D();
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 441abf4..21cc5b6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -67,7 +67,7 @@ namespace drawinglayer
public:
/// constructor
- BackgroundColorPrimitive2D(
+ explicit BackgroundColorPrimitive2D(
const basegfx::BColor& rBColor);
/// data read access
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
index de2e6ae..ea11863 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
@@ -63,7 +63,7 @@ namespace drawinglayer
public:
/// constructor
- DiscreteShadow(const BitmapEx& rBitmapEx);
+ explicit DiscreteShadow(const BitmapEx& rBitmapEx);
/// data read access
const BitmapEx& getBitmapEx() const { return maBitmapEx; }
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
index b2bec3c..920cf5e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -80,7 +80,7 @@ namespace drawinglayer
public:
/// constructor
- GroupPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit GroupPrimitive2D(const Primitive2DSequence& rChildren);
/// data read access
const Primitive2DSequence& getChildren() const { return maChildren; }
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
index 341effd..723b83f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
@@ -52,7 +52,7 @@ namespace drawinglayer
class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D : public GroupPrimitive2D
{
public:
- HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren);
// despite returning an empty decomposition since it's no visualisation data,
// range calculation is intended to use hidden geometry, so
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
index 2ef4a41..a4cf2cf 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer
{
public:
/// constructor
- InvertPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit InvertPrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index bf9ed2c..4157574 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -54,7 +54,7 @@ namespace drawinglayer
private:
public:
/// constructor
- TextHierarchyLinePrimitive2D(const Primitive2DSequence& rChildren);
+ explicit TextHierarchyLinePrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
@@ -77,7 +77,7 @@ namespace drawinglayer
private:
public:
/// constructor
- TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit TextHierarchyBulletPrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
@@ -100,7 +100,7 @@ namespace drawinglayer
private:
public:
/// constructor
- TextHierarchyParagraphPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit TextHierarchyParagraphPrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
@@ -123,7 +123,7 @@ namespace drawinglayer
private:
public:
/// constructor
- TextHierarchyBlockPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit TextHierarchyBlockPrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
@@ -206,7 +206,7 @@ namespace drawinglayer
private:
public:
/// constructor
- TextHierarchyEditPrimitive2D(const Primitive2DSequence& rChildren);
+ explicit TextHierarchyEditPrimitive2D(const Primitive2DSequence& rChildren);
/// provide unique ID
DeclPrimitrive2DIDBlock()
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
index 0c93b42..89a619e 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
@@ -66,7 +66,7 @@ namespace drawinglayer
public:
/// constructor
- GroupPrimitive3D(const Primitive3DSequence& rChildren);
+ explicit GroupPrimitive3D(const Primitive3DSequence& rChildren);
/// data read access
Primitive3DSequence getChildren() const { return maChildren; }
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
index bb9ab4f..828cc3c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
@@ -54,7 +54,7 @@ namespace drawinglayer
class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive3D : public GroupPrimitive3D
{
public:
- HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren);
+ explicit HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren);
// despite returning an empty decomposition since it's no visualisation data,
// range calculation is intended to use hidden geometry, so
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index bf72bef..77c5ad0 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -74,7 +74,7 @@ namespace drawinglayer
maPolyPolygon.transform(aTransform);
}
- Slice3D(
+ explicit Slice3D(
const basegfx::B3DPolyPolygon& rPolyPolygon,
SliceType3D aSliceType = SLICETYPE3D_REGULAR)
: maPolyPolygon(rPolyPolygon),
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index bbe54c0..a5ce3b3 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -186,7 +186,7 @@ namespace drawinglayer
public:
/// constructor/destructor
- BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation);
+ explicit BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation);
virtual ~BaseProcessor2D();
/// the central processing method
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
index e0b95eb..de7a518 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
public:
- ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation);
+ explicit ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation);
virtual ~ContourExtractor2D();
const std::vector< basegfx::B2DPolyPolygon >& getExtractedContour() const { return maExtractedContour; }
diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index 3dbb9d1..1a421ec 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
@@ -91,7 +91,7 @@ namespace drawinglayer
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
public:
- TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation);
+ explicit TextAsPolygonExtractor2D(const geometry::ViewInformation2D& rViewInformation);
virtual ~TextAsPolygonExtractor2D();
// data read access
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
index 16b6022..e2a58ba 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
@@ -65,7 +65,7 @@ namespace drawinglayer
virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate);
public:
- BaseProcessor3D(const geometry::ViewInformation3D& rViewInformation);
+ explicit BaseProcessor3D(const geometry::ViewInformation3D& rViewInformation);
virtual ~BaseProcessor3D();
// the central processing method
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 5d304b8..12f4763 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -68,7 +68,7 @@ namespace drawinglayer
{
}
- ImpSdrLineAttribute(const basegfx::BColor& rColor)
+ explicit ImpSdrLineAttribute(const basegfx::BColor& rColor)
: mnRefCount(0),
meJoin(basegfx::B2DLINEJOIN_NONE),
mfWidth(0.0),
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index f5c971f..c0c96a8 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -277,7 +277,7 @@ namespace drawinglayer
impInterpretPropertyValues(rExtendedParameters);
}
- ImpViewInformation2D(const uno::Sequence< beans::PropertyValue >& rViewParameters)
+ explicit ImpViewInformation2D(const uno::Sequence< beans::PropertyValue >& rViewParameters)
: mnRefCount(0),
maObjectTransformation(),
maViewTransformation(),
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index ed1949f..b43a053 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -363,7 +363,7 @@ namespace drawinglayer
impInterpretPropertyValues(rExtendedParameters);
}
- ImpViewInformation3D(const uno::Sequence< beans::PropertyValue >& rViewParameters)
+ explicit ImpViewInformation3D(const uno::Sequence< beans::PropertyValue >& rViewParameters)
: mnRefCount(0),
maObjectTransformation(),
maOrientation(),
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 5ae2b37..fac806d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -68,7 +68,7 @@ namespace
sal_uInt32 generateStepTime(sal_uInt32 nIndex) const;
public:
- animatedBitmapExPreparator(const Graphic& rGraphic);
+ explicit animatedBitmapExPreparator(const Graphic& rGraphic);
sal_uInt32 count() const { return maSteps.size(); }
sal_uInt32 loopCount() const { return (sal_uInt32)maAnimation.GetLoopCount(); }
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 6f7b66f..902cc22 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -68,7 +68,7 @@ namespace
sal_uInt32 mnUseCount;
public:
- ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe);
+ explicit ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe);
~ImpTimedRefDev();
virtual void Timeout();
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index f9d7c66..312fb25 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -58,7 +58,7 @@ namespace drawinglayer
Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
{
const geometry::ViewInformation3D aViewInformation(rViewParameters);
- return get3DDecomposition(rViewParameters);
+ return get3DDecomposition(aViewInformation);
}
com::sun::star::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
More information about the Libreoffice-commits
mailing list