diff options
-rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 14 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 12 | ||||
-rw-r--r-- | svx/inc/svx/svditer.hxx | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 22a8d7220c9b..e127aa8f5107 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -121,7 +121,7 @@ protected: DffPropFlags mpFlags[ 1024 ]; public: - DffPropSet( sal_Bool bInitialize = sal_False ) + explicit DffPropSet( sal_Bool bInitialize = sal_False ) { if ( bInitialize ) memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) ); @@ -160,7 +160,7 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet public: sal_Int32 mnFix16Angle; - DffPropertyReader( const SvxMSDffManager& rManager ); + explicit DffPropertyReader( const SvxMSDffManager& rManager ); ~DffPropertyReader(); sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const; @@ -344,7 +344,7 @@ struct SvxMSDffImportData SvxMSDffImportData() {} - SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {} + explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {} void SetNewRect(sal_Int32 left, sal_Int32 top, sal_Int32 right, sal_Int32 bottom ) { aNewRect = Rectangle(left, top, right, bottom); } sal_Bool HasParRect() const { return aParentRect.IsEmpty(); } @@ -403,7 +403,7 @@ struct DffRecordList DffRecordHeader mHd[ DFF_RECORD_MANAGER_BUF_SIZE ]; - DffRecordList( DffRecordList* pList ); + explicit DffRecordList( DffRecordList* pList ); ~DffRecordList(); }; @@ -431,7 +431,7 @@ public : DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); DffRecordManager(); - DffRecordManager( SvStream& rIn ); + explicit DffRecordManager( SvStream& rIn ); ~DffRecordManager(); DffRecordHeader* Current(); @@ -815,7 +815,7 @@ struct SvxMSDffShapeInfo sal_Bool bSortByShapeId :1; sal_Bool bLastBoxInChain:1; - SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0, + explicit SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0, sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0): nShapeId( nId ), nFilePos( nFPos ), @@ -860,7 +860,7 @@ struct SvxMSDffShapeOrder // Approach: In the Ctor of SvxMSDffManager only the shape ids are stored in // the shape order array. The Text-Box number and the object // pointer are only stored if the shape is really imported. - SvxMSDffShapeOrder( sal_uLong nId ): + explicit SvxMSDffShapeOrder( sal_uLong nId ): nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0 ){} bool operator==( const SvxMSDffShapeOrder& rEntry ) const diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index d2fb3b1ff7ff..baf955e441ac 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -500,7 +500,7 @@ struct MSFILTER_DLLPUBLIC HeaderFooterEntry const PptSlidePersistEntry& rSlidePersist ); - HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL ); + explicit HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL ); ~HeaderFooterEntry(); }; @@ -672,7 +672,7 @@ struct PPTTextSpecInfo sal_uInt16 nLanguage[ 3 ]; sal_uInt16 nDontKnow; - PPTTextSpecInfo( sal_uInt32 nCharIdx ); + explicit PPTTextSpecInfo( sal_uInt32 nCharIdx ); ~PPTTextSpecInfo(); }; @@ -762,7 +762,7 @@ struct PPTCharSheet { PPTCharLevel maCharLevel[ 5 ]; - PPTCharSheet( sal_uInt32 nInstance ); + explicit PPTCharSheet( sal_uInt32 nInstance ); PPTCharSheet( const PPTCharSheet& rCharSheet ); void Read( SvStream& rIn, sal_Bool bMasterStyle, sal_uInt32 nLevel, sal_Bool bFirst ); @@ -795,7 +795,7 @@ public: PPTParaLevel maParaLevel[ 5 ]; - PPTParaSheet( sal_uInt32 nInstance ); + explicit PPTParaSheet( sal_uInt32 nInstance ); PPTParaSheet( const PPTParaSheet& rParaSheet ); void Read( @@ -945,7 +945,7 @@ struct PPTCharPropSet void SetFont( sal_uInt16 nFont ); void SetColor( sal_uInt32 nColor ); - PPTCharPropSet( sal_uInt32 nParagraph ); + explicit PPTCharPropSet( sal_uInt32 nParagraph ); PPTCharPropSet( PPTCharPropSet& rCharPropSet ); PPTCharPropSet( PPTCharPropSet& rCharPropSet, sal_uInt32 nParagraph ); ~PPTCharPropSet(); @@ -1204,7 +1204,7 @@ struct ImplPPTTextObj sal_uInt32 mnTextFlags; - ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; + explicit ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; }; class PPTTextObj diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx index 85fc4b637570..044e3752c55b 100644 --- a/svx/inc/svx/svditer.hxx +++ b/svx/inc/svx/svditer.hxx @@ -55,7 +55,7 @@ class SVX_DLLPUBLIC SdrObjListIter void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, bool bUseZOrder); public: - SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); /** This variant lets the user choose the order in which to travel over the objects. @param bUseZOrder @@ -67,10 +67,10 @@ public: /* SJ: the following function can now be used with every SdrObject and is no longer limited to group objects */ - SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); /** Iterates over a list of marked objects received from the SdrMarkView. */ - SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); void Reset() { mnIndex = (mbReverse ? maObjList.size() : 0L); } bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.size())); } |