diff options
Diffstat (limited to 'dbaccess/source/core')
10 files changed, 66 insertions, 4 deletions
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index c69cc4158a14..3cc33cfe323b 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -100,6 +100,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: } typedef ::boost::optional< OUString > OptionalString; + + namespace { + struct TableInfo { OptionalString sComposedName; @@ -123,6 +126,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std:: { } }; + + } + typedef std::vector< TableInfo > TableInfos; static void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData ) diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 30ffe0cfadda..c8a287cde253 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -2031,6 +2031,8 @@ Reference< XInterface > ODatabaseDocument::getThis() const return *const_cast< ODatabaseDocument* >( this ); } +namespace { + struct CreateAny { Any operator() (const Reference<XController>& lhs) const @@ -2039,6 +2041,8 @@ struct CreateAny } }; +} + // XModel2 Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) { diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 9178e60efd85..516873746d7a 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -70,6 +70,9 @@ namespace dbaccess // DatabaseRegistrations - declaration typedef ::cppu::WeakAggImplHelper1 < XDatabaseRegistrations > DatabaseRegistrations_Base; + + namespace { + class DatabaseRegistrations :public ::cppu::BaseMutex ,public DatabaseRegistrations_Base { @@ -137,6 +140,8 @@ namespace dbaccess ::comphelper::OInterfaceContainerHelper2 m_aRegistrationListeners; }; + } + // DatabaseRegistrations - implementation DatabaseRegistrations::DatabaseRegistrations( const Reference<XComponentContext> & _rxContext ) :m_aContext( _rxContext ) diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 95aef3c1a236..a605b2e0c907 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -98,6 +98,8 @@ using namespace ::comphelper; namespace dbaccess { +namespace { + /** helper class which implements a XFlushListener, and forwards all notification events to another XFlushListener @@ -133,6 +135,8 @@ protected: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; +} + FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener ) :m_aBroadcaster( _rxBroadcaster ) ,m_aListener( _rxListener ) @@ -255,6 +259,8 @@ void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentic SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!"); } +namespace { + /** The class OSharedConnectionManager implements a structure to share connections. It owns the master connections which will be disposed when the last connection proxy is gone. */ @@ -269,6 +275,8 @@ struct TDigestHolder }; +} + class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener > { diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index c30f15000323..05f0da16f474 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -59,6 +59,8 @@ using namespace ::cppu; namespace dbaccess { +namespace { + // LocalNameApproval class LocalNameApproval : public IContainerApprove { @@ -68,6 +70,8 @@ public: void approveElement( const OUString& _rName ) override; }; +} + void LocalNameApproval::approveElement( const OUString& _rName ) { if ( _rName.indexOf( '/' ) != -1 ) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 9c89e4da2b8a..511cc0147775 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -156,6 +156,9 @@ namespace dbaccess // OEmbedObjectHolder typedef ::cppu::WeakComponentImplHelper< embed::XStateChangeListener > TEmbedObjectHolder; + + namespace { + class OEmbedObjectHolder : public ::cppu::BaseMutex ,public TEmbedObjectHolder { @@ -184,6 +187,8 @@ namespace dbaccess virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; }; + } + void SAL_CALL OEmbedObjectHolder::disposing() { if ( m_xBroadCaster.is() ) @@ -235,6 +240,8 @@ namespace dbaccess } }; + namespace { + // LockModifiable class LockModifiable { @@ -267,9 +274,14 @@ namespace dbaccess Reference< XModifiable2 > m_xModifiable; }; + } + // LifetimeCoupler typedef ::cppu::WeakImplHelper< css::lang::XEventListener > LifetimeCoupler_Base; + + namespace { + /** helper class which couples the lifetime of a component to the lifetime of another component @@ -309,11 +321,15 @@ namespace dbaccess protected: }; + } + void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) { m_xClient.clear(); } + namespace { + // ODocumentSaveContinuation class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { @@ -330,6 +346,8 @@ namespace dbaccess virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) override; }; + } + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) { m_sName = _sName; @@ -531,6 +549,8 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) ); } +namespace { + class OExecuteImpl { bool& m_rbSet; @@ -539,8 +559,6 @@ public: ~OExecuteImpl(){ m_rbSet = false; } }; -namespace -{ bool lcl_extractOpenMode( const Any& _rValue, sal_Int32& _out_rMode ) { OpenCommandArgument aOpenCommand; diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 418d466ad816..a6705d850161 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -56,6 +56,8 @@ namespace dbaccess const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete; }; + namespace { + // helper struct DocumentEventData { @@ -63,8 +65,6 @@ namespace dbaccess bool bNeedsSyncNotify; }; - namespace - { const DocumentEventData* lcl_getDocumentEventData() { static const DocumentEventData s_aData[] = { diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 7a567de02326..b0143978df73 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -89,12 +89,16 @@ OInterceptor::~OInterceptor() { } +namespace { + struct DispatchHelper { URL aURL; Sequence<PropertyValue > aArguments; }; +} + //XDispatch void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments ) { diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index f1d03b10e915..04db3216cef0 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -42,6 +42,8 @@ using namespace dbaccess; namespace dbaccess { +namespace { + // struct ResultListEntry. struct ResultListEntry { @@ -54,6 +56,8 @@ struct ResultListEntry explicit ResultListEntry(const ContentProperties& rEntry) : rData( rEntry ) {} }; +} + // struct DataSupplier_Impl. struct DataSupplier_Impl { diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 41020966602b..f569307fdf3a 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -165,6 +165,8 @@ namespace dbaccess static const char sCurrentQueryDesignName[] = "ooo:current-query-design"; } + namespace { + // SettingsExportContext class SettingsExportContext : public ::xmloff::XMLSettingsExportContext { @@ -202,6 +204,8 @@ namespace dbaccess const OUString m_aNamespace; }; + } + void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue ); @@ -239,6 +243,9 @@ namespace dbaccess // SettingsDocumentHandler typedef ::cppu::WeakImplHelper< XDocumentHandler > SettingsDocumentHandler_Base; + + namespace { + class SettingsDocumentHandler : public SettingsDocumentHandler_Base { public: @@ -269,6 +276,8 @@ namespace dbaccess ::comphelper::NamedValueCollection m_aSettings; }; + } + void SAL_CALL SettingsDocumentHandler::startDocument( ) { } |