codemaker/source/javamaker/classfile.hxx | 2 +- comphelper/source/compare/AnyCompareFactory.cxx | 2 +- comphelper/source/container/namecontainer.cxx | 2 +- comphelper/source/misc/accessiblewrapper.cxx | 2 +- comphelper/source/misc/asyncnotification.cxx | 2 +- comphelper/source/misc/instancelocker.hxx | 2 +- comphelper/source/misc/officerestartmanager.hxx | 2 +- comphelper/source/misc/syntaxhighlight.cxx | 2 +- comphelper/source/misc/threadpool.cxx | 2 +- comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 2 +- comphelper/source/property/MasterPropertySet.cxx | 2 +- comphelper/source/property/genericpropertyset.cxx | 2 +- comphelper/source/property/propagg.cxx | 2 +- comphelper/source/property/propertycontainerhelper.cxx | 2 +- configmgr/source/access.hxx | 2 +- configmgr/source/components.hxx | 2 +- configmgr/source/configurationprovider.cxx | 2 +- configmgr/source/configurationregistry.cxx | 2 +- configmgr/source/localizedvaluenode.hxx | 2 +- configmgr/source/update.cxx | 2 +- configmgr/source/valueparser.hxx | 2 +- connectivity/source/commontools/FValue.cxx | 2 +- connectivity/source/commontools/RowFunctionParser.cxx | 10 +++++----- connectivity/source/commontools/TColumnsHelper.cxx | 2 +- connectivity/source/commontools/TSortIndex.cxx | 2 +- connectivity/source/commontools/TTableHelper.cxx | 4 ++-- connectivity/source/commontools/sqlerror.cxx | 2 +- connectivity/source/commontools/statementcomposer.cxx | 2 +- connectivity/source/cpool/ZConnectionPool.cxx | 2 +- connectivity/source/cpool/ZConnectionWrapper.hxx | 2 +- connectivity/source/cpool/ZPoolCollection.hxx | 2 +- connectivity/source/drivers/evoab2/NCatalog.hxx | 2 +- connectivity/source/drivers/evoab2/NConnection.hxx | 2 +- connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 2 +- connectivity/source/drivers/evoab2/NDriver.hxx | 2 +- connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 2 +- connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 2 +- connectivity/source/drivers/evoab2/NStatement.hxx | 4 ++-- connectivity/source/drivers/firebird/Catalog.hxx | 4 ++-- cui/source/options/optgdlg.cxx | 5 +++-- cui/source/options/optjsearch.cxx | 6 +++--- include/unotools/searchopt.hxx | 2 ++ svx/source/dialog/srchdlg.cxx | 2 ++ unotools/source/config/searchopt.cxx | 5 +++++ 44 files changed, 61 insertions(+), 51 deletions(-)
New commits: commit 8d5a2116bc198f51ee394ca48c48f04ef4ba1658 Author: Caolán McNamara <[email protected]> Date: Mon Jun 8 17:04:49 2015 +0100 add (and call before dtor) Commit to SvtSearchOptions i.e. follow up to commit 465359c35fcd8c30a2bedd3d0beb07c0c1c36cba Author: Michael Stahl <[email protected]> Date: Wed Mar 11 16:39:24 2015 +0100 do not call virtual Commit() from dtors of utl::ConfigItem subclasses ~SvtAppFilterOptions_Impl() demonstrates that this is a bad idea, by not invoking its subclasses' ImplCommit() but its own. to avoid assert in SvtSearchOptions dtor Change-Id: I0eaf93450e1daddb81a9463f2c1df48a334dfb22 diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4b3f970..c57641a 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1511,8 +1511,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) if ( m_pCTLSupportCB->IsValueChangedFromSaved() ) { SvtSearchOptions aOpt; - aOpt.SetIgnoreDiacritics_CTL (true); - aOpt.SetIgnoreKashida_CTL (true); + aOpt.SetIgnoreDiacritics_CTL(true); + aOpt.SetIgnoreKashida_CTL(true); + aOpt.Commit(); pLangConfig->aLanguageOptions.SetCTLFontEnabled( m_pCTLSupportCB->IsChecked() ); const sal_uInt16 STATE_COUNT = 1; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 2bd5401..9ef6499 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -380,10 +380,10 @@ bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* ) bModified = true; } + if (bModified) + aOpt.Commit(); + return bModified; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index 83bbed4..a34e449 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -35,6 +35,8 @@ public: SvtSearchOptions(); ~SvtSearchOptions(); + void Commit(); + sal_Int32 GetTransliterationFlags() const; // General Options diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index fc5d15c..02db7ea 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -564,6 +564,7 @@ bool SvxSearchDialog::Close() aOpt.SetNotes ( m_pNotesBtn->IsChecked() ); aOpt.SetIgnoreDiacritics_CTL ( m_pIgnoreDiacritics->IsChecked() ); aOpt.SetIgnoreKashida_CTL ( m_pIgnoreKashida->IsChecked() ); + aOpt.Commit(); const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT, ppArgs ); @@ -2218,6 +2219,7 @@ void SvxSearchDialog::SaveToModule_Impl() SvtSearchOptions aOpt; aOpt.SetIgnoreDiacritics_CTL(GetCheckBoxValue(m_pIgnoreDiacritics)); aOpt.SetIgnoreKashida_CTL(GetCheckBoxValue(m_pIgnoreKashida)); + aOpt.Commit(); sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 87dc3e0..ed3b6e9 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -248,6 +248,11 @@ SvtSearchOptions::~SvtSearchOptions() delete pImpl; } +void SvtSearchOptions::Commit() +{ + pImpl->Commit(); +} + sal_Int32 SvtSearchOptions::GetTransliterationFlags() const { sal_Int32 nRes = 0; commit a941df0f89ab8222ebd22c697e23fb539a3730ed Author: Caolán McNamara <[email protected]> Date: Mon Jun 8 16:17:45 2015 +0100 cppcheck: noExplicitConstructor Change-Id: Ie2ae923ad4c1a66e779711de6ff05328ef144dac diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index ddfea12..b048a47 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -133,7 +133,7 @@ public: Code(Code &) SAL_DELETED_FUNCTION; void operator =(const Code&) SAL_DELETED_FUNCTION; - Code(ClassFile & classFile); + explicit Code(ClassFile & classFile); void ldc(sal_uInt16 index); diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index d641d6b..b3d5870 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -61,7 +61,7 @@ class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XIni Locale m_Locale; public: - AnyCompareFactory( Reference< XComponentContext > xContext ) : m_xContext( xContext ) + explicit AnyCompareFactory( Reference< XComponentContext > xContext ) : m_xContext( xContext ) {} // XAnyCompareFactory diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 7a273b2..c296d53 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -40,7 +40,7 @@ namespace comphelper class NameContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameContainer >, private NameContainerImpl { public: - NameContainer( ::com::sun::star::uno::Type aType ); + explicit NameContainer( ::com::sun::star::uno::Type aType ); virtual ~NameContainer(); // XNameContainer diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index a73134a..21ebb16 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -40,7 +40,7 @@ namespace comphelper Reference< XEventListener > m_xListener; public: - RemoveEventListener( const Reference< XEventListener >& _rxListener ) + explicit RemoveEventListener( const Reference< XEventListener >& _rxListener ) :m_xListener( _rxListener ) { } diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 3c15ce6..85643e2 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -61,7 +61,7 @@ namespace comphelper struct EqualProcessor : public ::std::unary_function< ProcessableEvent, bool > { const ::rtl::Reference< IEventProcessor >& rProcessor; - EqualProcessor( const ::rtl::Reference< IEventProcessor >& _rProcessor ) :rProcessor( _rProcessor ) { } + explicit EqualProcessor( const ::rtl::Reference< IEventProcessor >& _rProcessor ) :rProcessor( _rProcessor ) { } bool operator()( const ProcessableEvent& _rEvent ) { diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 0581908..06908ef 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -55,7 +55,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: bool m_bInitialized; public: - OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); + explicit OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); virtual ~OInstanceLocker(); static ::com::sun::star::uno::Sequence< OUString > SAL_CALL diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 72e2238..3492885 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -42,7 +42,7 @@ class OOfficeRestartManager : public ::cppu::WeakImplHelper3< ::com::sun::star:: bool m_bRestartRequested; public: - OOfficeRestartManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) + explicit OOfficeRestartManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : m_xContext( xContext ) , m_bOfficeInitialized( false ) , m_bRestartRequested( false ) diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 41dd9f2..9f0eb7d 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -273,7 +273,7 @@ class SyntaxHighlighter::Tokenizer public: HighlighterLanguage const aLanguage; - Tokenizer( HighlighterLanguage aLang ); + explicit Tokenizer( HighlighterLanguage aLang ); ~Tokenizer(); void getHighlightPortions(const OUString& rLine, diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index 77e9962..a916ba9 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -23,7 +23,7 @@ class ThreadPool::ThreadWorker : public salhelper::Thread bool mbWorking; public: - ThreadWorker( ThreadPool *pPool ) : + explicit ThreadWorker( ThreadPool *pPool ) : salhelper::Thread("thread-pool"), mpPool( pPool ), mbWorking( false ) diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index fc9576d..0d0ab57 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -43,7 +43,7 @@ struct mutex_holder class OfficeInstallationDirectories : public mutex_holder, public UnoImplBase { public: - OfficeInstallationDirectories( + explicit OfficeInstallationDirectories( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xCtx ); virtual ~OfficeInstallationDirectories(); diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index f5e9cba..87e4ba4 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -33,7 +33,7 @@ class AutoOGuardArray std::unique_ptr< osl::Guard< comphelper::SolarMutex > > * mpGuardArray; public: - AutoOGuardArray( sal_Int32 nNumElements ); + explicit AutoOGuardArray( sal_Int32 nNumElements ); ~AutoOGuardArray(); std::unique_ptr< osl::Guard< comphelper::SolarMutex > > & operator[] ( sal_Int32 i ) { return mpGuardArray[i]; } diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 2ddb513..cf7af4e 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -64,7 +64,7 @@ namespace comphelper virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw( UnknownPropertyException, WrappedTargetException ) SAL_OVERRIDE; public: - GenericPropertySet( PropertySetInfo* pInfo ) throw(); + explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); virtual ~GenericPropertySet() throw(); // XInterface diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 7abb03d..9d4930c 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -356,7 +356,7 @@ namespace internal sal_Int32 m_nCurrentlyForwarding; public: - PropertyForwarder( OPropertySetAggregationHelper& _rAggregationHelper ); + explicit PropertyForwarder( OPropertySetAggregationHelper& _rAggregationHelper ); ~PropertyForwarder(); /** declares that the forwarder should be responsible for the given property diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 8b8f7a6..1d4a911 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -52,7 +52,7 @@ namespace struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool > { OUString m_rCompare; - PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } + explicit PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator() (const PropertyDescription& x ) const { diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index ba197b7..8b864c6 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -426,7 +426,7 @@ public: com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - Access(Components & components); + explicit Access(Components & components); virtual ~Access(); diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 249507e..43b1e8f 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -112,7 +112,7 @@ private: OUString const &, int, Data &, Partial const *, Modifications *, Additions *); public: - Components( + explicit Components( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 51f1a0d..a9fcd67 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -91,7 +91,7 @@ class Service: private cppu::BaseMutex, public ServiceBase { public: - Service( + explicit Service( css::uno::Reference< css::uno::XComponentContext > const context): ServiceBase(m_aMutex), context_(context), default_(true) { diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 9a9ad9d..b2e7408 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -73,7 +73,7 @@ class Service: css::util::XFlushable > { public: - Service(css::uno::Reference< css::uno::XComponentContext > const & context); + explicit Service(css::uno::Reference< css::uno::XComponentContext > const & context); private: Service(const Service&) SAL_DELETED_FUNCTION; diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx index 98b012a..9d44a33 100644 --- a/configmgr/source/localizedvaluenode.hxx +++ b/configmgr/source/localizedvaluenode.hxx @@ -32,7 +32,7 @@ namespace configmgr { class LocalizedValueNode: public Node { public: - LocalizedValueNode(int layer); + explicit LocalizedValueNode(int layer); LocalizedValueNode(int layer, com::sun::star::uno::Any const & value); virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 6e5563e..13694d8 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -60,7 +60,7 @@ class Service: public cppu::WeakImplHelper1< css::configuration::XUpdate > { public: - Service(css::uno::Reference< css::uno::XComponentContext > const context): + explicit Service(css::uno::Reference< css::uno::XComponentContext > const context): context_(context) { assert(context.is()); diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index 1a07518..e15b303 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -44,7 +44,7 @@ class Node; class ValueParser { public: - ValueParser(int layer); + explicit ValueParser(int layer); ~ValueParser(); diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 1640250..2981c02 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -2200,7 +2200,7 @@ namespace detail class ColumnValue : public IValueSource { public: - ColumnValue( const Reference< XColumn >& _rxColumn ) + explicit ColumnValue( const Reference< XColumn >& _rxColumn ) :m_xColumn( _rxColumn ) { } diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index c296337..b6045c4 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -58,7 +58,7 @@ class ConstantValueExpression : public ExpressionNode public: - ConstantValueExpression( ORowSetValueDecoratorRef rValue ) : + explicit ConstantValueExpression( ORowSetValueDecoratorRef rValue ) : maValue( rValue ) { } @@ -171,7 +171,7 @@ class ConstantFunctor public: - ConstantFunctor( const ParserContextSharedPtr& rContext ) : + explicit ConstantFunctor( const ParserContextSharedPtr& rContext ) : mpContext( rContext ) { } @@ -189,7 +189,7 @@ class IntConstantFunctor ParserContextSharedPtr mpContext; public: - IntConstantFunctor( const ParserContextSharedPtr& rContext ) : + explicit IntConstantFunctor( const ParserContextSharedPtr& rContext ) : mpContext( rContext ) { } @@ -326,7 +326,7 @@ public: @param rParserContext Contains context info for the parser */ - ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) : + explicit ExpressionGrammar( const ParserContextSharedPtr& rParserContext ) : mpParserContext( rParserContext ) { } @@ -335,7 +335,7 @@ public: { public: // grammar definition - definition( const ExpressionGrammar& self ) + explicit definition( const ExpressionGrammar& self ) { using ::boost::spirit::str_p; using ::boost::spirit::space_p; diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index a4b3daf..cf34981 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -50,7 +50,7 @@ namespace connectivity class OColumnsHelperImpl { public: - OColumnsHelperImpl(bool _bCase) + explicit OColumnsHelperImpl(bool _bCase) : m_aColumnInfo(_bCase) { } diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index a48ccc6..ffe258a 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -30,7 +30,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v { OSortIndex* pIndex; - TKeyValueFunc(OSortIndex* _pIndex) : pIndex(_pIndex) + explicit TKeyValueFunc(OSortIndex* _pIndex) : pIndex(_pIndex) { } // return false if compared values are equal otherwise true diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 1a84f0c..2ddf19a 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -62,7 +62,7 @@ class OTableContainerListener: protected: virtual ~OTableContainerListener(){} public: - OTableContainerListener(OTableHelper* _pComponent) : m_pComponent(_pComponent){} + explicit OTableContainerListener(OTableHelper* _pComponent) : m_pComponent(_pComponent){} virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE { } @@ -114,7 +114,7 @@ namespace connectivity Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; rtl::Reference<OTableContainerListener> m_xTablePropertyListener; ::std::vector< ColumnDesc > m_aColumnDesc; - OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) + explicit OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : m_xConnection(_xConnection) { try diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index f5318f8..58ad866 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -56,7 +56,7 @@ namespace connectivity class SQLError_Impl { public: - SQLError_Impl( const Reference<XComponentContext> & _rxContext ); + explicit SQLError_Impl( const Reference<XComponentContext> & _rxContext ); ~SQLError_Impl(); // versions of the public SQLError methods which are just delegated to this impl-class diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 5057aaf..376811c 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -64,7 +64,7 @@ namespace dbtools bool bComposerDirty; bool bDisposeComposer; - StatementComposer_Data( const Reference< XConnection >& _rxConnection ) + explicit StatementComposer_Data( const Reference< XConnection >& _rxConnection ) :xConnection( _rxConnection ) ,sCommand() ,sFilter() diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 2c20032..9eb953c 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -117,7 +117,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type { OConnectionPool* m_pConnectionPool; - TConnectionPoolFunctor(OConnectionPool* _pConnectionPool) + explicit TConnectionPoolFunctor(OConnectionPool* _pConnectionPool) : m_pConnectionPool(_pConnectionPool) { OSL_ENSURE(m_pConnectionPool,"No connection pool!"); diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index 7905455..f15487f 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -45,7 +45,7 @@ namespace connectivity virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OConnectionWeakWrapper(); public: - OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); + explicit OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 94594ec..758a5cd 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -80,7 +80,7 @@ namespace connectivity OPoolCollection(const OPoolCollection&) SAL_DELETED_FUNCTION; int operator= (const OPoolCollection&) SAL_DELETED_FUNCTION; - OPoolCollection( + explicit OPoolCollection( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // some configuration helper methods diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 96b7415..5353a58 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -32,7 +32,7 @@ namespace connectivity OEvoabConnection *m_pConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; public: - OEvoabCatalog(OEvoabConnection *_pCon); + explicit OEvoabCatalog(OEvoabConnection *_pCon); inline OEvoabConnection* getConnection() const { return m_pConnection; } virtual void refreshTables() SAL_OVERRIDE; virtual void refreshViews() SAL_OVERRIDE {} diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 32b808d..e30e6f8 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -64,7 +64,7 @@ namespace connectivity virtual ~OEvoabConnection(); public: - OEvoabConnection( OEvoabDriver& _rDriver ); + explicit OEvoabConnection( OEvoabDriver& _rDriver ); virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); inline OString getPassword() { return m_aPassword; } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 4945f93..6a96241 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -87,7 +87,7 @@ namespace connectivity public: inline OEvoabConnection* getOwnConnection() const { return m_pConnection; } - OEvoabDatabaseMetaData(OEvoabConnection* _pCon); + explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon); // as I mentioned before this interface is really BIG // XDatabaseMetaData diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index f782713..0d47a79 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -50,7 +50,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; public: - OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + explicit OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); virtual ~OEvoabDriver(); // OComponentHelper diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 515ffd4..ddf6041 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -73,7 +73,7 @@ namespace connectivity virtual ~OEvoabPreparedStatement(); public: - OEvoabPreparedStatement( OEvoabConnection* _pConnection ); + explicit OEvoabPreparedStatement( OEvoabConnection* _pConnection ); void construct( const OUString& _sql ); diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index b6ddc6d..11ce298 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -42,7 +42,7 @@ namespace connectivity protected: virtual ~OEvoabResultSetMetaData(); public: - OEvoabResultSetMetaData(const OUString& _aTableName); + explicit OEvoabResultSetMetaData(const OUString& _aTableName); void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 9634ae8..f1665d5 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -189,7 +189,7 @@ namespace connectivity using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; protected: - OCommonStatement( OEvoabConnection* _pConnection ); + explicit OCommonStatement( OEvoabConnection* _pConnection ); // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -242,7 +242,7 @@ namespace connectivity virtual ~OStatement(){} public: - OStatement( OEvoabConnection* _pConnection) + explicit OStatement( OEvoabConnection* _pConnection) :OCommonStatement( _pConnection) { } diff --git a/connectivity/source/drivers/firebird/Catalog.hxx b/connectivity/source/drivers/firebird/Catalog.hxx index 5599863..5dc341b 100644 --- a/connectivity/source/drivers/firebird/Catalog.hxx +++ b/connectivity/source/drivers/firebird/Catalog.hxx @@ -23,7 +23,7 @@ namespace connectivity m_xConnection; public: - Catalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); + explicit Catalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); // OCatalog virtual void refreshTables() SAL_OVERRIDE; @@ -40,4 +40,4 @@ namespace connectivity #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CATALOG_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
