diff options
Diffstat (limited to 'dbaccess/source/core/inc')
27 files changed, 341 insertions, 341 deletions
diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 878f13dae47b..6db609e9473f 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -82,7 +82,7 @@ namespace dbaccess virtual ~OContainerListener(); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERLISTENER_HXX diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 15b754e3607e..ffea0538ae3f 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -46,7 +46,7 @@ namespace dbaccess class OPropertyForward; - class OContainerMediator : public ::comphelper::OBaseMutex + class OContainerMediator : public ::comphelper::OBaseMutex ,public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > { public: @@ -59,9 +59,9 @@ namespace dbaccess private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; - PropertyForwardList m_aForwardList; + PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection; ContainerType m_eType; @@ -98,7 +98,7 @@ namespace dbaccess ); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERMEDIATOR_HXX diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 2d659f066b90..c2115a931155 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -56,13 +56,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title + ::rtl::OUString aTitle; // Title ::boost::optional< ::rtl::OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument - sal_Bool bIsFolder; // IsFolder - sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + sal_Bool bIsFolder; // IsFolder + sal_Bool bAsTemplate; // AsTemplate + ::rtl::OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -78,30 +78,30 @@ namespace dbaccess OContentHelper_Impl(); virtual ~OContentHelper_Impl(); - ContentProperties m_aProps; - ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists + ContentProperties m_aProps; + ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists }; typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; - typedef ::comphelper::OBaseMutex OContentHelper_MBASE; - typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent - , ::com::sun::star::ucb::XCommandProcessor - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertiesChangeNotifier - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::container::XChild - , ::com::sun::star::sdbcx::XRename - > OContentHelper_COMPBASE; - - class OContentHelper : public OContentHelper_MBASE + typedef ::comphelper::OBaseMutex OContentHelper_MBASE; + typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent + , ::com::sun::star::ucb::XCommandProcessor + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::beans::XPropertiesChangeNotifier + , ::com::sun::star::beans::XPropertyContainer + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::container::XChild + , ::com::sun::star::sdbcx::XRename + > OContentHelper_COMPBASE; + + class OContentHelper : public OContentHelper_MBASE ,public OContentHelper_COMPBASE { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > @@ -116,14 +116,14 @@ namespace dbaccess void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); protected: - ::cppu::OInterfaceContainerHelper m_aContentListeners; - PropertyChangeListenerContainer m_aPropertyChangeListeners; + ::cppu::OInterfaceContainerHelper m_aContentListeners; + PropertyChangeListenerContainer m_aPropertyChangeListeners; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParentContainer; const ::comphelper::ComponentContext m_aContext; const ::connectivity::SQLError m_aErrorHelper; - TContentPtr m_pImpl; - sal_uInt32 m_nCommandId; + TContentPtr m_pImpl; + sal_uInt32 m_nCommandId; // helper virtual void SAL_CALL disposing(); @@ -142,13 +142,13 @@ namespace dbaccess public: OContentHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); // com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -200,7 +200,7 @@ namespace dbaccess virtual ::rtl::OUString determineContentType() const = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTENTHELPER_HXX diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index eb6dba6f54b8..ecd3c4f13551 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -228,7 +228,7 @@ private: void impl_invalidateParameter_nothrow(); ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -256,9 +256,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeXMLConversion> m_xRangeConversion; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xHandler; // the object doin' most of the work - an SDB-rowset - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 561ef67778f9..8ba05a516253 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -45,17 +45,17 @@ namespace dbaccess class OFilteredContainer : public ::connectivity::sdbcx::OCollection { private: - mutable sal_Bool m_bConstructed; // late ctor called + mutable sal_Bool m_bConstructed; // late ctor called protected: ::dbtools::IWarningsContainer* m_pWarningsContainer; - IRefreshListener* m_pRefreshListener; + IRefreshListener* m_pRefreshListener; oslInterlockedCount& m_nInAppend; // holds the original container which where set in construct but they can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction @@ -101,18 +101,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OFilteredContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 4a685b037be0..a3bb17da4fd1 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,8 +43,8 @@ namespace dbaccess // =================================================================== // = OPropertyForward // =================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener - > OPropertyForward_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener + > OPropertyForward_Base; class OPropertyForward :public ::comphelper::OBaseMutex ,public OPropertyForward_Base { @@ -52,8 +52,8 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; - sal_Bool m_bInInsert; + ::rtl::OUString m_sName; + sal_Bool m_bInInsert; protected: virtual ~OPropertyForward(); @@ -76,7 +76,7 @@ namespace dbaccess inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_PROPERTYSETFORWARD_HXX diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 80e490c4a34c..b5fed70b8b9b 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -49,7 +49,7 @@ namespace dbaccess virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed) = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CORE_REFRESHLISTENER_HXX diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 305d3493d353..cad13ae113f4 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -53,16 +53,16 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XTablesSupplier, - ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper + class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper ,public OSubComponent ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper < OSingleSelectQueryComposer > @@ -80,42 +80,42 @@ namespace dbaccess inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); } enum EColumnType { - SelectColumns = 0, - GroupByColumns = 1, - OrderColumns = 2, - ParameterColumns = 3 + SelectColumns = 0, + GroupByColumns = 1, + OrderColumns = 2, + ParameterColumns = 3 }; typedef ::std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator > TGetParseNode; - ::connectivity::OSQLParser m_aSqlParser; - ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement - ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) - ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries - ::std::vector<OPrivateTables*> m_aTablesCollection; + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement + ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) + ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries + ::std::vector<OPrivateTables*> m_aTablesCollection; ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; - ::std::vector<OPrivateColumns*> m_aCurrentColumns; - OPrivateTables* m_pTables; // currently used tables + ::std::vector<OPrivateColumns*> m_aCurrentColumns; + OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; - ::com::sun::star::lang::Locale m_aLocale; - sal_Int32 m_nBoolCompareMode; // how to compare bool values - sal_Int32 m_nCommandType; + ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + ::rtl::OUString m_sDecimalSep; + ::rtl::OUString m_sCommand; + ::com::sun::star::lang::Locale m_aLocale; + sal_Int32 m_nBoolCompareMode; // how to compare bool values + sal_Int32 m_nCommandType; // <properties> - ::rtl::OUString m_sOrignal; + ::rtl::OUString m_sOrignal; // </properties> @@ -147,7 +147,7 @@ namespace dbaccess ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause - @param _aGetFunctor + @param _aGetFunctor A member function to get the correct parse node. @return @@ -164,9 +164,9 @@ namespace dbaccess inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement - @param _ePart + @param _ePart Which part should be returned. - @param _bWithKeyword + @param _bWithKeyword If <TRUE/> the keyword will be added too. Otherwise not. @param _rIterator The iterator to use. @@ -196,7 +196,7 @@ namespace dbaccess virtual ~OSingleSelectQueryComposer(); public: - OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, + OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::comphelper::ComponentContext& _rContext); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 659f667e0544..543081d8c2ce 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -51,7 +51,7 @@ namespace dbaccess { - typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, + typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XKeysSupplier, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo, @@ -66,7 +66,7 @@ namespace dbaccess class ODBTableDecorator; typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP; - class ODBTableDecorator :public comphelper::OBaseMutex + class ODBTableDecorator :public comphelper::OBaseMutex ,public OTableDescriptor_BASE ,public ODataSettings //ODataSettings_Base ,public IColumnFactory @@ -75,21 +75,21 @@ namespace dbaccess { void fillPrivileges() const; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; // <properties> - mutable sal_Int32 m_nPrivileges; + mutable sal_Int32 m_nPrivileges; // </properties> - ::connectivity::sdbcx::OCollection* m_pColumns; - ::connectivity::sdbcx::OCollection* m_pTables; + ::connectivity::sdbcx::OCollection* m_pColumns; + ::connectivity::sdbcx::OCollection* m_pTables; // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -128,7 +128,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions - ) throw(::com::sun::star::sdbc::SQLException); + ) throw(::com::sun::star::sdbc::SQLException); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index a65e967cc4c4..72bd63ee5df6 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -70,11 +70,11 @@ namespace dbaccess //************************************************************ // OColumn //************************************************************ - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::container::XNamed > OColumnBase; - class OColumn :public comphelper::OBaseMutex + class OColumn :public comphelper::OBaseMutex ,public OColumnBase ,public ::comphelper::OPropertyContainer ,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings @@ -167,18 +167,18 @@ namespace dbaccess class OColumns : public OColumns_BASE ,public TXChild { - OContainerMediator* m_pMediator; + OContainerMediator* m_pMediator; protected: // comes from the driver can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; - IColumnFactory* m_pColFactoryImpl; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; + ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; + IColumnFactory* m_pColFactoryImpl; ::connectivity::sdbcx::IRefreshableColumns* m_pRefreshColumns; - sal_Bool m_bInitialized : 1; - sal_Bool m_bAddColumn : 1; - sal_Bool m_bDropColumn : 1; + sal_Bool m_bInitialized : 1; + sal_Bool m_bAddColumn : 1; + sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); @@ -193,17 +193,17 @@ namespace dbaccess } /** flag which determines whether the container is filled or not */ - inline sal_Bool isInitialized() const { return m_bInitialized; } - inline void setInitialized() {m_bInitialized = sal_True;} - inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } + inline sal_Bool isInitialized() const { return m_bInitialized; } + inline void setInitialized() {m_bInitialized = sal_True;} + inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } public: /** constructs an empty container without configuration location. - @param rParent the parent object. This instance will be used for refcounting, so the parent + @param rParent the parent object. This instance will be used for refcounting, so the parent cannot die before the container does. - @param _rMutex the mutex of the parent. - @param _bCaseSensitive the initial case sensitivity flag - @see setCaseSensitive + @param _rMutex the mutex of the parent. + @param _bCaseSensitive the initial case sensitivity flag + @see setCaseSensitive */ OColumns( ::cppu::OWeakObject& _rParent, diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index c407b60820a8..0fb7d4362cdd 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -69,17 +69,17 @@ namespace dbaccess //==================================================================== class OColumnSettings { - // <properties> - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void - ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column - ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row + // <properties> + ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void + ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void + ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void + ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void + ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column + ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - sal_Bool m_bHidden; - // </properties> + sal_Bool m_bHidden; + // </properties> protected: virtual ~OColumnSettings(); diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 05b9ca849276..cc82cdc59295 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -37,7 +37,7 @@ namespace dbaccess //========================================================================== //= OCommandBase - a base class (in fact just a container for some members) -//= for classes implementing the sdb.CommandDefinition service +//= for classes implementing the sdb.CommandDefinition service //========================================================================== class OCommandBase { @@ -45,11 +45,11 @@ public: // need public access // <properties> ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; - sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + ::rtl::OUString m_sCommand; + sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer + ::rtl::OUString m_sUpdateTableName; + ::rtl::OUString m_sUpdateSchemaName; + ::rtl::OUString m_sUpdateCatalogName; // </properties> protected: @@ -57,7 +57,7 @@ protected: }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_COMMANDBASE_HXX_ diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 05c8aebe0b26..77745302a602 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -32,44 +32,44 @@ #include <svl/solar.hrc> #endif -#define RID_CORE_STRINGS_START RID_DBACCESS_START +#define RID_CORE_STRINGS_START RID_DBACCESS_START //- String-IDs -#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) -#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) -#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) -#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) -#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) -#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) -#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) -#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) -#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) -#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) -#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) -#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) -#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) -#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) -#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) -#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) -#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) +#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) +#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) +#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) +#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) +#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) +#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) +#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) +#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) +#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) +#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) +#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) +#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) +#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) +#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) +#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) +#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) +#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) +#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) #define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 ) #define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 ) #define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 ) @@ -83,27 +83,27 @@ #define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) #define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) #define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) +#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) -#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) -#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) -#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) -#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) -#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) -#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) +#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) +#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) +#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) +#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) +#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) +#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) -#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) -#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) -#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) -#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) -#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) -#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) -#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) -#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) -#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) -#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) -#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) -#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) +#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) +#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) +#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) +#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) +#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) +#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) +#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) +#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) +#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) +#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) +#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) +#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) #define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index 42677cd5a72d..87d52e689e01 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -51,9 +51,9 @@ namespace dbaccess class ResourceManager { friend class OModuleClient; - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -63,9 +63,9 @@ namespace dbaccess protected: static void ensureImplExists(); /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); public: /** loads the string with the specified resource id @@ -117,8 +117,8 @@ namespace dbaccess class OModuleClient { public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } + OModuleClient() { ResourceManager::registerClient(); } + ~OModuleClient() { ResourceManager::revokeClient(); } }; } diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index cd2b4e715702..ed28b409a0a5 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -41,25 +41,25 @@ namespace dbaccess //========================================================================== //= ODataSettings_Base - a base class which implements the property member -//= for an object implementing the sdb::DataSettings -//= service -//= the properties have to to be registered when used +//= for an object implementing the sdb::DataSettings +//= service +//= the properties have to to be registered when used //========================================================================== class ODataSettings_Base { public: // <properties> - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; - sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Any m_aRowHeight; - ::com::sun::star::uno::Any m_aTextColor; - ::com::sun::star::uno::Any m_aTextLineColor; - sal_Int16 m_nFontEmphasis; - sal_Int16 m_nFontRelief; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sHavingClause; + ::rtl::OUString m_sGroupBy; + ::rtl::OUString m_sOrder; + sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! + ::com::sun::star::awt::FontDescriptor m_aFont; + ::com::sun::star::uno::Any m_aRowHeight; + ::com::sun::star::uno::Any m_aTextColor; + ::com::sun::star::uno::Any m_aTextLineColor; + sal_Int16 m_nFontEmphasis; + sal_Int16 m_nFontRelief; // </properties> protected: @@ -69,8 +69,8 @@ protected: }; //========================================================================== //= ODataSettings - a base class which implements the property handling -//= for an object implementing the sdb::DataSettings -//= service +//= for an object implementing the sdb::DataSettings +//= service //========================================================================== class ODataSettings : public ::comphelper::OPropertyStateContainer @@ -82,13 +82,13 @@ protected: virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; /** register the properties from the param given. The parameter instance must be alive as long as tis object live. - @param _pItem + @param _pItem The database settings, can be <br>this</br> */ void registerPropertiesFor(ODataSettings_Base* _pItem); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DATASETTINGS_HXX_ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc index a383ed4189d2..dbb4713c075a 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/core/inc/dbamiscres.hrc @@ -30,32 +30,32 @@ //======================================================================== // string ids (relative to other resources, that's why not unique) -#define STR_MYSQL_ODBC 1 -#define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 -#define STR_ORACLE_JDBC 4 -#define STR_JDBC 5 -#define STR_ODBC 6 -#define STR_DBASE 7 -#define STR_MSACCESS 8 +#define STR_MYSQL_ODBC 1 +#define STR_MYSQL_JDBC 2 +#define STR_ADABAS 3 +#define STR_ORACLE_JDBC 4 +#define STR_JDBC 5 +#define STR_ODBC 6 +#define STR_DBASE 7 +#define STR_MSACCESS 8 #define STR_MSACCESS2007 9 -#define STR_ADO 10 -#define STR_FLAT 11 -#define STR_CALC 12 -#define STR_MOZILLA 13 -#define STR_LDAP 14 -#define STR_OUTLOOK 15 -#define STR_OUTLOOKEXP 16 -#define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 -#define STR_EVOLUTION_LDAP 19 -#define STR_KAB 20 -#define STR_MACAB 21 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 -#define STR_THUNDERBIRD 23 -#define STR_MYSQL_NATIVE 24 +#define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 -#define STR_END STR_MYSQL_NATIVE + 1 +#define STR_END STR_MYSQL_NATIVE + 1 #endif // _DBA_MISCRES_HRC_ diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index f98c633a5396..5ad7d716f311 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -49,7 +49,7 @@ namespace dbaccess //= OTableColumnDescriptor // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptor : public OColumn ,public OColumnSettings @@ -60,19 +60,19 @@ namespace dbaccess const bool m_bActAsDescriptor; protected: - // <properties> - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; - sal_Int32 m_nType; - sal_Int32 m_nPrecision; - sal_Int32 m_nScale; - sal_Int32 m_nIsNullable; - sal_Bool m_bAutoIncrement; - sal_Bool m_bRowVersion; - sal_Bool m_bCurrency; - // </properties> + // <properties> + rtl::OUString m_aTypeName; + rtl::OUString m_aDescription; + rtl::OUString m_aDefaultValue; + rtl::OUString m_aAutoIncrementValue; + sal_Int32 m_nType; + sal_Int32 m_nPrecision; + sal_Int32 m_nScale; + sal_Int32 m_nIsNullable; + sal_Bool m_bAutoIncrement; + sal_Bool m_bRowVersion; + sal_Bool m_bCurrency; + // </properties> public: OTableColumnDescriptor( const bool _bActAsDescriptor ) @@ -194,8 +194,8 @@ namespace dbaccess // = OColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OColumnWrapper :public OColumn { @@ -204,7 +204,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregate; - sal_Int32 m_nColTypeID; + sal_Int32 m_nColTypeID; protected: OColumnWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rCol, const bool _bNameIsReadOnly ); @@ -240,7 +240,7 @@ namespace dbaccess // = OTableColumnDescriptorWrapper // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptorWrapper :public OColumnWrapper ,public OColumnSettings @@ -289,8 +289,8 @@ namespace dbaccess // = OTableColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OTableColumnWrapper :public OTableColumnDescriptorWrapper ,public ::comphelper::OIdPropertyArrayUsageHelper < OTableColumnWrapper > diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 72a5a9fbbfd7..478d2eefbc3c 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -85,8 +85,8 @@ private: }; //========================================================================== -//= ODefinitionContainer - base class of collections of database definition -//= documents +//= ODefinitionContainer - base class of collections of database definition +//= documents //========================================================================== typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::container::XNameContainer @@ -124,15 +124,15 @@ private: protected: // we can't just hold a vector of XContentRefs, as after initialization they're all empty // cause we load them only on access - DocumentsIndexAccess m_aDocuments; // for a efficient index access - Documents m_aDocumentMap; // for a efficient name access + DocumentsIndexAccess m_aDocuments; // for a efficient index access + Documents m_aDocumentMap; // for a efficient name access ::cppu::OInterfaceContainerHelper m_aApproveListeners; ::cppu::OInterfaceContainerHelper m_aContainerListeners; - sal_Bool m_bInPropertyChange; + sal_Bool m_bInPropertyChange; bool m_bCheckSlash; protected: @@ -163,7 +163,7 @@ public: */ ODefinitionContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash = true ); @@ -221,42 +221,42 @@ protected: virtual void SAL_CALL disposing(); /** create a object from it's persistent data within the configuration. To be overwritten by derived classes. - @param _rName the name the object has within the container - @return the newly created object or an empty reference if somthing went wrong + @param _rName the name the object has within the container + @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.<BR> - @param _rName the object name - @param _bReadIfNeccessary if sal_True, the object will be created if necessary - @return the property set interface of the object. Usually the return value is not NULL, but + @param _rName the object name + @param _bReadIfNeccessary if sal_True, the object will be created if necessary + @return the property set interface of the object. Usually the return value is not NULL, but if so, then the object could not be read from the configuration - @throws NoSuchElementException if there is no object with the given name. - @see createObject + @throws NoSuchElementException if there is no object with the given name. + @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes which may support different methods to create and/or append objects, and don't want to deal with the internal structures of this class.<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the name of the new object - @param _rxNewObject the new object (not surprising, is it ?) - @see createConfigKey - @see implReplace - @see implRemove + @param _rName the name of the new object + @param _rxNewObject the new object (not surprising, is it ?) + @see createConfigKey + @see implReplace + @see implRemove */ - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -265,9 +265,9 @@ protected: or not there exists an object with the given name. This is the responsibility of the caller.<BR> Additionally the node for the given object will be removed from the registry (including all sub nodes).<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @see implReplace - @see implAppend + @param _rName the objects name + @see implReplace + @see implAppend */ void implRemove(const ::rtl::OUString& _rName); @@ -276,11 +276,11 @@ protected: Additionally all object-related informations within the registry will be deleted. The new object config node, where the caller may want to store the new objects information, is returned.<BR> The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @param _rxNewObject the new object - @param _rNewObjectNode the configuration node where the new object may be stored - @see implAppend - @see implRemove + @param _rName the objects name + @param _rxNewObject the new object + @param _rNewObjectNode the configuration node where the new object may be stored + @see implAppend + @see implRemove */ void implReplace( const ::rtl::OUString& _rName, @@ -304,8 +304,8 @@ protected: } private: - void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); - void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); /** approve that the object given may be inserted into the container. Should be overloaded by derived classes, the default implementation just checks the object to be non-void. @@ -329,7 +329,7 @@ private: } }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index ff2337944a69..bdeb3391b48c 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -50,7 +50,7 @@ namespace dbaccess public ::com::sun::star::lang::XServiceInfo { protected: - OColumns* m_pColumns; + OColumns* m_pColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xAggregateAsParameters; public: diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index e98ec650b632..02b574f7b942 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -51,21 +51,21 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XTablesSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OQueryComposer : public ::comphelper::OBaseMutex, + class OQueryComposer : public ::comphelper::OBaseMutex, public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; + ::std::vector< ::rtl::OUString> m_aFilters; + ::std::vector< ::rtl::OUString> m_aOrders; ::rtl::OUString m_sOrgFilter; ::rtl::OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; @@ -76,7 +76,7 @@ namespace dbaccess virtual ~OQueryComposer(); public: - OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); + OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 46fea061727f..fce10a545d90 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -77,7 +77,7 @@ namespace dbaccess class OQueryContainer; class OContainerListener; class OQuery; - class OQueryContainer : public ODefinitionContainer + class OQueryContainer : public ODefinitionContainer , public OQueryContainer_Base { protected: @@ -88,17 +88,17 @@ namespace dbaccess m_xConnection; // possible actions on our "aggregate" enum AGGREGATE_ACTION { NONE, INSERTING, FLUSHING }; - AGGREGATE_ACTION m_eDoingCurrently; + AGGREGATE_ACTION m_eDoingCurrently; OContainerListener* m_pCommandsListener; /** a class which automatically resets m_eDoingCurrently in it's destructor */ - class OAutoActionReset; // just for the following friend declaration + class OAutoActionReset; // just for the following friend declaration friend class OAutoActionReset; class OAutoActionReset { - OQueryContainer* m_pActor; + OQueryContainer* m_pActor; public: OAutoActionReset(OQueryContainer* _pActor) : m_pActor(_pActor) { } ~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; } @@ -106,7 +106,7 @@ namespace dbaccess // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -179,7 +179,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_QUERYCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 6c057018e325..ad484201b646 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -75,7 +75,7 @@ namespace dbaccess } -} // namespace dbaccess +} // namespace dbaccess #endif // DBACORE_SDBCORETOOLS_HXX diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index b609aaf71213..b0a0f458334c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -49,7 +49,7 @@ //************************************************************ // OStatementBase //************************************************************ -class OStatementBase : public comphelper::OBaseMutex, +class OStatementBase : public comphelper::OBaseMutex, public OSubComponent, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >, @@ -61,12 +61,12 @@ class OStatementBase : public comphelper::OBaseMutex, public ::com::sun::star::sdbc::XGeneratedResultSet { protected: - ::osl::Mutex m_aCancelMutex; + ::osl::Mutex m_aCancelMutex; - ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; + ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregateAsSet; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCancellable > m_xAggregateAsCancellable; - sal_Bool m_bUseBookmarks; + sal_Bool m_bUseBookmarks; sal_Bool m_bEscapeProcessing; virtual ~OStatementBase(); diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 8c2d1eda7c14..c5262327dfb4 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -56,10 +56,10 @@ namespace dbaccess //========================================================================== class ODBTable; class OContainerMediator; - typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; - typedef ::connectivity::OTableHelper OTable_Base; + typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; + typedef ::connectivity::OTableHelper OTable_Base; - class ODBTable :public ODataSettings_Base + class ODBTable :public ODataSettings_Base ,public ODBTable_PROP ,public OTable_Base ,public IColumnFactory @@ -68,36 +68,36 @@ namespace dbaccess ::rtl::Reference< OContainerMediator > m_pColumnMediator; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; // <properties> - sal_Int32 m_nPrivileges; + sal_Int32 m_nPrivileges; // </properties> virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual ::connectivity::sdbcx::OCollection* createColumns(const ::connectivity::TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual ::connectivity::sdbcx::OCollection* createKeys(const ::connectivity::TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames); @@ -106,13 +106,13 @@ namespace dbaccess virtual void SAL_CALL disposing(void); public: /** constructs a wrapper supporting the com.sun.star.sdb.Table service.<BR> - @param _rxConn the connection the table belongs to - @param _rxTable the table from the driver can be null - @param _rCatalog the name of the catalog the table belongs to. May be empty. - @param _rSchema the name of the schema the table belongs to. May be empty. - @param _rName the name of the table - @param _rType the type of the table, as supplied by the driver - @param _rDesc the description of the table, as supplied by the driver + @param _rxConn the connection the table belongs to + @param _rxTable the table from the driver can be null + @param _rCatalog the name of the catalog the table belongs to. May be empty. + @param _rSchema the name of the schema the table belongs to. May be empty. + @param _rName the name of the table + @param _rType the type of the table, as supplied by the driver + @param _rDesc the description of the table, as supplied by the driver */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn @@ -143,7 +143,7 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // com::sun::star::beans::XPropertySet - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index ab2eb7bfe293..577ab1bb8ab0 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -60,9 +60,9 @@ namespace dbaccess class OTableContainer : public OFilteredContainer, public OTableContainer_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; ::rtl::Reference< OContainerMediator > m_pTableMediator; - sal_Bool m_bInDrop; // set when we are in the drop method + sal_Bool m_bInDrop; // set when we are in the drop method // OFilteredContainer @@ -71,8 +71,8 @@ namespace dbaccess virtual ::rtl::OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); @@ -93,19 +93,19 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OTableContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, - IRefreshListener* _pRefreshListener, + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index f3cbcc4fd643..7efbf6586a57 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -35,12 +35,12 @@ class UserInformation { - ::com::sun::star::lang::Locale m_aUserLocale; + ::com::sun::star::lang::Locale m_aUserLocale; public: UserInformation(); - ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } + ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } }; #endif // _DBA_CORE_USERINFORMATION_HXX_ diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 97e4f1393ca3..95836f7ab07f 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -63,18 +63,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> interface.<BR> - @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OViewContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); @@ -99,8 +99,8 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); |