diff options
59 files changed, 119 insertions, 120 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 9df83208c190..20f7cbf9af89 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -376,7 +376,7 @@ void OCacheSet::setParameter(sal_Int32 nPos ,const Reference< XParameters >& _xParameter ,const ORowSetValue& _rValue ,sal_Int32 _nType - ,sal_Int32 _nScale) const + ,sal_Int32 _nScale) { sal_Int32 nType = ( _nType != DataType::OTHER ) ? _nType : _rValue.getTypeKind(); ::dbtools::setObjectWithInfo(_xParameter,nPos,_rValue,nType,_nScale); diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index ec69e48a7e95..ad6293af1326 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -58,12 +58,12 @@ namespace dbaccess OCacheSet(sal_Int32 i_nMaxRows); virtual ~OCacheSet(); - void setParameter(sal_Int32 nPos + static void setParameter(sal_Int32 nPos ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters >& _xParameter ,const connectivity::ORowSetValue& _rValue ,sal_Int32 _nType ,sal_Int32 _nScale - ) const; + ); void fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable ,OUStringBuffer& _sCondition diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 0b2256a9c467..b82e7311d07a 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -238,7 +238,7 @@ namespace } } -void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) const +void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) { if ( _rValue.isNull() ) { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 0f86b00d8fa5..14c9248d8297 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -123,7 +123,7 @@ namespace dbaccess bool fetchRow(); void invalidateRow(); - void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); + static void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); void initColumns(); void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable, const OUString& i_rUpdateTableName, @@ -132,11 +132,11 @@ namespace dbaccess ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); void ensureStatement( ); virtual void makeNewStatement( ); - void setOneKeyColumnParameter( sal_Int32 &nPos, + static void setOneKeyColumnParameter( sal_Int32 &nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, - sal_Int32 _nScale ) const; + sal_Int32 _nScale ); OUStringBuffer createKeyFilter( ); bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);; void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index a76bfb533c92..6be7270d80ab 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1084,7 +1084,7 @@ bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, return true; } -sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredicate) const +sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredicate) { sal_Int32 nPredicate = SQLFilterOperator::EQUAL; switch (_pPredicate->getNodeType()) @@ -1236,7 +1236,7 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pConditi } // Functions for analysing SQL -OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNode* pColumnRef, OSQLParseTreeIterator& _rIterator ) const +OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNode* pColumnRef, OSQLParseTreeIterator& _rIterator ) { OUString aTableRange, aColumnName; _rIterator.getColumnRange(pColumnRef,aColumnName,aTableRange); @@ -1807,7 +1807,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC return aFilterSeq; } -OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const +OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) { OUString sKeyword; switch(_ePart) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index df68794cc346..60616d2f1cb3 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -276,7 +276,7 @@ private: @param o_rEmbeddedObjectDescriptor the EmbeddedObjectDescriptor to be passed when initializing the embedded object */ - void separateOpenCommandArguments( + static void separateOpenCommandArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rOpenCommandArguments, ::comphelper::NamedValueCollection& o_rDocumentLoadArgs, ::comphelper::NamedValueCollection& o_rEmbeddedObjectDescriptor diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 3c52ad3a200a..6feec2005d82 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -66,7 +66,7 @@ namespace dbaccess SQLPartCount }; - inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); } + static inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); } enum EColumnType { SelectColumns = 0, @@ -116,9 +116,9 @@ namespace dbaccess bool setComparsionPredicate(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, ::std::vector < ::com::sun::star::beans::PropertyValue > & rFilters, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const; - OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; + static OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator); OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; - sal_Int32 getPredicateType(::connectivity::OSQLParseNode * _pPredicate) const; + static sal_Int32 getPredicateType(::connectivity::OSQLParseNode * _pPredicate); // clears all Columns,Parameters and tables and insert it to their vectors void clearCurrentCollections(); // clears the columns collection given by EColumnType @@ -168,7 +168,7 @@ namespace dbaccess /** retrieves the keyword for the given SQLPart */ - OUString getKeyword( SQLPart _ePart ) const; + static OUString getKeyword( SQLPart _ePart ); /** sets a single "additive" clause, means a filter/groupby/having/order clause */ diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index a88bd28dbbcb..a8e80f21be6a 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -190,7 +190,7 @@ OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _s return sURL; } -bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) const +bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) { return !( _sURL.startsWithIgnoreAsciiCase("sdbc:embedded:hsqldb") || _sURL.startsWithIgnoreAsciiCase("sdbc:embedded:firebird") @@ -291,7 +291,7 @@ Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString return aProperties.getPropertyValues(); } -bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const +bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) { return _sURL.startsWith( "sdbc:embedded:" ); } diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index ed939fe2b420..57949e228c22 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -35,7 +35,7 @@ namespace dbaxml bool m_bIsList; ODBFilter& GetOwnImport(); - ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); + static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters); public: OXMLDataSourceSetting( ODBFilter& rImport, sal_uInt16 nPrfx, diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 2dc9c3e0fb7b..d4432caa697b 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -151,7 +151,7 @@ class ODBExport : public SvXMLExport void exportColumns(const Reference<XColumnsSupplier>& _xColSup); void collectComponentStyles(); - OUString implConvertAny(const Any& _rValue); + static OUString implConvertAny(const Any& _rValue); rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 43bde38aaf96..6e9243345459 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -91,7 +91,7 @@ private: @param _rMap The map to fill. */ - void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); + static void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle ); diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 8fb8ff3a895c..79b8f9c928aa 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -158,12 +158,12 @@ public: bool isConnectionUrlRequired(const OUString& _sURL) const; /// checks if the given data source type embeds its data into the database document - bool isEmbeddedDatabase( const OUString& _sURL ) const; + static bool isEmbeddedDatabase( const OUString& _sURL ); OUString getEmbeddedDatabase() const; // returns true when the properties dialog can be shown, otherwise false. - bool isShowPropertiesEnabled( const OUString& _sURL ) const; + static bool isShowPropertiesEnabled( const OUString& _sURL ); /** returns default settings for newly created databases of the given type. */ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 8836a5dc0dce..ea2a6e76c98f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -806,7 +806,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = getContainer()->getSelectionCount() > 0 && getContainer()->isALeafSelected(); break; case SID_DB_APP_DSUSERADMIN: - aReturn.bEnabled = !m_aTypeCollection.isEmbeddedDatabase(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); + aReturn.bEnabled = !dbaccess::ODsnTypeCollection::isEmbeddedDatabase(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); break; case SID_DB_APP_DSRELDESIGN: aReturn.bEnabled = true; @@ -818,10 +818,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = getContainer()->getElementType() == E_TABLE && isConnected(); break; case SID_DB_APP_DSPROPS: - aReturn.bEnabled = m_xDataSource.is() && m_aTypeCollection.isShowPropertiesEnabled(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); + aReturn.bEnabled = m_xDataSource.is() && dbaccess::ODsnTypeCollection::isShowPropertiesEnabled(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); break; case SID_DB_APP_DSCONNECTION_TYPE: - aReturn.bEnabled = !isDataSourceReadOnly() && m_xDataSource.is() && !m_aTypeCollection.isEmbeddedDatabase(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); + aReturn.bEnabled = !isDataSourceReadOnly() && m_xDataSource.is() && !dbaccess::ODsnTypeCollection::isEmbeddedDatabase(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); break; case SID_DB_APP_DSADVANCED_SETTINGS: aReturn.bEnabled = m_xDataSource.is() && AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( m_aTypeCollection.getType(::comphelper::getString( m_xDataSource->getPropertyValue( PROPERTY_URL ) )) ); @@ -877,7 +877,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const OUString sURL; m_xDataSource->getPropertyValue(PROPERTY_URL) >>= sURL; OUString sDSTypeName; - if ( m_aTypeCollection.isEmbeddedDatabase( sURL ) ) + if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURL ) ) { sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) ); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index e02281d2f102..f8a76f49b235 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -148,7 +148,7 @@ namespace dbaui @param _xContainer The container where the element type has to be found @return the element type corresponding to the given container */ - ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const; + static ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer); /** opens a new frame with either the table or the query or report or form or view @param _sName @@ -287,7 +287,7 @@ namespace dbaui @param _rFormatIds The vector to be filled up. */ - void getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) const; + static void getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds); /** adds a listener to the current name access. @param _xCollection diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 4381e55cbdfa..90e44b7c6f5f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -774,7 +774,7 @@ Reference<XNameContainer> OApplicationController::getQueryDefinitions() const return xNames; } -void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) const +void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) { switch( _eType ) { @@ -793,7 +793,7 @@ void OApplicationController::getSupportedFormats(ElementType _eType,::std::vecto bool OApplicationController::isTableFormat() const { - return m_aTableCopyHelper.isTableFormat(getViewClipboard()); + return OTableCopyHelper::isTableFormat(getViewClipboard()); } IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index e9424506727a..776c51da9be5 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -745,7 +745,7 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO } } -ElementType OApplicationController::getElementType(const Reference< XContainer >& _xContainer) const +ElementType OApplicationController::getElementType(const Reference< XContainer >& _xContainer) { ElementType eRet = E_NONE; Reference<XServiceInfo> xServiceInfo(_xContainer,UNO_QUERY); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 31b54b1263df..fade1cf5f1f1 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -522,7 +522,7 @@ sal_Int32 OAppDetailPageHelper::getElementCount() return nCount; } -bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) const +bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) { if ( !_pEntry ) return false; @@ -577,7 +577,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon ImageProvider aImageProvider( _xConnection ); createTree( pTreeView, - aImageProvider.getDefaultImage( DatabaseObject::TABLE ) + ImageProvider::getDefaultImage( DatabaseObject::TABLE ) ); pTreeView->notifyHiContrastChanged(); @@ -611,7 +611,7 @@ void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rIm OSL_FAIL( "OAppDetailPageHelper::GetElementIcons: invalid element type!" ); return; } - _rImageId = aImageProvider.getDefaultImageResourceID( nDatabaseObjectType ); + _rImageId = ImageProvider::getDefaultImageResourceID( nDatabaseObjectType ); } void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameAccess >& _xContainer) @@ -626,15 +626,15 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { case E_FORM: sHelpId = HID_APP_FORM_TREE; - aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM ); + aFolderImage = ImageProvider::getFolderImage( DatabaseObject::FORM ); break; case E_REPORT: sHelpId = HID_APP_REPORT_TREE; - aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT ); + aFolderImage = ImageProvider::getFolderImage( DatabaseObject::REPORT ); break; case E_QUERY: sHelpId = HID_APP_QUERY_TREE; - aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY ); + aFolderImage = ImageProvider::getFolderImage( DatabaseObject::QUERY ); break; default: OSL_FAIL("Illegal call!"); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 78f42d8ee377..b955472dd157 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -108,7 +108,7 @@ namespace dbaui /** retrieves the resource ids of the images representing elements of the given type */ - void getElementIcons( ElementType _eType, sal_uInt16& _rImageId); + static void getElementIcons( ElementType _eType, sal_uInt16& _rImageId); /** fills the names in the listbox @param _xContainer @@ -259,7 +259,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - bool isLeaf(SvTreeListEntry* _pEntry) const; + static bool isLeaf(SvTreeListEntry* _pEntry); /** returns if one of the selected entries is a leaf @return diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 06432c7c07a0..9e55993df84f 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -354,8 +354,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai m_aDescription->SetHelpId(HID_APP_DESCRIPTION_TEXT); m_aDescription->SetText(ModuleRes(STR_DESCRIPTION)); - ImageProvider aImageProvider; - Image aFolderImage = aImageProvider.getFolderImage( css::sdb::application::DatabaseObject::FORM ); + Image aFolderImage = ImageProvider::getFolderImage( css::sdb::application::DatabaseObject::FORM ); m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage ); m_aCreation->SetDefaultExpandedEntryBmp( aFolderImage ); @@ -758,9 +757,9 @@ OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) co return m_pControlHelper->getQualifiedName( _pEntry ); } -bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) const +bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) { - return m_pControlHelper->isLeaf(_pEntry); + return OAppDetailPageHelper::isLeaf(_pEntry); } bool OApplicationDetailView::isALeafSelected() const diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 2f07065a9317..e4f7974799e4 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -215,7 +215,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - bool isLeaf(SvTreeListEntry* _pEntry) const; + static bool isLeaf(SvTreeListEntry* _pEntry); /** returns if one of the selected entries is a leaf @return diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 6fa8030ceadc..8947c9e21c40 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -347,7 +347,7 @@ OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const bool OApplicationView::isLeaf(SvTreeListEntry* _pEntry) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - return getDetailView()->isLeaf(_pEntry); + return OApplicationDetailView::isLeaf(_pEntry); } bool OApplicationView::isALeafSelected() const diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 5ccaa1118f64..50d477d68625 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -126,7 +126,7 @@ void SbaTableQueryBrowser::selectPath(SvTreeListEntry* _pEntry, bool _bSelect) } } -bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) const +bool SbaTableQueryBrowser::isSelected(SvTreeListEntry* _pEntry) { SvLBoxItem* pTextItem = _pEntry ? _pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING) : NULL; if (pTextItem) @@ -211,14 +211,14 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() // the images for this entry Image aImage; if ( pData->eType == etDatasource ) - aImage = pImageProvider->getDatabaseImage(); + aImage = ImageProvider::getDatabaseImage(); else { bool bIsFolder = !isObject( pData->eType ); if ( bIsFolder ) { sal_Int32 nObjectType( getDatabaseObjectType( pData->eType ) ); - aImage = pImageProvider->getFolderImage( nObjectType ); + aImage = ImageProvider::getFolderImage( nObjectType ); } else { diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 7bf028e18ac1..971e59d47869 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -91,7 +91,7 @@ class UserDefinedFeatures public: UserDefinedFeatures( const Reference< XController >& _rxController ); - FeatureState getState( const URL& _rFeatureURL ); + static FeatureState getState( const URL& _rFeatureURL ); void execute( const URL& _rFeatureURL, const Sequence< PropertyValue>& _rArgs ); private: @@ -886,7 +886,7 @@ FeatureState OGenericUnoController::GetState( sal_uInt16 _nId ) const aReturn.bEnabled = true; break; default: - aReturn = m_pData->m_aUserDefinedFeatures.getState( getURLForId( _nId ) ); + aReturn = UserDefinedFeatures::getState( getURLForId( _nId ) ); break; } @@ -923,7 +923,7 @@ URL OGenericUnoController::getURLForId(sal_Int32 _nId) const return aReturn; } -bool OGenericUnoController::isUserDefinedFeature( const sal_uInt16 _nFeatureId ) const +bool OGenericUnoController::isUserDefinedFeature( const sal_uInt16 _nFeatureId ) { return ( _nFeatureId >= FIRST_USER_DEFINED_FEATURE ) && ( _nFeatureId < LAST_USER_DEFINED_FEATURE ); } @@ -997,7 +997,7 @@ void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo) ::dbaui::showError(_rInfo,getView(),getORB()); } -Reference< XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) const +Reference< XLayoutManager > OGenericUnoController::getLayoutManager(const Reference< XFrame >& _xFrame) { Reference< XPropertySet > xPropSet( _xFrame, UNO_QUERY ); Reference< XLayoutManager > xLayoutManager; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a98919ffa0db..d80894fe1275 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2050,12 +2050,12 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r ImageProvider aImageProvider; if (!_rQueryImage) - _rQueryImage = aImageProvider.getFolderImage( DatabaseObject::QUERY ); + _rQueryImage = ImageProvider::getFolderImage( DatabaseObject::QUERY ); if (!_rTableImage) - _rTableImage = aImageProvider.getFolderImage( DatabaseObject::TABLE ); + _rTableImage = ImageProvider::getFolderImage( DatabaseObject::TABLE ); if (!_rDbImage) - _rDbImage = aImageProvider.getDatabaseImage(); + _rDbImage = ImageProvider::getDatabaseImage(); // add the entry for the data source // special handling for data sources denoted by URLs - we do not want to display this ugly URL, do we? diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 1496a3610fcd..e370a91f4cb3 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -317,7 +317,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const } } -bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) const +bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) { bool bAllowed = false; switch (_nColumnId) diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 20cacd7db203..6db98c998621 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -86,11 +86,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl: void OTableTreeListBox::implSetDefaultImages() { ImageProvider aImageProvider; - SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE ) ); - SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE ) ); + SetDefaultExpandedEntryBmp( ImageProvider::getFolderImage( DatabaseObject::TABLE ) ); + SetDefaultCollapsedEntryBmp( ImageProvider::getFolderImage( DatabaseObject::TABLE ) ); } -bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) const +bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) { sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); if ( ( nEntryType == DatabaseObjectContainer::TABLES ) @@ -119,7 +119,7 @@ void OTableTreeListBox::notifyHiContrastChanged() Image aImage; if ( isFolderEntry( pEntryLoop ) ) { - aImage = m_xImageProvider->getFolderImage( DatabaseObject::TABLE ); + aImage = ImageProvider::getFolderImage( DatabaseObject::TABLE ); } else { @@ -328,7 +328,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn } } -bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) const +bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) { if (_pEntry) { diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2136336277ec..c4de3e552703 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -454,7 +454,7 @@ OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& return pCollection->getType(pConnectURL->GetValue()); } -bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) const +bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) { return DataSourceMetaData::getAuthentication( getDatasourceType( _rSet ) ) != AuthNone; } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 890a7acc33cd..0e7803d9e9bc 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -107,7 +107,7 @@ namespace dbaui */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); // returns the Url of a database document - OUString getDocumentUrl(SfxItemSet& _rDest); + static OUString getDocumentUrl(SfxItemSet& _rDest); void setDataSourceOrName( const ::com::sun::star::uno::Any& _rDataSourceOrName ); @@ -123,7 +123,7 @@ namespace dbaui OUString getConnectionURL() const; /// fill the necessary information from the url line - void convertUrl(SfxItemSet& _rDest); + static void convertUrl(SfxItemSet& _rDest); const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; } @@ -157,15 +157,15 @@ namespace dbaui void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type> - ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); + static ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type>, set it (under the given name) on the given property set - void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const OUString& _rName, const SfxPoolItem* _pItem); + static void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const OUString& _rName, const SfxPoolItem* _pItem); /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. */ - bool hasAuthentication(const SfxItemSet& _rSet) const; + static bool hasAuthentication(const SfxItemSet& _rSet); #if OSL_DEBUG_LEVEL > 0 OString translatePropertyId( sal_Int32 _nId ); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index a7d2843b228a..e5b11252144c 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -171,7 +171,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue); /// analyze the invalid and the readonly flag which may be present in the set - void getFlags(const SfxItemSet& _rSet, bool& _rValid, bool& _rReadonly); + static void getFlags(const SfxItemSet& _rSet, bool& _rValid, bool& _rReadonly); /** will be called inside <method>implInitControls</method> to save the value if necessary @param _rControlList diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 1b42d45ffcd1..74fbdda370d1 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -273,7 +273,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ ) try { ImageProvider aImageProvider( m_xConnection ); - Image aQueryImage( aImageProvider.getDefaultImage( css::sdb::application::DatabaseObject::QUERY ) ); + Image aQueryImage( ImageProvider::getDefaultImage( css::sdb::application::DatabaseObject::QUERY ) ); m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage ); m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage ); diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 46aac76028af..c884178dd0cd 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -102,7 +102,7 @@ protected: bool GetTable(const OUString& rName, TableInfoList::iterator& _rPosition); OTableIndex implRemoveIndex(const OUString& _rName, TableIndexList& _rList, ListBox& _rDisplay, bool _bMustExist); - void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); + static void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); OTableIndex RemoveFreeIndex( const OUString& _rName, bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, *m_pLB_FreeIndexes, _bMustExist); } void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, *m_pLB_FreeIndexes); } diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 34846788d85c..6edc3ce6a22e 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -703,7 +703,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() aArgs.put( "InteractionHandler", xHandler ); aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); - OUString sPath = m_pImpl->getDocumentUrl( *m_pOutSet ); + OUString sPath = ODbDataSourceAdministrationHelper::getDocumentUrl( *m_pOutSet ); xStore->storeAsURL( sPath, aArgs.getPropertyValues() ); if ( !m_pFinalPage || m_pFinalPage->IsDatabaseDocumentToBeRegistered() ) @@ -761,7 +761,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { OUString sUrl; OUString eType = m_pGeneralPage->GetSelectedType(); - if ( m_pCollection->isEmbeddedDatabase(eType) ) + if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase(eType) ) { sUrl = eType; Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 4ece5045c04d..663f0e0a04af 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -167,7 +167,7 @@ namespace dbaui { OUString sDisplayName = aTypeLoop.getDisplayName(); if ( m_pEmbeddedDBType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND - && m_pCollection->isEmbeddedDatabase( sURLPrefix ) ) + && dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURLPrefix ) ) { aDisplayedTypes.push_back( DisplayedTypes::value_type( sURLPrefix, sDisplayName ) ); } @@ -270,7 +270,7 @@ namespace dbaui } // select the correct datasource type - if ( m_pCollection->isEmbeddedDatabase( m_eCurrentSelection ) + if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( m_eCurrentSelection ) && ( LISTBOX_ENTRY_NOTFOUND == m_pEmbeddedDBType->GetEntryPos( sDisplayName ) ) ) { // this indicates it's really a type which is known in general, but not supported on the current platform diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 028f7b1af211..eebe5c15a38d 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -265,7 +265,7 @@ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredica return nPredicateType; } -sal_uInt16 DlgFilterCrit::GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const +sal_uInt16 DlgFilterCrit::GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) { sal_uInt16 nPos; switch(eType) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 54ab0c3cecdf..ba53a2ac3881 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -485,7 +485,7 @@ namespace dbaui if (pCatalog) { // it's a real catalog entry, not the "all objects" root - bCatalogWildcard = m_pTablesList->isWildcardChecked(pCatalog); + bCatalogWildcard = OTableTreeListBox::isWildcardChecked(pCatalog); if (m_bCatalogAtStart) { sComposedName += m_pTablesList->GetEntryText( pCatalog ); @@ -504,7 +504,7 @@ namespace dbaui } } } - bSchemaWildcard = m_pTablesList->isWildcardChecked(pSchema); + bSchemaWildcard = OTableTreeListBox::isWildcardChecked(pSchema); sComposedName += m_pTablesList->GetEntryText( pSchema ); sComposedName += sDot; } @@ -564,7 +564,7 @@ namespace dbaui if ( m_xCurrentConnection.is() ) { // collect the table filter data only if we have a connection - else no tables are displayed at all Sequence< OUString > aTableFilter; - if (m_pTablesList->isWildcardChecked(m_pTablesList->getAllObjectsEntry())) + if (dbaui::OTableTreeListBox::isWildcardChecked(m_pTablesList->getAllObjectsEntry())) { aTableFilter.realloc(1); aTableFilter[0] = "%"; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 983bfc6d2183..6b58cabddd19 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -128,7 +128,7 @@ namespace dbaui void SetPosSize( VclPtr<Control>& rControl, long nRow, sal_uInt16 nCol ); - void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); + static void ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY); void ScrollAllAggregates(); bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 4fd57a929b86..f3a4ce4109cf 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -113,7 +113,7 @@ namespace dbaui void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY ); - void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); + static void SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, long nOffsetY); // UNO interface overridables // XEventListener diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index a027fa033e5a..00cdf213e745 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -50,7 +50,7 @@ namespace dbaui void clearLineData(); protected: - OConnectionLine* CreateConnLine( const OConnectionLine& rConnLine ); + static OConnectionLine* CreateConnLine( const OConnectionLine& rConnLine ); public: OTableConnection( OJoinTableView* pContainer, const TTableConnectionData::value_type& pTabConnData ); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 512132e7f68a..d2b1df6023d6 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -154,7 +154,7 @@ namespace dbaui const SharedConnection& _xConnection); /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>. - bool isTableFormat(const TransferableDataHelper& _rClipboard) const; + static bool isTableFormat(const TransferableDataHelper& _rClipboard); inline void SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } inline void ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); } diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index ad965b7e3a11..a7c5af0540e2 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -99,7 +99,7 @@ private: DECL_LINK( AsynchActivate, void* ); DECL_LINK( AsynchDeactivate, void* ); - bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) const; + static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege); void fillPrivilege(sal_Int32 _nRow) const; TTablePrivilegeMap::const_iterator findPrivilege(sal_Int32 _nRow) const; }; diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 9b08f6b97f0d..0c179f2367fb 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -45,8 +45,8 @@ namespace dbaui DECL_LINK( ButtonClickHdl, Button * ); DECL_LINK( ListDoubleClickHdl, ListBox * ); - void clearListBox(ListBox& _rListBox); - void fillColumns( ListBox* pRight, + static void clearListBox(ListBox& _rListBox); + static void fillColumns( ListBox* pRight, ::std::vector< OUString> &_rRightColumns); void createNewColumn( ListBox* _pListbox, diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 8a10f01cc795..dfdaa60d1862 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -288,8 +288,8 @@ namespace dbaui ODatabaseExport::TColumnVector& _rColVector ); void construct(); // need for table creation - void appendColumns( ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns = false ) const; - void appendKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,const ODatabaseExport::TColumnVector* _pVec) const; + static void appendColumns( ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns = false ); + static void appendKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,const ODatabaseExport::TColumnVector* _pVec); // checks if the type is supported in the destination database bool supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType); diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index ac73bf79cec5..2c9575a744bf 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -89,7 +89,7 @@ namespace dbaui @return the image to be used for the object type. */ - Image getDefaultImage( + static Image getDefaultImage( sal_Int32 _nDatabaseObjectType ); @@ -106,7 +106,7 @@ namespace dbaui the resource ID image to be used for the object type. Must be fed into a ModuleRes instance to actually load the image. */ - sal_uInt16 getDefaultImageResourceID( + static sal_uInt16 getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType ); @@ -119,7 +119,7 @@ namespace dbaui @return the image to be used for folders of the given type */ - Image getFolderImage( + static Image getFolderImage( sal_Int32 _nDatabaseObjectType ); @@ -127,7 +127,7 @@ namespace dbaui @return the image to be used for folders of this type */ - Image getDatabaseImage(); + static Image getDatabaseImage(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index adb0f5eb5bdc..6dfe871ac8ab 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -92,7 +92,7 @@ namespace dbaui protected: void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes); - void implFillIndexInfo(OIndex& _rIndex, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxDescriptor); + static void implFillIndexInfo(OIndex& _rIndex, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxDescriptor); void implFillIndexInfo(OIndex& _rIndex); }; diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 06cc9510080f..b6a584949b52 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -90,15 +90,15 @@ namespace dbaui ::dbtools::OPredicateInputController m_aPredicateInput; - void SelectField( ListBox& rBox, const OUString& rField ); + static void SelectField( ListBox& rBox, const OUString& rField ); DECL_LINK( ListSelectHdl, ListBox * ); DECL_LINK( ListSelectCompHdl, ListBox * ); void SetLine( sal_uInt16 nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,bool _bOr ); void EnableLines(); sal_Int32 GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const; - sal_uInt16 GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const; - bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; + static sal_uInt16 GetSelectionPos(sal_Int32 eType,const ListBox& rListBox); + bool getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const; void fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getMatchingColumn( const Edit& _rValueInput ) const; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 4b9bd43d5c84..3a0796ecf102 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -156,7 +156,7 @@ namespace dbaui dtUnknown }; - DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); + static DispatchType classifyDispatchURL( const ::com::sun::star::util::URL& _rURL ); typedef std::map<DispatchType, sal_Bool> MapDispatchToBool; MapDispatchToBool m_aDispatchStates; diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index f9390a9965f2..7501dd21435f 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -61,11 +61,11 @@ public: /** determines whether the given entry denotes a tables folder */ - bool isFolderEntry( const SvTreeListEntry* _pEntry ) const; + static bool isFolderEntry( const SvTreeListEntry* _pEntry ); /** determines whether the given entry denotes a table or view */ - bool isTableOrViewEntry( const SvTreeListEntry* _pEntry ) const + static bool isTableOrViewEntry( const SvTreeListEntry* _pEntry ) { return !isFolderEntry( _pEntry ); } @@ -126,7 +126,7 @@ public: /** determine if the given entry is 'wildcard checked' @see checkWildcard */ - bool isWildcardChecked(SvTreeListEntry* _pEntry) const; + static bool isWildcardChecked(SvTreeListEntry* _pEntry); protected: virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index fc592a3977af..7caac7df795c 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -254,7 +254,7 @@ namespace dbaui // methods for handling the 'selection' (paintin them bold) of SvLBoxEntries // returns <TRUE/> if the entry is selected (which means it's part of the selected path) - bool isSelected(SvTreeListEntry* _pEntry) const; + static bool isSelected(SvTreeListEntry* _pEntry); // select the entry (and only the entry, not the whole path) void select(SvTreeListEntry* _pEntry, bool _bSelect = true); // select the path of the entry (which must be an entry without children) @@ -336,8 +336,8 @@ namespace dbaui EntryType getEntryType( const SvTreeListEntry* _pEntry ) const; EntryType getChildType( SvTreeListEntry* _pEntry ) const; - bool isObject( EntryType _eType ) const { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } - bool isContainer( EntryType _eType ) const { return (etTableContainer == _eType) || (etQueryContainer == _eType); } + static bool isObject( EntryType _eType ) { return ( etTableOrView== _eType ) || ( etQuery == _eType ); } + static bool isContainer( EntryType _eType ) { return (etTableContainer == _eType) || (etQueryContainer == _eType); } bool isContainer( const SvTreeListEntry* _pEntry ) const { return isContainer( getEntryType( _pEntry ) ); } // ensure that the xObject for the given entry is set on the user data @@ -424,7 +424,7 @@ namespace dbaui /// checks if m_aDocumentDataSource describes a known object void checkDocumentDataSource(); - void extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, + static void extractDescriptorProps(const svx::ODataAccessDescriptor& _rDescriptor, OUString& _rDataSource, OUString& _rCommand, sal_Int32& _rCommandType, bool& _rEscapeProcessing); void transferChangedControlProperty(const OUString& _rProperty, const ::com::sun::star::uno::Any& _rNewValue); @@ -452,7 +452,7 @@ namespace dbaui void copyEntry(SvTreeListEntry* _pEntry); // remove all grid columns and dispose them - void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer); + static void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer); /** checks if the currently displayed entry changed @param _sName diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index aa4d7527239f..dab0e67d046e 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -253,7 +253,7 @@ bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, bo return pImport->Read(); } -bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboard) const +bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboard) { bool bTableFormat = _rClipboard.HasFormat(SotClipboardFormatId::DBACCESS_TABLE) || _rClipboard.HasFormat(SotClipboardFormatId::DBACCESS_QUERY) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 9569788f759b..844fa7ff8f0b 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1109,7 +1109,7 @@ void OCopyTableWizard::clearDestColumns() m_mNameMapping.clear(); } -void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns) const +void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, bool _bKeyColumns) { // now append the columns OSL_ENSURE(_rxColSup.is(),"No columns supplier"); @@ -1159,7 +1159,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co } } -void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) const +void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) { if(!_rxSup.is()) return; // the database doesn't support keys diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 61e40284dd92..39a86c4b4dab 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -101,7 +101,7 @@ void OJoinDesignView::setReadOnly(bool /*_bReadOnly*/) void OJoinDesignView::SaveTabWinUIConfig(OTableWindow* pWin) { - getController().SaveTabWinPosSize(pWin, m_pScrollWindow->GetHScrollBar().GetThumbPos(), m_pScrollWindow->GetVScrollBar().GetThumbPos()); + OJoinController::SaveTabWinPosSize(pWin, m_pScrollWindow->GetHScrollBar().GetThumbPos(), m_pScrollWindow->GetVScrollBar().GetThumbPos()); } void OJoinDesignView::KeyInput( const KeyEvent& rEvt ) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index af514f5a1ead..45dbfcbe4fd8 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -229,7 +229,7 @@ namespace dbaui void appendUndoAction(const OUString& _rOldValue,const OUString& _rNewValue,sal_Int32 _nRow, bool& _bListAction); void appendUndoAction(const OUString& _rOldValue,const OUString& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; - void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); + static void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); void setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index ad454569a103..4db99e4d3151 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -255,7 +255,7 @@ namespace { void ensureToolbars( OQueryController& _rController, bool _bDesign ) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = _rController.getLayoutManager( _rController.getFrame() ); + Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager = OGenericUnoController::getLayoutManager( _rController.getFrame() ); if ( xLayoutManager.is() ) { xLayoutManager->lock(); @@ -284,7 +284,7 @@ namespace void grabFocusFromLimitBox( OQueryController& _rController ) { static const char sResourceURL[] = "private:resource/toolbar/designobjectbar"; - Reference< XLayoutManager > xLayoutManager = _rController.getLayoutManager( _rController.getFrame() ); + Reference< XLayoutManager > xLayoutManager = OGenericUnoController::getLayoutManager( _rController.getFrame() ); Reference< XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (xUIElement.is()) { diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 56685e970a97..075adf953ab3 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -84,7 +84,7 @@ namespace dbaui impl_handle_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_Request ); /// handle SQLExceptions (and derived classes) - void implHandle( + static void implHandle( const ::dbtools::SQLExceptionInfo& _rSqlInfo, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); @@ -116,7 +116,7 @@ namespace dbaui @return the index within <arg>_rContinuations</arg> of the first occurrence of a continuation of the requested type, -1 of no such continuation exists */ - sal_Int32 getContinuation( + static sal_Int32 getContinuation( Continuation _eCont, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); }; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index c98af7393b5e..07a9decc97ca 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -342,7 +342,7 @@ namespace dbaui @see IController::registerCommandURL */ - bool isUserDefinedFeature( const sal_uInt16 nFeatureId ) const; + static bool isUserDefinedFeature( const sal_uInt16 nFeatureId ); /** determines whether the given feature URL denotes a user-defined feature @@ -432,7 +432,7 @@ namespace dbaui @return The layout manager of the frame, can be <NULL/> if the frame isn't initialized. */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) const; + static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); // IController virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; diff --git a/include/test/htmltesttools.hxx b/include/test/htmltesttools.hxx index 767febad04b2..490adeef205f 100644 --- a/include/test/htmltesttools.hxx +++ b/include/test/htmltesttools.hxx @@ -21,7 +21,7 @@ class OOO_DLLPUBLIC_TEST HtmlTestTools { protected: - htmlDocPtr parseHtml(utl::TempFile& aTempFile); + static htmlDocPtr parseHtml(utl::TempFile& aTempFile); static htmlDocPtr parseHtmlStream(SvStream* pStream); }; diff --git a/include/test/sheet/xdatapilotdescriptor.hxx b/include/test/sheet/xdatapilotdescriptor.hxx index 929ed63e543a..435049de05e2 100644 --- a/include/test/sheet/xdatapilotdescriptor.hxx +++ b/include/test/sheet/xdatapilotdescriptor.hxx @@ -39,9 +39,9 @@ protected: ~XDataPilotDescriptor() {} private: - void testGetDataPilotFields_Impl( css::uno::Reference< css::sheet::XDataPilotDescriptor > xDescr ); + static void testGetDataPilotFields_Impl( css::uno::Reference< css::sheet::XDataPilotDescriptor > xDescr ); - void checkName( css::uno::Reference< css::container::XIndexAccess > xIndex, sal_Int32 nIndex ); + static void checkName( css::uno::Reference< css::container::XIndexAccess > xIndex, sal_Int32 nIndex ); static std::vector<OUString> maFieldNames; }; diff --git a/include/test/sheet/xdatapilottable2.hxx b/include/test/sheet/xdatapilottable2.hxx index f4dec325fa4d..a67f5c4aa20b 100644 --- a/include/test/sheet/xdatapilottable2.hxx +++ b/include/test/sheet/xdatapilottable2.hxx @@ -38,7 +38,7 @@ public: protected: private: - bool checkDrillDownSheetContent(css::uno::Reference< css::sheet::XSpreadsheet >, const css::uno::Sequence< css::uno::Sequence < css::uno::Any > >& aData); + static bool checkDrillDownSheetContent(css::uno::Reference< css::sheet::XSpreadsheet >, const css::uno::Sequence< css::uno::Sequence < css::uno::Any > >& aData); void getOutputRanges(css::uno::Reference< css::sheet::XDataPilotTable2 >); void buildDataFields(css::uno::Reference< css::sheet::XDataPilotTable2 >); diff --git a/include/test/sheet/xspreadsheets2.hxx b/include/test/sheet/xspreadsheets2.hxx index 01306f4067f5..60774b8c8fc8 100644 --- a/include/test/sheet/xspreadsheets2.hxx +++ b/include/test/sheet/xspreadsheets2.hxx @@ -47,7 +47,7 @@ protected: private: css::uno::Reference< css::sheet::XSpreadsheetDocument> getDoc(const OUString&, css::uno::Reference< css::lang::XComponent >&); - css::uno::Reference< css::sheet::XNamedRanges> getNamedRanges(css::uno::Reference< css::sheet::XSpreadsheetDocument >); + static css::uno::Reference< css::sheet::XNamedRanges> getNamedRanges(css::uno::Reference< css::sheet::XSpreadsheetDocument >); void importSheetToCopy(); bool isExternalReference(const OUString& aDestContent, const OUString& aSrcContent ); |