ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cppcheck:noExplicitConstructor

Browse Source 
Change-Id: I2717d3d120df8af5b7e9af8d147a57b9f5b5ecbe
This commit is contained in:
Noel Grandin
2015-08-07 07:20:24 +02:00
parent dea885f80a
commit 6343754e31
52 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slideshow/source/engine/activities/activitybase.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ namespace internal {
class ActivityBase : public AnimationActivity
{
public:
ActivityBase( const ActivityParameters& rParms );
explicit ActivityBase( const ActivityParameters& rParms );
/// From Disposable interface
virtual void dispose() SAL_OVERRIDE;
slideshow/source/engine/activities/continuousactivitybase.hxx
+1 -1
View File
@@ -36,7 +36,7 @@ namespace slideshow
class ContinuousActivityBase : public SimpleContinuousActivityBase
{
public:
ContinuousActivityBase( const ActivityParameters& rParms );
explicit ContinuousActivityBase( const ActivityParameters& rParms );
using SimpleContinuousActivityBase::perform;
slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ namespace slideshow
class ContinuousKeyTimeActivityBase : public SimpleContinuousActivityBase
{
public:
ContinuousKeyTimeActivityBase( const ActivityParameters& rParms );
explicit ContinuousKeyTimeActivityBase( const ActivityParameters& rParms );
using SimpleContinuousActivityBase::perform;
slideshow/source/engine/activities/discreteactivitybase.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ namespace slideshow
class DiscreteActivityBase : public ActivityBase
{
public:
DiscreteActivityBase( const ActivityParameters& rParms );
explicit DiscreteActivityBase( const ActivityParameters& rParms );
/** Hook for derived classes.
slideshow/source/engine/activities/interpolation.hxx
+1 -1
View File
@@ -88,7 +88,7 @@ namespace slideshow
/// Specialization for HSLColor, to employ color-specific interpolator
template<> struct Interpolator< HSLColor >
{
Interpolator( bool bCCW ) :
explicit Interpolator( bool bCCW ) :
mbCCW( bCCW )
{
}
slideshow/source/engine/activities/simplecontinuousactivitybase.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ namespace slideshow
class SimpleContinuousActivityBase : public ActivityBase
{
public:
SimpleContinuousActivityBase( const ActivityParameters& rParms );
explicit SimpleContinuousActivityBase( const ActivityParameters& rParms );
virtual double calcTimeLag() const SAL_OVERRIDE;
virtual bool perform() SAL_OVERRIDE;
slideshow/source/engine/animationfactory.cxx
+1 -1
View File
@@ -619,7 +619,7 @@ namespace slideshow
class Scaler
{
public:
Scaler( double nScale ) :
explicit Scaler( double nScale ) :
mnScale( nScale )
{
}
slideshow/source/engine/effectrewinder.cxx
+2 -2
View File
@@ -45,7 +45,7 @@ class RewinderEventHandler : public EventHandler
{
public:
typedef ::std::function<bool ()> Action;
RewinderEventHandler (const Action& rAction) : maAction(rAction) {}
explicit RewinderEventHandler (const Action& rAction) : maAction(rAction) {}
virtual ~RewinderEventHandler() {}
private:
const Action maAction;
@@ -58,7 +58,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler
{
public:
typedef ::std::function<bool (const AnimationNodeSharedPtr& rpNode)> Action;
RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {}
explicit RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {}
virtual ~RewinderAnimationEventHandler() {}
private:
const Action maAction;
slideshow/source/engine/expressionnodefactory.cxx
+1 -1
View File
@@ -42,7 +42,7 @@ namespace slideshow
class ConstantValueExpression : public ExpressionNode
{
public:
ConstantValueExpression( double rValue ) :
explicit ConstantValueExpression( double rValue ) :
maValue( rValue )
{
}
slideshow/source/engine/shapes/drawshape.cxx
+1 -1
View File
@@ -759,7 +759,7 @@ namespace slideshow
class Expander
{
public:
Expander( ::basegfx::B2DSize& rBounds ) :
explicit Expander( ::basegfx::B2DSize& rBounds ) :
mrBounds( rBounds )
{
}
slideshow/source/engine/shapes/drawshapesubsetting.cxx
+1 -1
View File
@@ -642,7 +642,7 @@ namespace slideshow
class CountClassFunctor
{
public:
CountClassFunctor( DrawShapeSubsetting::IndexClassificator eClass ) :
explicit CountClassFunctor( DrawShapeSubsetting::IndexClassificator eClass ) :
meClass( eClass ),
mnCurrCount(0)
{
slideshow/source/engine/slide/layer.cxx
+1 -1
View File
@@ -226,7 +226,7 @@ namespace slideshow
class LayerEndUpdate : private boost::noncopyable
{
public:
LayerEndUpdate( LayerSharedPtr const& rLayer ) :
explicit LayerEndUpdate( LayerSharedPtr const& rLayer ) :
mpLayer( rLayer )
{}
slideshow/source/engine/slideshowimpl.cxx
+2 -2
View File
@@ -127,7 +127,7 @@ public:
The preferred duration between the display of two frames in
seconds.
*/
FrameSynchronization (const double nFrameDuration);
explicit FrameSynchronization (const double nFrameDuration);
/** Set the current time as the time at which the current frame is
displayed. From this the target time of the next frame is derived.
@@ -407,7 +407,7 @@ private:
void releaseWaitSymbol();
class WaitSymbolLock {public:
WaitSymbolLock(SlideShowImpl& rSlideShowImpl) : mrSlideShowImpl(rSlideShowImpl)
explicit WaitSymbolLock(SlideShowImpl& rSlideShowImpl) : mrSlideShowImpl(rSlideShowImpl)
{ mrSlideShowImpl.requestWaitSymbol(); }
~WaitSymbolLock()
{ mrSlideShowImpl.releaseWaitSymbol(); }
slideshow/source/engine/smilfunctionparser.cxx
+4 -4
View File
@@ -146,7 +146,7 @@ namespace slideshow
class DoubleConstantFunctor
{
public:
DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) :
explicit DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) :
mpContext( rContext )
{
ENSURE_OR_THROW( mpContext,
@@ -169,7 +169,7 @@ namespace slideshow
class ValueTFunctor
{
public:
ValueTFunctor( const ParserContextSharedPtr& rContext ) :
explicit ValueTFunctor( const ParserContextSharedPtr& rContext ) :
mpContext( rContext )
{
ENSURE_OR_THROW( mpContext,
@@ -413,7 +413,7 @@ namespace slideshow
@param rParserContext
Contains context info for the parser
*/
ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) :
explicit ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) :
mpParserContext( rParserContext )
{
}
@@ -422,7 +422,7 @@ namespace slideshow
{
public:
// grammar definition
definition( const ExpressionGrammar& self )
explicit definition( const ExpressionGrammar& self )
{
using ::boost::spirit::str_p;
using ::boost::spirit::real_parser;
slideshow/source/engine/tools.cxx
+1 -1
View File
@@ -61,7 +61,7 @@ namespace slideshow
class NamedValueComparator
{
public:
NamedValueComparator( const beans::NamedValue& rKey ) :
explicit NamedValueComparator( const beans::NamedValue& rKey ) :
mrKey( rKey )
{
}
slideshow/source/engine/transitions/barndoorwipe.hxx
+1 -1
View File
@@ -33,7 +33,7 @@ namespace internal {
class BarnDoorWipe : public ParametricPolyPolygon
{
public:
BarnDoorWipe( bool doubled = false )
explicit BarnDoorWipe( bool doubled = false )
: m_unitRect( createUnitRect() ), m_doubled(doubled) {}
virtual ::basegfx::B2DPolyPolygon operator()( double x ) SAL_OVERRIDE;
private:
slideshow/source/engine/transitions/barwipepolypolygon.hxx
+1 -1
View File
@@ -31,7 +31,7 @@ namespace internal {
class BarWipePolyPolygon : public ParametricPolyPolygon
{
public:
BarWipePolyPolygon( sal_Int32 nBars = 1 /* nBars > 1: blinds effect */ )
explicit BarWipePolyPolygon( sal_Int32 nBars = 1 /* nBars > 1: blinds effect */ )
: m_nBars(nBars),
m_unitRect( createUnitRect() )
{}
slideshow/source/engine/transitions/boxwipe.hxx
+1 -1
View File
@@ -31,7 +31,7 @@ namespace internal {
class BoxWipe : public ParametricPolyPolygon
{
public:
BoxWipe( bool topCentered ) : m_topCentered(topCentered),
explicit BoxWipe( bool topCentered ) : m_topCentered(topCentered),
m_unitRect( createUnitRect() )
{}
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
slideshow/source/engine/transitions/checkerboardwipe.hxx
+1 -1
View File
@@ -33,7 +33,7 @@ namespace internal {
class CheckerBoardWipe : public ParametricPolyPolygon
{
public:
CheckerBoardWipe( sal_Int32 unitsPerEdge = 10 )
explicit CheckerBoardWipe( sal_Int32 unitsPerEdge = 10 )
: m_unitsPerEdge(unitsPerEdge),
m_unitRect( createUnitRect() )
{ OSL_ASSERT( (unitsPerEdge % 2) == 0 ); }
slideshow/source/engine/transitions/ellipsewipe.hxx
+1 -1
View File
@@ -30,7 +30,7 @@ namespace internal {
class EllipseWipe : public ParametricPolyPolygon
{
public:
EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
explicit EllipseWipe( sal_Int32 /*nTransitionSubType xxx todo */ ) {}
virtual ::basegfx::B2DPolyPolygon operator () ( double x ) SAL_OVERRIDE;
};
slideshow/source/engine/transitions/figurewipe.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {}
explicit FigureWipe( ::basegfx::B2DPolygon const & figure ) : m_figure(figure) {}
const ::basegfx::B2DPolygon m_figure;
};
slideshow/source/engine/transitions/fourboxwipe.hxx
+1 -1
View File
@@ -32,7 +32,7 @@ namespace internal {
class FourBoxWipe : public ParametricPolyPolygon
{
public:
FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut),
explicit FourBoxWipe( bool cornersOut ) : m_cornersOut(cornersOut),
m_unitRect( createUnitRect() )
{}
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
slideshow/source/engine/transitions/pinwheelwipe.hxx
+1 -1
View File
@@ -31,7 +31,7 @@ namespace internal {
class PinWheelWipe : public ParametricPolyPolygon
{
public:
PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
explicit PinWheelWipe( sal_Int32 blades ) : m_blades(blades) {}
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
private:
sal_Int32 m_blades;
slideshow/source/engine/transitions/zigzagwipe.hxx
+2 -2
View File
@@ -31,7 +31,7 @@ namespace internal {
class ZigZagWipe : public ParametricPolyPolygon
{
public:
ZigZagWipe( sal_Int32 nZigs );
explicit ZigZagWipe( sal_Int32 nZigs );
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
protected:
const double m_zigEdge;
@@ -42,7 +42,7 @@ protected:
class BarnZigZagWipe : public ZigZagWipe
{
public:
BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {}
explicit BarnZigZagWipe( sal_Int32 nZigs ) : ZigZagWipe(nZigs) {}
virtual ::basegfx::B2DPolyPolygon operator () ( double t ) SAL_OVERRIDE;
};
slideshow/source/engine/usereventqueue.cxx
+5 -5
View File
@@ -123,7 +123,7 @@ protected:
class AllAnimationEventHandler : public AnimationEventHandler
{
public:
AllAnimationEventHandler( EventQueue& rEventQueue ) :
explicit AllAnimationEventHandler( EventQueue& rEventQueue ) :
mrEventQueue( rEventQueue ),
maAnimationEventMap()
{}
@@ -182,7 +182,7 @@ class ClickEventHandler : public MouseEventHandler_,
public EventContainer
{
public:
ClickEventHandler( EventQueue& rEventQueue ) :
explicit ClickEventHandler( EventQueue& rEventQueue ) :
EventContainer(),
mrEventQueue( rEventQueue ),
mbAdvanceOnClick( true )
@@ -293,7 +293,7 @@ private:
class MouseHandlerBase : public MouseEventHandler_
{
public:
MouseHandlerBase( EventQueue& rEventQueue ) :
explicit MouseHandlerBase( EventQueue& rEventQueue ) :
mrEventQueue( rEventQueue ),
maShapeEventMap()
{}
@@ -422,7 +422,7 @@ private:
class MouseEnterHandler : public MouseHandlerBase
{
public:
MouseEnterHandler( EventQueue& rEventQueue )
explicit MouseEnterHandler( EventQueue& rEventQueue )
: MouseHandlerBase( rEventQueue ),
mpLastShape() {}
@@ -460,7 +460,7 @@ private:
class MouseLeaveHandler : public MouseHandlerBase
{
public:
MouseLeaveHandler( EventQueue& rEventQueue )
explicit MouseLeaveHandler( EventQueue& rEventQueue )
: MouseHandlerBase( rEventQueue ),
maLastIter() {}
slideshow/test/demoshow.cxx
+1 -1
View File
@@ -308,7 +308,7 @@ public:
class ChildWindow : public vcl::Window
{
public:
ChildWindow( vcl::Window* pParent );
explicit ChildWindow( vcl::Window* pParent );
virtual ~ChildWindow();
virtual void Paint( const Rectangle& rRect );
virtual void Resize();
smoketest/smoketest.cxx
+1 -1
View File
@@ -65,7 +65,7 @@ class Listener:
public cppu::WeakImplHelper1< css::frame::XDispatchResultListener >
{
public:
Listener(Result * result): result_(result) { OSL_ASSERT(result != 0); }
explicit Listener(Result * result): result_(result) { OSL_ASSERT(result != 0); }
private:
virtual void SAL_CALL disposing(css::lang::EventObject const &)
sot/source/sdstor/stgavl.hxx
+1 -1
View File
@@ -56,7 +56,7 @@ class StgAvlIterator {
short nCur; // current element
StgAvlNode* Find( short );
public:
StgAvlIterator( StgAvlNode* );
explicit StgAvlIterator( StgAvlNode* );
StgAvlNode* First();
StgAvlNode* Next();
};
sot/source/sdstor/stgdir.hxx
+3 -3
View File
@@ -64,7 +64,7 @@ public:
bool bInvalid; // true: invalid entry
StgDirEntry(const void* pBuffer, sal_uInt32 nBufferLen,
sal_uInt64 nUnderlyingStreamSize, bool * pbOk);
StgDirEntry( const StgEntry& );
explicit StgDirEntry( const StgEntry& );
virtual ~StgDirEntry();
void Invalidate( bool=false ); // invalidate all open entries
@@ -95,7 +95,7 @@ class StgDirStrm : public StgDataStrm
short nEntries; // entries per page
void SetupEntry( sal_Int32, StgDirEntry* );
public:
StgDirStrm( StgIo& );
explicit StgDirStrm( StgIo& );
virtual ~StgDirStrm();
virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE; // change the size
bool Store();
@@ -108,7 +108,7 @@ public:
class StgIterator : public StgAvlIterator
{
public:
StgIterator( StgDirEntry& rStg ) : StgAvlIterator( rStg.pDown ) {}
explicit StgIterator( StgDirEntry& rStg ) : StgAvlIterator( rStg.pDown ) {}
StgDirEntry* First() { return static_cast<StgDirEntry*>( StgAvlIterator::First() ); }
StgDirEntry* Next() { return static_cast<StgDirEntry*>( StgAvlIterator::Next() ); }
};
sot/source/sdstor/stgio.cxx
+1 -2
View File
@@ -234,8 +234,7 @@ class Validator
sal_uLong MarkAll( StgDirEntry *pEntry );
public:
Validator( StgIo &rIo );
explicit Validator( StgIo &rIo );
bool IsError() { return nError != 0; }
};
sot/source/sdstor/stgstrms.hxx
+4 -4
View File
@@ -73,7 +73,7 @@ protected:
std::vector<sal_Int32> m_aPagesCache;
void scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize = NULL);
bool Copy( sal_Int32 nFrom, sal_Int32 nBytes );
StgStrm( StgIo& );
explicit StgStrm( StgIo& );
public:
virtual ~StgStrm();
StgIo& GetIo() { return rIo; }
@@ -99,7 +99,7 @@ class StgFATStrm : public StgStrm { // the master FAT stream
virtual bool Pos2Page( sal_Int32 nBytePos ) SAL_OVERRIDE;
bool SetPage( short, sal_Int32 );
public:
StgFATStrm( StgIo& );
explicit StgFATStrm( StgIo& );
virtual ~StgFATStrm() {}
using StgStrm::GetPage;
sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = 0);
@@ -151,8 +151,8 @@ class StgTmpStrm : public SvMemoryStream
virtual void FlushData() SAL_OVERRIDE;
public:
StgTmpStrm( sal_uLong=16 );
virtual ~StgTmpStrm();
explicit StgTmpStrm( sal_uLong=16 );
virtual ~StgTmpStrm();
bool Copy( StgTmpStrm& );
virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE;
sal_uLong GetSize() const;
sot/source/unoolestorage/xolesimplestorage.hxx
+1 -1
View File
@@ -67,7 +67,7 @@ class OLESimpleStorage : public ::cppu::WeakImplHelper3
public:
OLESimpleStorage( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
explicit OLESimpleStorage( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
virtual ~OLESimpleStorage();
stoc/source/corereflection/lrucache.hxx
+1 -1
View File
@@ -58,7 +58,7 @@ public:
<br>
@param nCachedElements number of elements to be cached; default param set to 128
*/
inline LRU_Cache( sal_Int32 nCachedElements = 128 );
explicit inline LRU_Cache( sal_Int32 nCachedElements = 128 );
/** Destructor: releases all cached elements and keys.
<br>
*/
stoc/source/security/lru_cache.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
@param size number of elements to be cached; default param set to 128
*/
inline lru_cache( ::std::size_t size );
explicit inline lru_cache( ::std::size_t size );
/** Destructor: releases all cached elements and keys.
*/
svtools/source/dialogs/mcvmath.cxx
+1 -1
View File
@@ -101,7 +101,7 @@ sal_uInt16 ImpSqrt( sal_uLong nRadi )
FixCpx ImpExPI( sal_uInt16 nPhi )
{
short i;
FixCpx aIter(1L); // e**(0*i)
FixCpx aIter(Fix(1L)); // e**(0*i)
FixCpx Mul;
const char Sft=14-FIX_POST;
svtools/source/dialogs/mcvmath.hxx
+5 -5
View File
@@ -69,10 +69,10 @@ public:
public:
Fix() { x=0; }
Fix( int i ) { x=(long(i)<<FIX_POST); }
Fix( short l ) { x=(long(l)<<FIX_POST); }
Fix( sal_uInt16 l ) { x=(long(l)<<FIX_POST); }
Fix( long l ) { x=(l<<FIX_POST); }
explicit Fix( int i ) { x=(long(i)<<FIX_POST); }
explicit Fix( short l ) { x=(long(l)<<FIX_POST); }
explicit Fix( sal_uInt16 l ) { x=(long(l)<<FIX_POST); }
explicit Fix( long l ) { x=(l<<FIX_POST); }
Fix( long Z, long N ) { x=(Z<<FIX_POST)/N; }
enum class Bits { Bits };
@@ -111,7 +111,7 @@ public:
public:
FixCpx() : r(), i() {}
FixCpx( Fix a ) : r( a ), i() {}
explicit FixCpx( Fix a ) : r( a ), i() {}
FixCpx( Fix a, Fix b ) : r( a ), i( b ) {}
void operator*= ( const FixCpx& ra );
svx/source/form/fmvwimp.cxx
+1 -1
View File
@@ -681,7 +681,7 @@ namespace
public:
find_active_databaseform( const Reference< XFormController > _xActiveController )
explicit find_active_databaseform( const Reference< XFormController > _xActiveController )
: xActiveController(_xActiveController )
{}
sw/source/core/text/inftxt.cxx
+3 -3
View File
@@ -397,7 +397,7 @@ SwPosSize SwTextSizeInfo::GetTextSize( OutputDevice* pOutDev,
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( nComp );
return m_pFnt->_GetTextSize( aDrawInf );
return SwPosSize(m_pFnt->_GetTextSize( aDrawInf ));
}
SwPosSize SwTextSizeInfo::GetTextSize() const
@@ -418,7 +418,7 @@ SwPosSize SwTextSizeInfo::GetTextSize() const
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( nComp );
return m_pFnt->_GetTextSize( aDrawInf );
return SwPosSize(m_pFnt->_GetTextSize( aDrawInf ));
}
void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nIndex,
@@ -432,7 +432,7 @@ void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nInde
aDrawInf.SetFont( m_pFnt );
aDrawInf.SetSnapToGrid( SnapToGrid() );
aDrawInf.SetKanaComp( nComp );
SwPosSize aSize = m_pFnt->_GetTextSize( aDrawInf );
SwPosSize aSize( m_pFnt->_GetTextSize( aDrawInf ) );
nMaxSizeDiff = (sal_uInt16)aDrawInf.GetKanaDiff();
nMinSize = aSize.Width();
}
sw/source/core/text/porlin.hxx
+1 -1
View File
@@ -74,7 +74,7 @@ private:
void _Truncate();
public:
inline SwLinePortion(const SwLinePortion &rPortion);
explicit inline SwLinePortion(const SwLinePortion &rPortion);
virtual ~SwLinePortion();
// Access methods
sw/source/core/text/possiz.hxx
+1 -1
View File
@@ -30,7 +30,7 @@ class SwPosSize
public:
inline SwPosSize( const sal_uInt16 nW = 0, const sal_uInt16 nH = 0 )
: nWidth(nW), nHeight(nH) { }
inline SwPosSize( const Size &rSize )
explicit inline SwPosSize( const Size &rSize )
: nWidth(sal_uInt16(rSize.Width())), nHeight(sal_uInt16(rSize.Height())){ }
inline sal_uInt16 Height() const { return nHeight; }
inline void Height( const sal_uInt16 nNew ) { nHeight = nNew; }
sw/source/filter/ww8/wrtww8.hxx
+1 -1
View File
@@ -275,7 +275,7 @@ class WW8_WrPct
boost::ptr_vector<WW8_WrPc > aPcts;
WW8_FC nOldFc;
public:
WW8_WrPct(WW8_FC nStartFc);
explicit WW8_WrPct(WW8_FC nStartFc);
~WW8_WrPct();
void AppendPc(WW8_FC nStartFc);
void WritePc( WW8Export& rWrt );
sw/source/filter/ww8/ww8par2.cxx
+13 -13
View File
@@ -1160,20 +1160,20 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS)
pAktTC->bFirstMerged = sal_uInt8( ( aBits1 & 0x01 ) != 0 );
pAktTC->bMerged = sal_uInt8( ( aBits1 & 0x02 ) != 0 );
pAktTC->rgbrc[ WW8_TOP ]
= WW8_BRC( pTc->rgbrcVer6[ WW8_TOP ] );
= WW8_BRCVer9(WW8_BRC( pTc->rgbrcVer6[ WW8_TOP ] ));
pAktTC->rgbrc[ WW8_LEFT ]
= WW8_BRC( pTc->rgbrcVer6[ WW8_LEFT ] );
= WW8_BRCVer9(WW8_BRC( pTc->rgbrcVer6[ WW8_LEFT ] ));
pAktTC->rgbrc[ WW8_BOT ]
= WW8_BRC( pTc->rgbrcVer6[ WW8_BOT ] );
= WW8_BRCVer9(WW8_BRC( pTc->rgbrcVer6[ WW8_BOT ] ));
pAktTC->rgbrc[ WW8_RIGHT ]
= WW8_BRC( pTc->rgbrcVer6[ WW8_RIGHT ] );
= WW8_BRCVer9(WW8_BRC( pTc->rgbrcVer6[ WW8_RIGHT ] ));
if( ( pAktTC->bMerged )
&& ( i > 0 ) )
{
// Cell merged -> remember
//bWWMergedVer6[i] = true;
pTCs[i-1].rgbrc[ WW8_RIGHT ]
= WW8_BRC( pTc->rgbrcVer6[ WW8_RIGHT ] );
= WW8_BRCVer9(WW8_BRC( pTc->rgbrcVer6[ WW8_RIGHT ] ));
// apply right border to previous cell
// bExist must not be set to false, because WW
// does not count this cells in text boxes....
@@ -1198,10 +1198,10 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS)
// note: in aBits1 there are 7 bits unused,
// followed by another 16 unused bits
pAktTC->rgbrc[ WW8_TOP ] = pTc->rgbrcVer8[ WW8_TOP ];
pAktTC->rgbrc[ WW8_LEFT ] = pTc->rgbrcVer8[ WW8_LEFT ];
pAktTC->rgbrc[ WW8_BOT ] = pTc->rgbrcVer8[ WW8_BOT ];
pAktTC->rgbrc[ WW8_RIGHT ] = pTc->rgbrcVer8[ WW8_RIGHT ];
pAktTC->rgbrc[ WW8_TOP ] = WW8_BRCVer9(pTc->rgbrcVer8[ WW8_TOP ]);
pAktTC->rgbrc[ WW8_LEFT ] = WW8_BRCVer9(pTc->rgbrcVer8[ WW8_LEFT ]);
pAktTC->rgbrc[ WW8_BOT ] = WW8_BRCVer9(pTc->rgbrcVer8[ WW8_BOT ]);
pAktTC->rgbrc[ WW8_RIGHT ] = WW8_BRCVer9(pTc->rgbrcVer8[ WW8_RIGHT ]);
}
}
@@ -1246,9 +1246,9 @@ void WW8TabBandDesc::ProcessSprmTSetBRC(int nBrcVer, const sal_uInt8* pParamsTSe
WW8_TCell* pAktTC = pTCs + nitcFirst;
WW8_BRCVer9 brcVer9;
if( nBrcVer == 6 )
brcVer9 = WW8_BRC(*reinterpret_cast<WW8_BRCVer6 const *>(pParamsTSetBRC+3));
brcVer9 = WW8_BRCVer9(WW8_BRC(*reinterpret_cast<WW8_BRCVer6 const *>(pParamsTSetBRC+3)));
else if( nBrcVer == 8 )
brcVer9 = *reinterpret_cast<WW8_BRC const *>(pParamsTSetBRC+3);
brcVer9 = WW8_BRCVer9(*reinterpret_cast<WW8_BRC const *>(pParamsTSetBRC+3));
else
brcVer9 = *reinterpret_cast<WW8_BRCVer9 const *>(pParamsTSetBRC+3);
@@ -1273,13 +1273,13 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int nBrcVer, const sal_uInt8* pPar
{
WW8_BRCVer6 const *pVer6 = reinterpret_cast<WW8_BRCVer6 const *>(pParams);
for (int i = 0; i < 6; ++i)
aDefBrcs[i] = WW8_BRC(pVer6[i]);
aDefBrcs[i] = WW8_BRCVer9(WW8_BRC(pVer6[i]));
}
else if ( nBrcVer == 8 )
{
static_assert(sizeof (WW8_BRC) == 4, "this has to match the msword size");
for( int i = 0; i < 6; ++i )
aDefBrcs[i] = reinterpret_cast<WW8_BRC const *>(pParams)[i];
aDefBrcs[i] = WW8_BRCVer9(reinterpret_cast<WW8_BRC const *>(pParams)[i]);
}
else
memcpy( aDefBrcs, pParams, sizeof( aDefBrcs ) );
sw/source/filter/ww8/ww8par6.cxx
+3 -3
View File
@@ -1226,9 +1226,9 @@ static bool _SetWW8_BRC(int nBrcVer, WW8_BRCVer9& rVar, const sal_uInt8* pS)
if ( nBrcVer == 9 )
rVar = *reinterpret_cast<const WW8_BRCVer9*>(pS);
else if( nBrcVer == 8 )
rVar = *reinterpret_cast<const WW8_BRC*>(pS);
rVar = WW8_BRCVer9(*reinterpret_cast<const WW8_BRC*>(pS));
else // nBrcVer == 6
rVar = WW8_BRC(*reinterpret_cast<const WW8_BRCVer6*>(pS));
rVar = WW8_BRCVer9(WW8_BRC(*reinterpret_cast<const WW8_BRCVer6*>(pS)));
}
return 0 != pS;
@@ -2083,7 +2083,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM,
*/
WW8_BRCVer9 brcVer9[4];
for (int i = 0; i < 4; i++)
brcVer9[i] = rPic.rgbrc[i];
brcVer9[i] = WW8_BRCVer9(rPic.rgbrc[i]);
if (SwWW8ImplReader::SetFlyBordersShadow( *this, brcVer9, &aSizeArray[0]))
{
Put(SvxLRSpaceItem( aSizeArray[WW8_LEFT], 0, 0, 0, RES_LR_SPACE ) );
sw/source/filter/ww8/ww8struc.hxx
+2 -2
View File
@@ -308,7 +308,7 @@ struct WW8_BRC // BoRder Code (WW8 version)
| ((sal_uInt8)_fFrame << 6);
}
// Convert BRC from WW6 to WW8 format
WW8_BRC(const WW8_BRCVer6& brcVer6);
explicit WW8_BRC(const WW8_BRCVer6& brcVer6);
// Returns LO border width in twips=1/20pt, taking into account brcType
short DetermineBorderProperties(short *pSpace=0) const;
@@ -360,7 +360,7 @@ struct WW8_BRCVer9 // BoRder Code (WW9 version)
aBits2[3] = 0;
}
// Convert BRC from WW8 to WW9 format
WW8_BRCVer9(const WW8_BRC& brcVer8);
explicit WW8_BRCVer9(const WW8_BRC& brcVer8);
// Returns LO border width in twips=1/20pt, taking into account brcType
short DetermineBorderProperties(short *pSpace=0) const;
ucb/source/core/providermap.hxx
+1 -1
View File
@@ -41,7 +41,7 @@ private:
com::sun::star::ucb::XContentProvider > resolveProvider() const;
public:
ProviderListEntry_Impl(
explicit ProviderListEntry_Impl(
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentProvider >& xProvider )
: m_xProvider( xProvider ) {}
ucb/source/core/ucb.cxx
+2 -2
View File
@@ -426,7 +426,7 @@ UniversalContentBroker::registerContentProvider(
if (aIt == m_aProviders.end())
{
ProviderList_Impl aList;
aList.push_front(Provider);
aList.push_front( ProviderListEntry_Impl(Provider) );
try
{
m_aProviders.add(Scheme, aList, false);
@@ -443,7 +443,7 @@ UniversalContentBroker::registerContentProvider(
ProviderList_Impl & rList = aIt->getValue();
xPrevious = rList.front().getProvider();
rList.push_front(Provider);
rList.push_front( ProviderListEntry_Impl(Provider) );
}
return xPrevious;
ucb/source/ucp/gvfs/gvfs_provider.hxx
+1 -1
View File
@@ -28,7 +28,7 @@ namespace gvfs {
class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
public:
ContentProvider( const ::com::sun::star::uno::Reference<
explicit ContentProvider( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
ucb/source/ucp/hierarchy/hierarchydata.cxx
+1 -1
View File
@@ -494,7 +494,7 @@ bool HierarchyEntry::move(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
OUString aNewPath = createPathFromHierarchyURL( rNewURL );
OUString aNewPath = createPathFromHierarchyURL( HierarchyUri(rNewURL) );
if ( aNewPath == m_aPath )
return true;
ucb/source/ucp/hierarchy/hierarchyuri.hxx
+1 -1
View File
@@ -45,7 +45,7 @@ private:
public:
HierarchyUri() : m_bValid( false ) {}
HierarchyUri( const OUString & rUri )
explicit HierarchyUri( const OUString & rUri )
: m_aUri( rUri ), m_bValid( false ) {}
bool isValid() const
ucb/source/ucp/tdoc/tdoc_content.cxx
+1 -1
View File
@@ -905,7 +905,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const OUString& rContentId )
{
ContentProperties aData;
if ( loadData( pProvider, rContentId, aData ) )
if ( loadData( pProvider, Uri(rContentId), aData ) )
{
return getPropertyValues(
rxContext, rProperties, aData, pProvider, rContentId );
ucb/source/ucp/tdoc/tdoc_uri.hxx
+1 -1
View File
@@ -49,7 +49,7 @@ private:
public:
Uri() : m_eState( UNKNOWN ) {}
Uri( const OUString & rUri )
explicit Uri( const OUString & rUri )
: m_aUri( rUri ), m_eState( UNKNOWN ) {}
bool operator== ( const Uri & rOther ) const
ucb/source/ucp/webdav/ContentProperties.hxx
+5 -6
View File
@@ -50,7 +50,7 @@ public:
PropertyValue()
: m_bIsCaseSensitive( true ) {}
PropertyValue( const ::com::sun::star::uno::Any & rValue,
explicit PropertyValue( const ::com::sun::star::uno::Any & rValue,
bool bIsCaseSensitive )
: m_aValue( rValue),
m_bIsCaseSensitive( bIsCaseSensitive ) {}
@@ -75,20 +75,19 @@ class ContentProperties
public:
ContentProperties();
ContentProperties( const DAVResource& rResource );
explicit ContentProperties( const DAVResource& rResource );
// Mini props for transient contents.
ContentProperties( const OUString & rTitle, bool bFolder );
// Micro props for non-existing contents.
ContentProperties( const OUString & rTitle );
explicit ContentProperties( const OUString & rTitle );
ContentProperties( const ContentProperties & rOther );
bool contains( const OUString & rName ) const;
const com::sun::star::uno::Any &
getValue( const OUString & rName ) const;
const css::uno::Any& getValue( const OUString & rName ) const;
// Maps the UCB property names contained in rProps with their DAV property
// counterparts, if possible. All unmappable properties will be included
@@ -174,7 +173,7 @@ private:
CachableContentProperties( const CachableContentProperties & ); // n.i.
public:
CachableContentProperties( const ContentProperties & rProps );
explicit CachableContentProperties( const ContentProperties & rProps );
void addProperties( const ContentProperties & rProps );