diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-10-05 17:10:47 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-05 20:30:59 +0100 |
commit | 56a5734b06e0f252722153d2e6af680fd9e6e429 (patch) | |
tree | f5e6653d3cfdc0e51baf962cec98f05ccb04e640 /filter | |
parent | 91ff5501892f8c3b11d4d5381e2f3efb5f289da6 (diff) |
cppcheck: noExplicitConstructor
Change-Id: I80950aaf1385bd76b012eab7866fd16848751f45
Diffstat (limited to 'filter')
55 files changed, 141 insertions, 146 deletions
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 730671d79266..3d58adc63383 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -67,7 +67,7 @@ class ConfigFlush : public BaseLock /** @short standard ctor. */ - ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + explicit ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 2bb1eb51a1b8..5b45faf0cf5d 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -53,7 +53,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine @param rxContext reference to the uno service manager, which created this service instance. */ - ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); + explicit ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 9adeb638677b..0144bf545eb5 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -54,7 +54,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer @param rxContext reference to the uno service manager, which created this service instance. */ - FilterFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); + explicit FilterFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index c93fe1acceac..bd477e20c8b4 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -53,7 +53,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer @param rxContext reference to the uno service manager, which created this service instance. */ - FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); + explicit FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 823836f957e5..6ddf8dd1b28d 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -78,7 +78,7 @@ class QueryTokenizer : public std::unordered_map< OUString , @param sQuery the query string. */ - QueryTokenizer(const OUString& sQuery); + explicit QueryTokenizer(const OUString& sQuery); diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 4d8cc6d408a9..0449a488d3cd 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -343,7 +343,7 @@ class FindByType : std::unary_function<FlatDetectionInfo, bool> { OUString maType; public: - FindByType(const OUString& rType) : maType(rType) {} + explicit FindByType(const OUString& rType) : maType(rType) {} bool operator() (const FlatDetectionInfo& rInfo) const { return rInfo.sType == maType; diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 08a17bc7c1c3..194aadf8c3b4 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -53,7 +53,7 @@ public: @param rxContext reference to the uno service manager, which created this service instance. */ - TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext); + explicit TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext); diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index e004c15d0506..66792bd97e2e 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -71,7 +71,7 @@ protected: public: - SWFDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit SWFDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~SWFDialog(); }; diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index b51a4bc5e2ae..5fd0e6e231b8 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -67,9 +67,9 @@ class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStr osl::File mrFile; public: - OslOutputStreamWrapper(const OUString& sFileName) : mrFile(sFileName) + explicit OslOutputStreamWrapper(const OUString& rFileName) : mrFile(rFileName) { - osl_removeFile(sFileName.pData); + osl_removeFile(rFileName.pData); mrFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } @@ -155,7 +155,7 @@ class FlashExportFilter : public cppu::WeakImplHelper bool mbExportSelection; public: - FlashExportFilter( const Reference< XComponentContext > &rxContext); + explicit FlashExportFilter( const Reference< XComponentContext > &rxContext); // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 64a3dac40f54..b6490352d5cd 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -176,7 +176,7 @@ typedef std::vector<FlashFont*> FontMap; class Tag : public SvMemoryStream { public: - Tag( sal_uInt8 nTagId ); + explicit Tag( sal_uInt8 nTagId ); sal_uInt8 getTagId() const { return mnTagId; } @@ -207,7 +207,7 @@ private: class Sprite { public: - Sprite( sal_uInt16 nId ); + explicit Sprite( sal_uInt16 nId ); ~Sprite(); void write( SvStream& out ); @@ -228,7 +228,7 @@ public: enum FillStyleType { solid = 0x00, linear_gradient = 0x10, radial_gradient = 0x12, tiled_bitmap = 0x40, clipped_bitmap = 0x41 }; /** this c'tor creates a solid fill style */ - FillStyle( const Color& rSolidColor ); + explicit FillStyle( const Color& rSolidColor ); /** this c'tor creates a linear or radial gradient fill style */ FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient ); diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 2ac0c0f098b1..0101329f4fc9 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -67,7 +67,7 @@ class GIFWriter public: - GIFWriter(SvStream &rStream); + explicit GIFWriter(SvStream &rStream); ~GIFWriter() {} bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem ); diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index f848c803b005..b6e64d98f77c 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -46,7 +46,7 @@ private: css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: - PBMWriter(SvStream &rPBM); + explicit PBMWriter(SvStream &rPBM); ~PBMWriter(); bool WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index d27e7c199668..85a1376228fd 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -46,7 +46,7 @@ private: css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: - PGMWriter(SvStream &rStream); + explicit PGMWriter(SvStream &rStream); ~PGMWriter(); bool WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 8210edf801de..24e72fad40d9 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -46,8 +46,8 @@ private: css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: - PPMWriter(SvStream &rStrm); - ~PPMWriter(); + explicit PPMWriter(SvStream &rStrm); + ~PPMWriter(); bool WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); }; diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 1f23212f56f6..32a8994e2b74 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -49,7 +49,7 @@ private: void ImplPutByte( sal_uInt8 ); // RLE decoding public: - RASWriter(SvStream &rStream); + explicit RASWriter(SvStream &rStream); ~RASWriter(); bool WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index afc51cd46dd1..408f454b7f72 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -107,7 +107,7 @@ private: public: - TIFFWriter(SvStream &rStream); + explicit TIFFWriter(SvStream &rStream); ~TIFFWriter(); bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index ade42797383c..7dee4175cf6e 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -47,7 +47,7 @@ private: void ImplWritePixel( sal_uLong ) const; public: - XPMWriter(SvStream& rOStm); + explicit XPMWriter(SvStream& rOStm); ~XPMWriter(); bool WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx index 732a3d41467d..d60a7d825009 100644 --- a/filter/source/graphicfilter/icgm/bitmap.hxx +++ b/filter/source/graphicfilter/icgm/bitmap.hxx @@ -73,17 +73,17 @@ class CGMBitmapDescriptor class CGMBitmap { - CGM* mpCGM; - CGMBitmapDescriptor* pCGMBitmapDescriptor; - bool ImplGetDimensions( CGMBitmapDescriptor& ); - void ImplSetCurrentPalette( CGMBitmapDescriptor& ); - void ImplGetBitmap( CGMBitmapDescriptor& ); - void ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest ); - public: - CGMBitmap( CGM& rCGM ); - ~CGMBitmap(); - CGMBitmapDescriptor* GetBitmap() { return pCGMBitmapDescriptor;} - CGMBitmap* GetNext(); + CGM* mpCGM; + CGMBitmapDescriptor* pCGMBitmapDescriptor; + bool ImplGetDimensions( CGMBitmapDescriptor& ); + void ImplSetCurrentPalette( CGMBitmapDescriptor& ); + void ImplGetBitmap( CGMBitmapDescriptor& ); + void ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest ); +public: + explicit CGMBitmap( CGM& rCGM ); + ~CGMBitmap(); + CGMBitmapDescriptor* GetBitmap() { return pCGMBitmapDescriptor;} + CGMBitmap* GetNext(); }; #endif diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index 6c66bd569506..fc7acaca30d0 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -126,8 +126,8 @@ class CGMElements // Delimiter Counts -> which will be increased by each 'begin' operation // and decreased by each 'end' operation bool bSegmentCount; - CGMElements( CGM& rCGM ); - ~CGMElements(); + explicit CGMElements( CGM& rCGM ); + ~CGMElements(); CGMElements& operator=( CGMElements& ); void Init(); static Bundle* GetBundleIndex( long nIndex, BundleList&, Bundle& ); diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index ecd6179c1fef..a7e24e73ab56 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -61,7 +61,7 @@ protected: CGM* mpCGM; public: - CGMOutAct( CGM& rCGM ); + explicit CGMOutAct( CGM& rCGM ); virtual ~CGMOutAct(); void FirstOutPut() { mpCGM->mbFirstOutPut = false; } ; virtual void InsertPage() { mnCurrentPage++; } ; diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index e8429b53bd73..de7e1c7a11ad 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -27,10 +27,8 @@ class DXFGroupReader { - public: - - DXFGroupReader( SvStream & rIStream ); + explicit DXFGroupReader( SvStream & rIStream ); bool GetStatus() const; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index d7cf94145333..adc61dc2f5d7 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -44,8 +44,8 @@ private: bool ImplReadHeader(); public: - PBMReader(SvStream & rPBM); - ~PBMReader(); + explicit PBMReader(SvStream & rPBM); + ~PBMReader(); bool ReadPBM(Graphic & rGraphic ); }; diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index a5f9ad5b9185..1d3a89ddd744 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -76,7 +76,7 @@ private: public: - PCDReader(SvStream &rStream) + explicit PCDReader(SvStream &rStream) : bStatus(false) , nLastPercent(0) , m_rPCD(rStream) diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index a14e85b145d5..ce12b6476abb 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -51,8 +51,8 @@ private: void ImplReadHeader(); public: - PCXReader(SvStream &rStream); - ~PCXReader(); + explicit PCXReader(SvStream &rStream); + ~PCXReader(); bool ReadPCX(Graphic & rGraphic ); // Reads a PCX file from the stream and fills the GDIMetaFile }; diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 9d92ab58cbba..953c966c3933 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -77,7 +77,7 @@ private: bool ImplReadHeader(); public: - PSDReader(SvStream &rStream); + explicit PSDReader(SvStream &rStream); ~PSDReader(); bool ReadPSD(Graphic & rGraphic); }; diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index e3209bd74109..b569d5b27273 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -57,8 +57,8 @@ private: sal_uInt8 ImplGetByte(); public: - RASReader(SvStream &rRAS); - ~RASReader(); + explicit RASReader(SvStream &rRAS); + ~RASReader(); bool ReadRAS(Graphic & rGraphic); }; diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 1fd3df839eac..c6abd015e96d 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -100,8 +100,8 @@ private: bool ImplReadBody(); public: - TGAReader(SvStream &rTGA); - ~TGAReader(); + explicit TGAReader(SvStream &rTGA); + ~TGAReader(); bool ReadTGA(Graphic &rGraphic); }; diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index e0486773bf39..4e97311998f6 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -108,90 +108,87 @@ class EscherExHostAppData; class ImplEESdrWriter { protected: - EscherEx* mpEscherEx; - MapMode maMapModeSrc; - MapMode maMapModeDest; + EscherEx* mpEscherEx; + MapMode maMapModeSrc; + MapMode maMapModeDest; - css::uno::Reference< css::task::XStatusIndicator > mXStatusIndicator; - css::uno::Reference< css::drawing::XDrawPage > mXDrawPage; - css::uno::Reference< css::drawing::XShapes > mXShapes; + css::uno::Reference< css::task::XStatusIndicator > mXStatusIndicator; + css::uno::Reference< css::drawing::XDrawPage > mXDrawPage; + css::uno::Reference< css::drawing::XShapes > mXShapes; - SvStream* mpPicStrm; + SvStream* mpPicStrm; - // own extensions + // own extensions - EscherExHostAppData* mpHostAppData; + EscherExHostAppData* mpHostAppData; - sal_uInt32 mnPagesWritten; + sal_uInt32 mnPagesWritten; - sal_uInt32 mnShapeMasterTitle; - sal_uInt32 mnShapeMasterBody; + sal_uInt32 mnShapeMasterTitle; + sal_uInt32 mnShapeMasterBody; - // per page values - sal_uInt32 mnIndices; - sal_uInt32 mnOutlinerCount; - sal_uInt32 mnPrevTextStyle; - sal_uInt32 mnStatMaxValue; + // per page values + sal_uInt32 mnIndices; + sal_uInt32 mnOutlinerCount; + sal_uInt32 mnPrevTextStyle; + sal_uInt32 mnStatMaxValue; - sal_uInt16 mnEffectCount; + sal_uInt16 mnEffectCount; - bool mbIsTitlePossible; - bool mbStatusIndicator; - bool mbStatus; + bool mbIsTitlePossible; + bool mbStatusIndicator; + bool mbStatus; - ImplEESdrWriter( EscherEx& rEx ); + explicit ImplEESdrWriter( EscherEx& rEx ); - bool ImplInitPageValues(); + bool ImplInitPageValues(); - void ImplWritePage( - EscherSolverContainer& rSolver, - ImplEESdrPageType ePageType, - bool bBackGround = false ); + void ImplWritePage( + EscherSolverContainer& rSolver, + ImplEESdrPageType ePageType, + bool bBackGround = false ); - sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj, - EscherSolverContainer& rSolver, - ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID + sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj, + EscherSolverContainer& rSolver, + ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID - static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt ); - void ImplWriteAdditionalText( - ImplEESdrObject& rObj, - const Point& rTextRefPoint ); - sal_uInt32 ImplEnterAdditionalTextGroup( - const css::uno::Reference< css::drawing::XShape >& rShape, - const Rectangle* pBoundRect = NULL ); + static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt ); + void ImplWriteAdditionalText( + ImplEESdrObject& rObj, + const Point& rTextRefPoint ); + sal_uInt32 ImplEnterAdditionalTextGroup( + const css::uno::Reference< css::drawing::XShape >& rShape, + const Rectangle* pBoundRect = NULL ); public: - Point ImplMapPoint( const Point& rPoint ); - Size ImplMapSize( const Size& rSize ); - EscherExHostAppData* ImplGetHostData() { return mpHostAppData; } + Point ImplMapPoint( const Point& rPoint ); + Size ImplMapSize( const Size& rSize ); + EscherExHostAppData* ImplGetHostData() { return mpHostAppData; } }; - - - class SdrObject; class SdrPage; class ImplEscherExSdr : public ImplEESdrWriter { private: - const SdrPage* mpSdrPage; - EscherSolverContainer* mpSolverContainer; + const SdrPage* mpSdrPage; + EscherSolverContainer* mpSolverContainer; public: - ImplEscherExSdr( EscherEx& rEx ); - virtual ~ImplEscherExSdr(); + explicit ImplEscherExSdr( EscherEx& rEx ); + virtual ~ImplEscherExSdr(); - bool ImplInitPage( const SdrPage& rPage ); - bool ImplInitUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); - void ImplWriteCurrentPage(); + bool ImplInitPage( const SdrPage& rPage ); + bool ImplInitUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); + void ImplWriteCurrentPage(); - sal_uInt32 ImplWriteTheShape( ImplEESdrObject& rObj, bool ooxmlExport = false ); + sal_uInt32 ImplWriteTheShape( ImplEESdrObject& rObj, bool ooxmlExport = false ); - void ImplExitPage(); - void ImplFlushSolverContainer(); + void ImplExitPage(); + void ImplFlushSolverContainer(); }; diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index e409e05eceb4..0e44b23d0fa1 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -36,21 +36,21 @@ class Impl_OlePres sal_uInt8* pJob; Size aSize; // Groesse in 100TH_MM public: - Impl_OlePres( SotClipboardFormatId nF ) - : nFormat( nF ) - , nAspect( ASPECT_CONTENT ) - , pBmp( NULL ) - , pMtf( NULL ) - , nAdvFlags( 0x2 ) // in Dokument gefunden - , nJobLen( 0 ) - , pJob( NULL ) - {} - ~Impl_OlePres() - { - delete pJob; - delete pBmp; - delete pMtf; - } + explicit Impl_OlePres( SotClipboardFormatId nF ) + : nFormat( nF ) + , nAspect( ASPECT_CONTENT ) + , pBmp( NULL ) + , pMtf( NULL ) + , nAdvFlags( 0x2 ) // in Dokument gefunden + , nJobLen( 0 ) + , pJob( NULL ) + {} + ~Impl_OlePres() + { + delete pJob; + delete pBmp; + delete pMtf; + } void SetMtf( const GDIMetaFile & rMtf ) { if( pMtf ) diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 62f419c83529..813dd2acfb6a 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -62,7 +62,7 @@ namespace filter { public: - OdfFlatXml(const Reference<XComponentContext> &r) : + explicit OdfFlatXml(const Reference<XComponentContext> &r) : m_xContext(r) { } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 2eeaf7599dae..39633df93b12 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -51,7 +51,7 @@ class ImpPDFTabLinksPage; class PDFFilterResId : public ResId { public: - PDFFilterResId( sal_uInt32 nId ); + explicit PDFFilterResId( sal_uInt32 nId ); }; class ImplErrorDialog : public MessageDialog @@ -61,7 +61,7 @@ class ImplErrorDialog : public MessageDialog DECL_LINK(SelectHdl, void *); public: - ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); + explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); virtual ~ImplErrorDialog(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 9ec8d6e69736..c587a0c26a44 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -67,7 +67,7 @@ protected: public: - PDFDialog( const Reference< XComponentContext >& rxContext ); + explicit PDFDialog( const Reference< XComponentContext >& rxContext ); virtual ~PDFDialog(); }; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index eff86c9c2c19..0881c7389340 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -969,7 +969,7 @@ class PDFErrorRequest : private cppu::BaseMutex, { task::PDFExportException maExc; public: - PDFErrorRequest( const task::PDFExportException& i_rExc ); + explicit PDFErrorRequest( const task::PDFExportException& i_rExc ); // XInteractionRequest virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 0884d5bce1f8..99348b33e536 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -83,7 +83,7 @@ protected: public: - PDFFilter( const Reference< XComponentContext >& rxContext ); + explicit PDFFilter( const Reference< XComponentContext >& rxContext ); virtual ~PDFFilter(); }; diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx index 4c7f2a7a9d72..de723ed37be3 100644 --- a/filter/source/placeware/exporter.hxx +++ b/filter/source/placeware/exporter.hxx @@ -32,7 +32,7 @@ class PageEntry; class PlaceWareExporter { public: - PlaceWareExporter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit PlaceWareExporter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~PlaceWareExporter(); bool doExport( css::uno::Reference< css::lang::XComponent > xDoc, diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index b56d403d205c..9b9fec8a9d18 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -53,7 +53,7 @@ class PlaceWareExportFilter : public cppu::WeakImplHelper Reference< XComponentContext > mxContext; public: - PlaceWareExportFilter( const Reference< XComponentContext > &rxContext); + explicit PlaceWareExportFilter( const Reference< XComponentContext > &rxContext); // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx index 38b03f0f566e..c8595ae17bb2 100644 --- a/filter/source/placeware/tempfile.hxx +++ b/filter/source/placeware/tempfile.hxx @@ -26,7 +26,7 @@ class PlaceWareTempFile : public osl::File { public: - PlaceWareTempFile( const OUString& aURL ); + explicit PlaceWareTempFile( const OUString& aURL ); ~PlaceWareTempFile(); static OUString createTempFileURL(); diff --git a/filter/source/placeware/zip.hxx b/filter/source/placeware/zip.hxx index 92711455d004..99dc576e177f 100644 --- a/filter/source/placeware/zip.hxx +++ b/filter/source/placeware/zip.hxx @@ -31,7 +31,7 @@ struct ZipEntry; class PlacewareZipFile { public: - PlacewareZipFile( osl::File& rFile ); + explicit PlacewareZipFile( osl::File& rFile ); ~PlacewareZipFile(); bool addFile( osl::File& rFile, const OString& rName ); diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx index 73d0f9c9069a..85c2a9ed46a6 100644 --- a/filter/source/storagefilterdetect/filterdetect.hxx +++ b/filter/source/storagefilterdetect/filterdetect.hxx @@ -36,7 +36,7 @@ class StorageFilterDetect : public cppu::WeakImplHelper< public: - StorageFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); + explicit StorageFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); virtual ~StorageFilterDetect(); // XExtendedFilterDetection diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 9310db89456c..953c0333906a 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -127,7 +127,7 @@ namespace struct definition { ::boost::spirit::classic::rule< ScannerT > colorExpression; - definition( const ColorGrammar& self ) + explicit definition( const ColorGrammar& self ) { using namespace ::boost::spirit::classic; diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 7d17095639d6..a3aeed32758f 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -73,7 +73,7 @@ protected: public: - SVGDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit SVGDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~SVGDialog(); }; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 8f46efd7bce8..46730a20ddc3 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -210,7 +210,7 @@ class SVGTextWriter vcl::Font maParentFont; public: - SVGTextWriter( SVGExport& rExport ); + explicit SVGTextWriter( SVGExport& rExport ); virtual ~SVGTextWriter(); sal_Int32 setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nCurAction ); diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 4ab091bc4cc3..e9a90955994e 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -138,7 +138,7 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); + explicit T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); }; @@ -254,8 +254,8 @@ private: throw (css::uno::RuntimeException); public: - T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); - T602ImportFilter(css::uno::Reference<css::io::XInputStream> xInputStream); + explicit T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); + explicit T602ImportFilter(css::uno::Reference<css::io::XInputStream> xInputStream); virtual ~T602ImportFilter(); // XFilter diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 61d80de2de15..3b2983b1b7f6 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -36,7 +36,7 @@ class PlainTextFilterDetect : public cppu::WeakImplHelper< public: - PlainTextFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); + explicit PlainTextFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); virtual ~PlainTextFilterDetect(); // XExtendedFilterDetection diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index 67cabf5e46a0..aee1cc236864 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -71,7 +71,7 @@ protected: public: - XmlFilterAdaptor( const css::uno::Reference< css::uno::XComponentContext > & rxContext) + explicit XmlFilterAdaptor( const css::uno::Reference< css::uno::XComponentContext > & rxContext) : mxContext(rxContext) , meType(FILTER_IMPORT) { diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index efc2703b78d6..d1ea5ad31ead 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -42,7 +42,7 @@ class OOutputStreamWrapper : public OutputStreamWrapper_Base ::osl::File& rStream; public: - OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { } + explicit OOutputStreamWrapper(osl::File& _rStream) :rStream(_rStream) { } // css::io::XOutputStream virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 301684e78a4b..de55eaac06d6 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -40,7 +40,7 @@ protected: css::uno::Reference< css::uno::XComponentContext > mxCtx; public: - FilterDetect( const css::uno::Reference< css::uno::XComponentContext > &rxCtx) + explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext > &rxCtx) : mxCtx( rxCtx ) {} virtual ~FilterDetect() {} diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx index a77af76c5555..dcb0ca068968 100644 --- a/filter/source/xsltdialog/typedetectionexport.hxx +++ b/filter/source/xsltdialog/typedetectionexport.hxx @@ -28,7 +28,7 @@ class TypeDetectionExporter { public: - TypeDetectionExporter( css::uno::Reference< css::uno::XComponentContext >& mxContext ); + explicit TypeDetectionExporter( css::uno::Reference< css::uno::XComponentContext >& mxContext ); void doExport(css::uno::Reference < css::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 52da685dd82e..44aa2b8e5c52 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -68,7 +68,7 @@ class XMLFilterDialogComponent : public XMLFilterDialogComponentBase, public XTerminateListener { public: - XMLFilterDialogComponent( const Reference< XComponentContext >& rxContext ); + explicit XMLFilterDialogComponent( const Reference< XComponentContext >& rxContext ); virtual ~XMLFilterDialogComponent(); protected: diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index eed841eaf684..9372940d7ab5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -32,7 +32,7 @@ typedef std::vector< filter_info_impl* > XMLFilterVector; class XMLFilterJarHelper { public: - XMLFilterJarHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit XMLFilterJarHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters ); void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index bb8335025954..1eebb9c110f6 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -46,7 +46,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - SvxPathControl(vcl::Window* pParent); + explicit SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } virtual ~SvxPathControl(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index 439ad6ffe8a6..6bd2b91b52bd 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -32,7 +32,7 @@ class filter_info_impl; class XMLFilterTabPageBasic : public TabPage { public: - XMLFilterTabPageBasic(vcl::Window* pParent); + explicit XMLFilterTabPageBasic(vcl::Window* pParent); virtual ~XMLFilterTabPageBasic(); virtual void dispose() SAL_OVERRIDE; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 6ec26deffedf..5a1f29a090f2 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -33,7 +33,7 @@ class filter_info_impl; class XMLFilterTabPageXSLT : public TabPage { public: - XMLFilterTabPageXSLT( vcl::Window* pParent); + explicit XMLFilterTabPageXSLT(vcl::Window* pParent); virtual ~XMLFilterTabPageXSLT(); virtual void dispose() SAL_OVERRIDE; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index c619fe0c73b3..e6f149b906e1 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star::xml::sax; class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< css::document::XDocumentEventListener > { public: - GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); + explicit GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); // XDocumentEventListener virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index b2eca68443ff..71442c743e42 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -126,7 +126,7 @@ namespace XSLT public: // ctor... - XSLTFilter(const css::uno::Reference<XComponentContext> &r); + explicit XSLTFilter(const css::uno::Reference<XComponentContext> &r); // XStreamListener virtual void SAL_CALL |