[Libreoffice-commits] core.git: 3 commits - basic/source sfx2/source svtools/source sw/source unoidl/source uui/source vcl/generic xmlhelp/source xmloff/source

Caolán McNamara caolanm at redhat.com
Tue Jun 2 00:58:19 PDT 2015


 basic/source/basmgr/basmgr.cxx                    |    8 ++++----
 basic/source/basmgr/vbahelper.cxx                 |    2 +-
 basic/source/classes/sb.cxx                       |    2 +-
 basic/source/classes/sbunoobj.cxx                 |    6 +++---
 basic/source/classes/sbxmod.cxx                   |    2 +-
 basic/source/runtime/comenumwrapper.hxx           |    2 +-
 basic/source/runtime/iosys.cxx                    |    4 ++--
 basic/source/sbx/sbxdec.hxx                       |    2 +-
 basic/source/sbx/sbxres.hxx                       |    2 +-
 basic/source/sbx/sbxscan.cxx                      |    2 +-
 sfx2/source/dialog/templdlg.cxx                   |    3 +--
 sfx2/source/doc/ownsubfilterservice.cxx           |    2 +-
 sfx2/source/doc/plugin.cxx                        |    2 +-
 sfx2/source/doc/printhelper.cxx                   |   14 +++++++-------
 sfx2/source/doc/sfxbasemodel.cxx                  |    6 +++---
 sfx2/source/explorer/nochaos.cxx                  |    2 +-
 sfx2/source/notify/globalevents.cxx               |    2 +-
 sfx2/source/sidebar/Accessible.hxx                |    2 +-
 sfx2/source/sidebar/AccessibleTitleBar.hxx        |    2 +-
 svtools/source/brwbox/datwin.hxx                  |    2 +-
 svtools/source/config/colorcfg.cxx                |    2 +-
 svtools/source/config/extcolorcfg.cxx             |    2 +-
 svtools/source/config/printoptions.cxx            |    2 +-
 svtools/source/contnr/contentenumeration.hxx      |    4 ++--
 svtools/source/contnr/imivctl.hxx                 |    6 +++---
 svtools/source/contnr/treelist.cxx                |    4 ++--
 svtools/source/contnr/treelistbox.cxx             |    2 +-
 svtools/source/contnr/treelistentry.cxx           |    2 +-
 svtools/source/control/calendar.cxx               |    2 +-
 svtools/source/control/ctrlbox.cxx                |    4 ++--
 svtools/source/control/roadmap.cxx                |    2 +-
 svtools/source/control/toolbarmenuimp.hxx         |    4 ++--
 svtools/source/control/valueimp.hxx               |    2 +-
 svtools/source/filter/SvFilterOptionsDialog.cxx   |    2 +-
 svtools/source/graphic/graphicunofactory.cxx      |    2 +-
 svtools/source/graphic/grfcache.cxx               |    4 ++--
 svtools/source/hatchwindow/documentcloser.cxx     |    4 ++--
 svtools/source/misc/ehdl.cxx                      |    2 +-
 svtools/source/misc/embedhlp.cxx                  |    2 +-
 svtools/source/misc/templatefoldercache.cxx       |    8 ++++----
 svtools/source/table/cellvalueconversion.cxx      |   12 ++++++------
 svtools/source/table/gridtablerenderer.cxx        |    2 +-
 svtools/source/table/tablecontrol_impl.cxx        |    2 +-
 svtools/source/table/tablecontrol_impl.hxx        |   18 +++++++++---------
 svtools/source/table/tabledatawindow.hxx          |    2 +-
 svtools/source/toolpanel/paneltabbar.cxx          |    8 ++++----
 svtools/source/toolpanel/paneltabbarpeer.hxx      |    2 +-
 svtools/source/toolpanel/tabbargeometry.hxx       |    2 +-
 svtools/source/toolpanel/toolpaneldeck.cxx        |    2 +-
 svtools/source/toolpanel/toolpaneldeckpeer.hxx    |    2 +-
 svtools/source/toolpanel/toolpaneldrawer.hxx      |    2 +-
 svtools/source/toolpanel/toolpaneldrawerpeer.cxx  |    2 +-
 svtools/source/uno/addrtempuno.cxx                |    2 +-
 svtools/source/uno/treecontrolpeer.cxx            |    6 +++---
 svtools/source/uno/unogridcolumnfacade.cxx        |    2 +-
 svtools/source/uno/unoimap.cxx                    |    2 +-
 sw/source/core/layout/flycnt.cxx                  |   12 ++++++++++--
 sw/source/ui/dialog/swdlgfact.hxx                 |    8 ++++----
 unoidl/source/sourceprovider-scanner.hxx          |    2 +-
 uui/source/passwordcontainer.hxx                  |    2 +-
 vcl/generic/fontmanager/parseAFM.cxx              |    2 +-
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |    2 +-
 xmloff/source/text/XMLRedlineExport.hxx           |    2 +-
 63 files changed, 118 insertions(+), 111 deletions(-)

New commits:
commit 32fc5f1605dc2ce224074e88bea6aa548d450287
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 2 08:46:29 2015 +0100

    cppcheck: redundantAssignment
    
    Change-Id: Icca51c730aa361e6a886358c396d4804501139ad

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e7952ca..8da0870 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1806,12 +1806,11 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM
 sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh )
 {
     OSL_ENSURE( i_pObjSh, "SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
-    sal_Int32 nFilter = -1;
 
     ::comphelper::SequenceAsHashMap aFactoryProps(
         xModuleManager->getByName( getModuleIdentifier( xModuleManager, i_pObjSh ) ) );
     sal_Int32 nDefault = -1;
-    nFilter = aFactoryProps.getUnpackedValueOrDefault( "ooSetupFactoryStyleFilter", nDefault );
+    sal_Int32 nFilter = aFactoryProps.getUnpackedValueOrDefault( "ooSetupFactoryStyleFilter", nDefault );
 
     m_bWantHierarchical =
         (nFilter & SFXSTYLEBIT_HIERARCHY) != 0;
commit 8e22cd40ec9f7d97bde49dd4c8593fc5bfb52e29
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 1 21:04:06 2015 +0100

    cppcheck: noExplicitConstructor
    
    Change-Id: I8ae8623252546ca94f65fc04b331dd9cafa4fc92

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index b00cbab..c7a8476 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1794,7 +1794,7 @@ class ModuleContainer_Impl : public NameContainerHelper
     StarBASIC* mpLib;
 
 public:
-    ModuleContainer_Impl( StarBASIC* pLib )
+    explicit ModuleContainer_Impl( StarBASIC* pLib )
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
@@ -1945,7 +1945,7 @@ class DialogContainer_Impl : public NameContainerHelper
     StarBASIC* mpLib;
 
 public:
-    DialogContainer_Impl( StarBASIC* pLib )
+    explicit DialogContainer_Impl( StarBASIC* pLib )
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
@@ -2102,7 +2102,7 @@ class LibraryContainer_Impl : public NameContainerHelper
     BasicManager* mpMgr;
 
 public:
-    LibraryContainer_Impl( BasicManager* pMgr )
+    explicit LibraryContainer_Impl( BasicManager* pMgr )
         :mpMgr( pMgr ) {}
 
     // Methods XElementAccess
@@ -2251,7 +2251,7 @@ class StarBasicAccess_Impl : public StarBasicAccessHelper
     uno::Reference< container::XNameContainer > mxLibContainer;
 
 public:
-    StarBasicAccess_Impl( BasicManager* pMgr )
+    explicit StarBasicAccess_Impl( BasicManager* pMgr )
         :mpMgr( pMgr ) {}
 
 public:
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index dbd82c8..c61b0e9 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -55,7 +55,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager()
 class DocumentsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
 public:
-    DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel );
+    explicit DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel );
     virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE;
 private:
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 01e6d94..647e212 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1179,7 +1179,7 @@ struct ClassModuleRunInitItem
         , m_bProcessing( false )
         , m_bRunInitDone( false )
     {}
-    ClassModuleRunInitItem( SbModule* pModule )
+    explicit ClassModuleRunInitItem( SbModule* pModule )
         : m_pModule( pModule )
         , m_bProcessing( false )
         , m_bRunInitDone( false )
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index ca2587f..6bc596f 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -457,7 +457,7 @@ struct ObjectItem
 {
     SbxObjectRef    m_xNativeObj;
 
-    ObjectItem( SbxObject* pNativeObj )
+    explicit ObjectItem( SbxObject* pNativeObj )
         : m_xNativeObj( pNativeObj )
     {}
 };
@@ -3896,7 +3896,7 @@ public:
     SbxObjectRef    xSbxObj;
     OUString        aPrefixName;
 
-    BasicAllListener_Impl( const OUString& aPrefixName );
+    explicit BasicAllListener_Impl( const OUString& aPrefixName );
     virtual ~BasicAllListener_Impl();
 
     // Methods of XAllListener
@@ -4590,7 +4590,7 @@ struct StarBasicDisposeItem
     SbxArrayRef             m_pRegisteredVariables;
     ComponentRefVector      m_vComImplementsObjects;
 
-    StarBasicDisposeItem( StarBASIC* pBasic )
+    explicit StarBasicDisposeItem( StarBASIC* pBasic )
         : m_pBasic( pBasic )
     {
         m_pRegisteredVariables = new SbxArray();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 568340e..81af910 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -99,7 +99,7 @@ class DocObjectWrapper : public DocObjectWrapper_BASE
     OUString mName; // for debugging
 
 public:
-    DocObjectWrapper( SbModule* pMod );
+    explicit DocObjectWrapper( SbModule* pMod );
     virtual ~DocObjectWrapper();
 
     virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
index 30517b5..cb604b9 100644
--- a/basic/source/runtime/comenumwrapper.hxx
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -31,7 +31,7 @@ class ComEnumerationWrapper : public ::cppu::WeakImplHelper1< ::com::sun::star::
     sal_Int32 m_nCurInd;
 
 public:
-    ComEnumerationWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation >& xInvocation )
+    explicit ComEnumerationWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation >& xInvocation )
     : m_xInvocation( xInvocation )
     , m_nCurInd( 0 )
     {
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 40fb2f6..cdc4248 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -413,8 +413,8 @@ class UCBStream : public SvStream
     Reference< XStream >        xS;
     Reference< XSeekable >      xSeek;
 public:
-                        UCBStream( Reference< XInputStream > & xIS );
-                        UCBStream( Reference< XStream > & xS );
+    explicit UCBStream( Reference< XInputStream > & xIS );
+    explicit UCBStream( Reference< XStream > & xS );
                        virtual ~UCBStream();
     virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE;
     virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE;
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index a821c96..1bed80e 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -53,7 +53,7 @@ class SbxDecimal
 public:
     SbxDecimal();
     SbxDecimal( const SbxDecimal& rDec );
-    SbxDecimal( const com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    explicit SbxDecimal( const com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
 
     ~SbxDecimal();
 
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index c635dd2..aafb73d 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -48,7 +48,7 @@
 class SbxRes : public OUString
 {
 public:
-    SbxRes( sal_uInt16 );
+    explicit SbxRes( sal_uInt16 );
 };
 
 const char* GetSbxRes( sal_uInt16 );
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 6ba986d..8a520b4 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -576,7 +576,7 @@ ResMgr* implGetResMgr()
 class SbxValueFormatResId : public ResId
 {
 public:
-    SbxValueFormatResId( sal_uInt16 nId )
+    explicit SbxValueFormatResId( sal_uInt16 nId )
         : ResId( nId, *implGetResMgr() )
     {}
 };
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 27c525a..a3e9f2e 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -41,7 +41,7 @@ class OwnSubFilterService : public cppu::WeakImplHelper2 < document::XFilter
     SfxObjectShell* m_pObjectShell;
 
 public:
-    OwnSubFilterService(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments)
+    explicit OwnSubFilterService(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments)
         throw (uno::Exception, uno::RuntimeException);
 
     virtual ~OwnSubFilterService();
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 987e953..b5b0e14 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -50,7 +50,7 @@ class PluginWindow_Impl : public vcl::Window
 {
 public:
     uno::Reference < awt::XWindow > xWindow;
-    PluginWindow_Impl( vcl::Window* pParent )
+    explicit PluginWindow_Impl(vcl::Window* pParent)
      : Window( pParent, WB_CLIPCHILDREN )
      {}
 
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 452f414..791fbea 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -67,7 +67,7 @@ struct IMPL_PrintListener_DataContainer : public SfxListener
     uno::Reference< com::sun::star::view::XPrintJob>     m_xPrintJob;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aPrintOptions;
 
-    IMPL_PrintListener_DataContainer( ::osl::Mutex& aMutex)
+    explicit IMPL_PrintListener_DataContainer( ::osl::Mutex& aMutex)
             :   m_pObjectShell          ( 0 )
             ,   m_aInterfaceContainer   ( aMutex )
     {
@@ -99,14 +99,14 @@ class SfxPrintJob_Impl : public cppu::WeakImplHelper1
     com::sun::star::view::XPrintJob
 >
 {
-        IMPL_PrintListener_DataContainer* m_pData;
+    IMPL_PrintListener_DataContainer* m_pData;
 
 public:
-        SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData );
-        virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+    explicit SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData );
+    virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable(  ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index d23b10c..cbab9be 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -148,7 +148,7 @@ class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
 public:
     SfxObjectShell& m_rShell;
 
-    SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
+    explicit SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
         : m_rShell(i_rDoc)
     { };
 
@@ -319,7 +319,7 @@ class SfxPrintHelperListener_Impl : public ::cppu::WeakImplHelper1< view::XPrint
 {
 public:
     IMPL_SfxBaseModel_DataContainer* m_pData;
-    SfxPrintHelperListener_Impl( IMPL_SfxBaseModel_DataContainer* pData )
+    explicit SfxPrintHelperListener_Impl( IMPL_SfxBaseModel_DataContainer* pData )
         : m_pData( pData )
     {}
 
@@ -351,7 +351,7 @@ class SfxOwnFramesLocker
 
     static vcl::Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame );
 public:
-    SfxOwnFramesLocker( SfxObjectShell* ObjechShell );
+    explicit SfxOwnFramesLocker( SfxObjectShell* ObjechShell );
     ~SfxOwnFramesLocker();
     void UnlockFrames();
 };
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index b8b81f8..9c0e219 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -44,7 +44,7 @@ private:
     inline void Insert( SfxPoolItem* pItem, sal_uInt16 nSID, SfxItemPoolFlags nFlags );
 
 public:
-    CntStaticPoolDefaults_Impl( CntItemPool* pPool );
+    explicit CntStaticPoolDefaults_Impl( CntItemPool* pPool );
     ~CntStaticPoolDefaults_Impl();
 
     SfxPoolItem**      GetDefaults() const  { return m_ppDefaults; }
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index 25d1514..702f2de 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -94,7 +94,7 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
     GlobalEventConfig* pImp;
 
 public:
-    SfxGlobalEvents_Impl(const css::uno::Reference < css::uno::XComponentContext >& rxContext);
+    explicit SfxGlobalEvents_Impl(const css::uno::Reference < css::uno::XComponentContext >& rxContext);
     virtual ~SfxGlobalEvents_Impl();
 
     virtual OUString SAL_CALL getImplementationName()
diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx
index 790a5f4..6f786f0 100644
--- a/sfx2/source/sidebar/Accessible.hxx
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -47,7 +47,7 @@ class Accessible
       public AccessibleInterfaceBase
 {
 public:
-    Accessible (
+    explicit Accessible (
         const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext);
     virtual ~Accessible();
 
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx
index 2b39c8f..49e68e7 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx
@@ -36,7 +36,7 @@ protected:
     virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE;
 
 private:
-    AccessibleTitleBar (VCLXWindow* pWindow);
+    explicit AccessibleTitleBar (VCLXWindow* pWindow);
     virtual ~AccessibleTitleBar();
 };
 
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 4f5bba2..5260355a 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -136,7 +136,7 @@ public:
     long            m_nDragRowDividerOffset;
 
 public:
-                    BrowserDataWin( BrowseBox* pParent );
+                    explicit BrowserDataWin( BrowseBox* pParent );
     virtual         ~BrowserDataWin();
     virtual void    dispose() SAL_OVERRIDE;
 
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 9689be6..f4d7d35 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -74,7 +74,7 @@ class ColorConfig_Impl : public utl::ConfigItem
     virtual void                    ImplCommit() SAL_OVERRIDE;
 
 public:
-    ColorConfig_Impl(bool bEditMode = false);
+    explicit ColorConfig_Impl(bool bEditMode = false);
     virtual ~ColorConfig_Impl();
 
     void                            Load(const OUString& rScheme);
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 39eeb04..812dcd7 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -80,7 +80,7 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
     virtual void                    ImplCommit() SAL_OVERRIDE;
 
 public:
-    ExtendedColorConfig_Impl(bool bEditMode = false);
+    explicit ExtendedColorConfig_Impl(bool bEditMode = false);
     virtual ~ExtendedColorConfig_Impl();
 
     void                            Load(const OUString& rScheme);
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index ebd578c..e8c9bb3 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -72,7 +72,7 @@ sal_Int32               SvtPrintFileOptions::m_nRefCount = 0;
 class SvtPrintOptions_Impl
 {
 public:
-     SvtPrintOptions_Impl( const OUString& rConfigRoot );
+    explicit SvtPrintOptions_Impl( const OUString& rConfigRoot );
     ~SvtPrintOptions_Impl();
 
     bool        IsReduceTransparency() const ;
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index 60cd274..ead088b 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -151,12 +151,12 @@ namespace svt
 
         FolderDescriptor() { }
 
-        FolderDescriptor( const ::ucbhelper::Content& _rContent )
+        explicit FolderDescriptor( const ::ucbhelper::Content& _rContent )
             :aContent( _rContent )
         {
         }
 
-        FolderDescriptor( const OUString& _rURL )
+        explicit FolderDescriptor( const OUString& _rURL )
             :sURL( _rURL )
         {
         }
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 6161d61..c3e2da9 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -115,7 +115,7 @@ private:
     SvxIconChoiceCtrl_Impl*         _pOwner;
 
 public:
-                            EntryList_Impl( SvxIconChoiceCtrl_Impl* );
+                            explicit EntryList_Impl( SvxIconChoiceCtrl_Impl* );
                             ~EntryList_Impl();
 
     void                    clear();
@@ -577,7 +577,7 @@ class IcnCursor_Impl
                             );
 
 public:
-                            IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner );
+                            explicit IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner );
                             ~IcnCursor_Impl();
     void                    Clear();
 
@@ -613,7 +613,7 @@ class IcnGridMap_Impl
     void                GetMinMapSize( sal_uInt16& rDX, sal_uInt16& rDY ) const;
 
 public:
-                        IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView);
+                        explicit IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView);
                         ~IcnGridMap_Impl();
 
     void                Clear();
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index f1283f2..d6ee88f 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -153,7 +153,7 @@ class FindByPointer : std::unary_function<SvTreeListEntry, bool>
 {
     const SvTreeListEntry* mpEntry;
 public:
-    FindByPointer(const SvTreeListEntry* p) : mpEntry(p) {}
+    explicit FindByPointer(const SvTreeListEntry* p) : mpEntry(p) {}
 
     bool operator() (const SvTreeListEntry& rEntry) const
     {
@@ -1514,7 +1514,7 @@ class SortComparator : public std::binary_function<SvTreeListEntry,SvTreeListEnt
     SvTreeList& mrList;
 public:
 
-    SortComparator( SvTreeList& rList ) : mrList(rList) {}
+    explicit SortComparator( SvTreeList& rList ) : mrList(rList) {}
 
     bool operator() ( const SvTreeListEntry& rLeft, const SvTreeListEntry& rRight ) const
     {
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 1ae2517..f31f8c9 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -364,7 +364,7 @@ struct SvTreeListBoxImpl
     vcl::MnemonicEngine m_aMnemonicEngine;
     vcl::QuickSelectionEngine m_aQuickSelectionEngine;
 
-    SvTreeListBoxImpl(SvTreeListBox& _rBox) :
+    explicit SvTreeListBoxImpl(SvTreeListBox& _rBox) :
         m_bIsEmptyTextAllowed(true),
         m_bEntryMnemonicsEnabled(false),
         m_bDoingQuickSelection(false),
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 3b33cf7..e479b43 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -185,7 +185,7 @@ class FindByPointer : std::unary_function<SvLBoxItem, void>
 {
     const SvLBoxItem* mpItem;
 public:
-    FindByPointer(const SvLBoxItem* p) : mpItem(p) {}
+    explicit FindByPointer(const SvLBoxItem* p) : mpItem(p) {}
     bool operator() (const SvLBoxItem& rItem) const
     {
         return &rItem == mpItem;
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 9f6a7e9..f68514b 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2083,7 +2083,7 @@ private:
     VclPtr<FixedLine>   mpFixedLine;
 
 public:
-                    ImplCFieldFloatWin( vcl::Window* pParent );
+                    explicit ImplCFieldFloatWin( vcl::Window* pParent );
     virtual         ~ImplCFieldFloatWin();
     virtual void    dispose() SAL_OVERRIDE;
 
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 06a4a83..871b5c1 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -66,7 +66,7 @@ public:
     bool        bColor;
 
                 ImplColorListData() : aColor( COL_BLACK ) { bColor = false; }
-                ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; }
+                explicit ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; }
 };
 
 void ColorListBox::ImplInit()
@@ -592,7 +592,7 @@ class ApplyScale : std::unary_function<double, void>
 {
     double mfScale;
 public:
-    ApplyScale( double fScale ) : mfScale(fScale) {}
+    explicit ApplyScale( double fScale ) : mfScale(fScale) {}
     void operator() ( double& rVal )
     {
         rVal *= mfScale;
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index b327eba..9896ad0 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -100,7 +100,7 @@ public:
     bool                m_bPaintInitialized : 1;
 
 public:
-    RoadmapImpl(const ORoadmap& rAntiImpl)
+    explicit RoadmapImpl(const ORoadmap& rAntiImpl)
         : m_rAntiImpl(rAntiImpl)
         , m_iCurItemID(-1)
         , m_bInteractive(true)
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index e26fe49..d6ba740 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -119,7 +119,7 @@ class ToolbarMenuAcc :
 {
 public:
 
-    ToolbarMenuAcc( ToolbarMenu_Impl& rParent );
+    explicit ToolbarMenuAcc( ToolbarMenu_Impl& rParent );
     virtual ~ToolbarMenuAcc();
 
     void                FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
@@ -202,7 +202,7 @@ class ToolbarMenuEntryAcc : public ::comphelper::OBaseMutex,
                             public ToolbarMenuEntryAccBase
 {
 public:
-    ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent );
+    explicit ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent );
     virtual ~ToolbarMenuEntryAcc();
 
     bool    HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 567613d..49a198d 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -61,7 +61,7 @@ struct ValueSetItem
     bool                mbSelected;
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
 
-    ValueSetItem( ValueSet& rParent );
+    explicit ValueSetItem( ValueSet& rParent );
     ~ValueSetItem();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index e273483..f4cc8e9 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -76,7 +76,7 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper5
 
 public:
 
-    SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& _rxORB );
+    explicit SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& _rxORB );
     virtual ~SvFilterOptionsDialog();
 
     // XInterface
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index 478ae49..e195cbe 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -39,7 +39,7 @@ class GObjectImpl : public GObjectAccess_BASE
      ::osl::Mutex m_aMutex;
      std::unique_ptr< GraphicObject > mpGObject;
 public:
-    GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception);
+    explicit GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception);
 
      // XGraphicObject
     virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 85dc714..011f79a 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -48,7 +48,7 @@ private:
 public:
 
 
-                GraphicID( const GraphicObject& rObj );
+                explicit GraphicID( const GraphicObject& rObj );
                 ~GraphicID() {}
 
     bool        operator==( const GraphicID& rID ) const
@@ -161,7 +161,7 @@ private:
 
 public:
 
-                        GraphicCacheEntry( const GraphicObject& rObj );
+                        explicit GraphicCacheEntry( const GraphicObject& rObj );
                         ~GraphicCacheEntry();
 
     const GraphicID&    GetID() const { return maID; }
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 82e2ae3..e7260ab 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -54,7 +54,7 @@ class ODocumentCloser : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::
     bool m_bDisposed;
 
 public:
-    ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments);
+    explicit ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArguments);
     virtual ~ODocumentCloser();
 
 // XComponent
@@ -73,7 +73,7 @@ class MainThreadFrameCloserRequest
     uno::Reference< frame::XFrame > m_xFrame;
 
     public:
-        MainThreadFrameCloserRequest( const uno::Reference< frame::XFrame >& xFrame )
+        explicit MainThreadFrameCloserRequest( const uno::Reference< frame::XFrame >& xFrame )
         : m_xFrame( xFrame )
         {}
 
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index fa8cf14..8ac1174 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -224,7 +224,7 @@ class ResString: public OUString
   public:
     sal_uInt16 GetFlags() const {return nFlags;}
     const OUString & GetString() const {return *this;}
-    ResString( ResId &rId);
+    explicit ResString( ResId &rId);
 };
 
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 5785701..a6e6a71 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -65,7 +65,7 @@ public:
     EmbeddedObjectRef*          pObject;
     sal_Int32                   nState;
 
-                                EmbedEventListener_Impl( EmbeddedObjectRef* p ) :
+                                explicit EmbedEventListener_Impl( EmbeddedObjectRef* p ) :
                                     pObject(p)
                                     , nState(-1)
                                 {}
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index f5eb681..7aa3424 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -139,7 +139,7 @@ namespace svt
         virtual ~TemplateContent();
 
     public:
-        TemplateContent( const INetURLObject& _rURL );
+        explicit TemplateContent( const INetURLObject& _rURL );
 
         // attribute access
         inline OUString                 getURL( ) const                             { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); }
@@ -270,7 +270,7 @@ namespace svt
     {
     protected:
         SvStream&   m_rStorage;
-        StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { }
+        explicit StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { }
     };
 
 
@@ -279,7 +279,7 @@ namespace svt
             :public ::std::unary_function< OUString, void >
             ,public StorageHelper
     {
-        StoreString( SvStream& _rStorage ) : StorageHelper( _rStorage ) { }
+        explicit StoreString( SvStream& _rStorage ) : StorageHelper( _rStorage ) { }
 
         void operator() ( const OUString& _rString ) const
         {
@@ -434,7 +434,7 @@ namespace svt
         bool                            m_bAutoStoreState : 1;
 
     public:
-        TemplateFolderCacheImpl( bool _bAutoStoreState );
+        explicit TemplateFolderCacheImpl( bool _bAutoStoreState );
         ~TemplateFolderCacheImpl( );
 
         bool        needsUpdate( bool _bForceCheck );
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index a5eb770..d634b5c 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -153,7 +153,7 @@ namespace svt
     class DoubleNormalization : public StandardFormatNormalizer
     {
     public:
-        DoubleNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit DoubleNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::NUMBER )
         {
         }
@@ -175,7 +175,7 @@ namespace svt
     class IntegerNormalization : public StandardFormatNormalizer
     {
     public:
-        IntegerNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit IntegerNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::NUMBER )
         {
         }
@@ -196,7 +196,7 @@ namespace svt
     class BooleanNormalization : public StandardFormatNormalizer
     {
     public:
-        BooleanNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit BooleanNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::LOGICAL )
         {
         }
@@ -217,7 +217,7 @@ namespace svt
     class DateTimeNormalization : public StandardFormatNormalizer
     {
     public:
-        DateTimeNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit DateTimeNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::DATETIME )
         {
         }
@@ -251,7 +251,7 @@ namespace svt
     class DateNormalization : public StandardFormatNormalizer
     {
     public:
-        DateNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit DateNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::DATE )
         {
         }
@@ -281,7 +281,7 @@ namespace svt
     class TimeNormalization : public StandardFormatNormalizer
     {
     public:
-        TimeNormalization( Reference< XNumberFormatter > const & i_formatter )
+        explicit TimeNormalization( Reference< XNumberFormatter > const & i_formatter )
             :StandardFormatNormalizer( i_formatter, NumberFormat::TIME )
         {
         }
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index aef6175..0074590 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -110,7 +110,7 @@ namespace svt { namespace table
         CachedSortIndicator aSortIndicator;
         CellValueConversion aStringConverter;
 
-        GridTableRenderer_Impl( ITableModel& _rModel )
+        explicit GridTableRenderer_Impl( ITableModel& _rModel )
             : rModel( _rModel )
             , nCurrentRow( ROW_INVALID )
             , bUseGridLines( true )
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 71c688f..90cf569 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -68,7 +68,7 @@ namespace svt { namespace table
         ITableControl&  m_rTable;
 
     public:
-        SuppressCursor( ITableControl& _rTable )
+        explicit SuppressCursor( ITableControl& _rTable )
             :m_rTable( _rTable )
         {
             m_rTable.hideCursor();
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index feadf1c..9322db0 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -158,7 +158,7 @@ namespace svt { namespace table
         inline        TableControl&   getAntiImpl()       { return m_rAntiImpl; }
 
     public:
-        TableControl_Impl( TableControl& _rAntiImpl );
+        explicit TableControl_Impl( TableControl& _rAntiImpl );
         virtual ~TableControl_Impl();
 
         /** to be called when the anti-impl instance has been resized
@@ -473,16 +473,16 @@ namespace svt { namespace table
         RowPos              m_nCurrentRow;
 
     public:
-        TableFunctionSet(TableControl_Impl* _pTableControl);
+        explicit TableFunctionSet(TableControl_Impl* _pTableControl);
         virtual ~TableFunctionSet();
 
-       virtual void BeginDrag() SAL_OVERRIDE;
-       virtual void CreateAnchor() SAL_OVERRIDE;
-       virtual void DestroyAnchor() SAL_OVERRIDE;
-       virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor) SAL_OVERRIDE;
-       virtual bool IsSelectionAtPoint( const Point& rPoint ) SAL_OVERRIDE;
-       virtual void DeselectAtPoint( const Point& rPoint ) SAL_OVERRIDE;
-       virtual void DeselectAll() SAL_OVERRIDE;
+        virtual void BeginDrag() SAL_OVERRIDE;
+        virtual void CreateAnchor() SAL_OVERRIDE;
+        virtual void DestroyAnchor() SAL_OVERRIDE;
+        virtual bool SetCursorAtPoint(const Point& rPoint, bool bDontSelectAtCursor) SAL_OVERRIDE;
+        virtual bool IsSelectionAtPoint( const Point& rPoint ) SAL_OVERRIDE;
+        virtual void DeselectAtPoint( const Point& rPoint ) SAL_OVERRIDE;
+        virtual void DeselectAll() SAL_OVERRIDE;
     };
 
 
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 36e0587..c18cc5f 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -41,7 +41,7 @@ namespace svt { namespace table
         sal_uLong           m_nTipWindowHandle;
 
     public:
-        TableDataWindow( TableControl_Impl& _rTableControl );
+        explicit TableDataWindow( TableControl_Impl& _rTableControl );
         virtual ~TableDataWindow();
         virtual void dispose() SAL_OVERRIDE;
 
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 6352d4c..b872489 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -105,7 +105,7 @@ namespace svt
     class VCLItemRenderer : public ITabBarRenderer
     {
     public:
-        VCLItemRenderer( OutputDevice& i_rTargetDevice )
+        explicit VCLItemRenderer( OutputDevice& i_rTargetDevice )
             :m_rTargetDevice( i_rTargetDevice )
         {
         }
@@ -180,7 +180,7 @@ namespace svt
     class NWFToolboxItemRenderer : public ITabBarRenderer
     {
     public:
-        NWFToolboxItemRenderer( OutputDevice& i_rTargetDevice )
+        explicit NWFToolboxItemRenderer( OutputDevice& i_rTargetDevice )
             :m_rTargetDevice( i_rTargetDevice )
         {
         }
@@ -257,7 +257,7 @@ namespace svt
     class NWFTabItemRenderer : public ITabBarRenderer
     {
     public:
-        NWFTabItemRenderer( OutputDevice& i_rTargetDevice )
+        explicit NWFTabItemRenderer( OutputDevice& i_rTargetDevice )
             :m_rTargetDevice( i_rTargetDevice )
         {
         }
@@ -479,7 +479,7 @@ namespace svt
         class ClipItemRegion
         {
         public:
-            ClipItemRegion( const PanelTabBar_Impl& i_rImpl )
+            explicit ClipItemRegion( const PanelTabBar_Impl& i_rImpl )
                 :m_rDevice( i_rImpl.m_rTabBar )
             {
                 m_rDevice.Push( PushFlags::CLIPREGION );
diff --git a/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx
index 9e0bc67..76d2704 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.hxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.hxx
@@ -36,7 +36,7 @@ namespace svt
     class PanelTabBarPeer : public VCLXWindow
     {
     public:
-        PanelTabBarPeer( PanelTabBar& i_rTabBar );
+        explicit PanelTabBarPeer( PanelTabBar& i_rTabBar );
 
     protected:
         virtual ~PanelTabBarPeer();
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index ff53575..f783d72 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -80,7 +80,7 @@ namespace svt
     class TabBarGeometry
     {
     public:
-        TabBarGeometry( const TabItemContent i_eItemContent );
+        explicit TabBarGeometry( const TabItemContent i_eItemContent );
         ~TabBarGeometry();
 
         // retrieves the rectangle to be occupied by the button for scrolling backward through the items
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 8544ab1..f6bfeee 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -67,7 +67,7 @@ namespace svt
     class ToolPanelDeck_Impl : public IToolPanelDeckListener
     {
     public:
-        ToolPanelDeck_Impl( ToolPanelDeck& i_rDeck )
+        explicit ToolPanelDeck_Impl( ToolPanelDeck& i_rDeck )
             :m_rDeck( i_rDeck )
             ,m_aPanelAnchor( VclPtr<vcl::Window>::Create(&i_rDeck, WB_DIALOGCONTROL | WB_CHILDDLGCTRL) )
             ,m_aPanels()
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
index 2ced30f..4deeef0 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
@@ -36,7 +36,7 @@ namespace svt
     class ToolPanelDeckPeer : public VCLXWindow
     {
     public:
-        ToolPanelDeckPeer( ToolPanelDeck& i_rDeck );
+        explicit ToolPanelDeckPeer( ToolPanelDeck& i_rDeck );
 
     protected:
         virtual ~ToolPanelDeckPeer();
diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx
index 8bef3a3..c995aac 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.hxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.hxx
@@ -40,7 +40,7 @@ namespace svt
     class DrawerVisualization : public vcl::Window
     {
     public:
-        DrawerVisualization(ToolPanelDrawer& i_rParent);
+        explicit DrawerVisualization(ToolPanelDrawer& i_rParent);
 
     protected:
         // Window overridables
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index 8e83866..21a0d7d 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -57,7 +57,7 @@ namespace svt
     class ToolPanelDrawerContext : public VCLXAccessibleComponent
     {
     public:
-        ToolPanelDrawerContext( VCLXWindow& i_rWindow )
+        explicit ToolPanelDrawerContext( VCLXWindow& i_rWindow )
             :VCLXAccessibleComponent( &i_rWindow )
         {
         }
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index d21a3ba..3fae5f2 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -51,7 +51,7 @@ namespace {
         OUString                     m_sTable;
 
     public:
-        OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB);
+        explicit OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB);
 
         // XTypeProvider
         virtual Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 13f004c..fc65129 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::graphic;
 struct LockGuard
 {
 public:
-    LockGuard( sal_Int32& rLock )
+    explicit LockGuard( sal_Int32& rLock )
     : mrLock( rLock )
     {
         rLock++;
@@ -108,7 +108,7 @@ private:
 class UnoTreeListItem : public SvLBoxString
 {
 public:
-                    UnoTreeListItem( SvTreeListEntry* );
+    explicit        UnoTreeListItem( SvTreeListEntry* );
                     UnoTreeListItem();
     virtual         ~UnoTreeListItem();
     void            InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE;
@@ -611,7 +611,7 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException,
 class TreeSelectionEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
 public:
-    TreeSelectionEnumeration( std::list< Any >& rSelection );
+    explicit TreeSelectionEnumeration( std::list< Any >& rSelection );
     virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception) SAL_OVERRIDE;
     virtual Any SAL_CALL nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE;
 
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 815e2b6..9fa60d1 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -95,7 +95,7 @@ namespace svt { namespace table
                                     ,public ::boost::noncopyable
     {
     public:
-        ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl );
+        explicit ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl );
 
         void dispose();
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index ba7be37..bb0dd93 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -522,7 +522,7 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents()
 class SvUnoImageMap : public WeakImplHelper3< XIndexContainer, XServiceInfo, XUnoTunnel >
 {
 public:
-    SvUnoImageMap( const SvEventDescription* pSupportedMacroItems );
+    explicit SvUnoImageMap( const SvEventDescription* pSupportedMacroItems );
     SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems );
     virtual ~SvUnoImageMap();
 
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 3198bed..c794b3d 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -131,7 +131,7 @@ class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
 class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog
 {
 public:
-    AbstractApplyTabDialog_Impl( SfxTabDialog* p)
+    explicit AbstractApplyTabDialog_Impl( SfxTabDialog* p)
         : AbstractTabDialog_Impl(p)
     {
     }
@@ -354,9 +354,9 @@ class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard
 
     DECL_LINK( EndDialogHdl, SwMailMergeWizard* );
 public:
-                    AbstractMailMergeWizard_Impl( SwMailMergeWizard* p )
-                     : pDlg(p)
-                     {}
+    explicit AbstractMailMergeWizard_Impl( SwMailMergeWizard* p )
+     : pDlg(p)
+     {}
     virtual         ~AbstractMailMergeWizard_Impl();
     virtual void    StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
     virtual long    GetResult() SAL_OVERRIDE;
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index 2b624a8..ab0215d 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -284,7 +284,7 @@ struct SourceProviderEntity {
 };
 
 struct SourceProviderScannerData {
-    SourceProviderScannerData(
+    explicit SourceProviderScannerData(
         rtl::Reference<unoidl::Manager> const & theManager):
         manager(theManager),
         sourcePosition(), sourceEnd(),
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 04eb55b..f48e5b2 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -141,7 +141,7 @@ class PasswordContainerInteractionHandler :
                                       com::sun::star::task::XInteractionHandler2 >
 {
 public:
-    PasswordContainerInteractionHandler(
+    explicit PasswordContainerInteractionHandler(
         const com::sun::star::uno::Reference<
             com::sun::star::uno::XComponentContext >& xContext );
     virtual ~PasswordContainerInteractionHandler();
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index b8b8225..e642738 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -97,7 +97,7 @@ class FileInputStream
     unsigned int        m_nPos;
     unsigned int        m_nLen;
     public:
-    FileInputStream( const char* pFilename );
+    explicit FileInputStream( const char* pFilename );
     ~FileInputStream();
 
     int getChar() { return (m_nPos < m_nLen) ? int(m_pMemory[m_nPos++]) : -1; }
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 0bee133..51226d2 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -431,7 +431,7 @@ class XPropertySetInfoImpl
 {
 public:
 
-    XPropertySetInfoImpl( const uno::Sequence< beans::Property >& aSeq )
+    explicit XPropertySetInfoImpl( const uno::Sequence< beans::Property >& aSeq )
         : m_aSeq( aSeq )
     {
     }
diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index f0a4395..eccbff1 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -95,7 +95,7 @@ class XMLRedlineExport
 
 
 public:
-    XMLRedlineExport(SvXMLExport& rExp);
+    explicit XMLRedlineExport(SvXMLExport& rExp);
 
     ~XMLRedlineExport();
 
commit 29177c9e05717fca77be6877843945f6e4d9633a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 1 20:39:15 2015 +0100

    coverity#1302687 Dereference null return value
    
    Change-Id: I65e09944bdfa0ccc0aa2b0e6bf423ab943c642f8

diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 65cf9b9..038e97d 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1241,8 +1241,16 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
         while ( pCnt->IsFollow() )
         {
             do
-            {   pCnt = pCnt->GetPrevContentFrm();
-            } while ( pCnt->GetFollow() != pFollow );
+            {
+                SwContentFrm* pPrev = pCnt->GetPrevContentFrm();
+                if (!pPrev)
+                {
+                    SAL_WARN("sw.core", "very unexpected missing PrevContentFrm");
+                    break;
+                }
+                pCnt = pPrev;
+            }
+            while ( pCnt->GetFollow() != pFollow );
             pFollow = pCnt;
         }
         SwTwips nDiff = 0;


More information about the Libreoffice-commits mailing list