diff options
19 files changed, 30 insertions, 30 deletions
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index b228b653a760..3872d3976189 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -532,7 +532,7 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor( ) t OSL_ENSURE( xFactory.is(), "ODBTableDecorator::createDataDescriptor: invalid table!" ); Reference< XColumnsSupplier > xColsSupp; if ( xFactory.is() ) - xColsSupp = xColsSupp.query( xFactory->createDataDescriptor() ); + xColsSupp.set(xFactory->createDataDescriptor(), css::uno::UNO_QUERY); return new ODBTableDecorator( m_xConnection, diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index fca574851ce1..0a59d417cc10 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -65,9 +65,9 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: try { m_aStatement = _xStatement; - m_xDelegatorResultSetUpdate = m_xDelegatorResultSetUpdate.query( m_xDelegatorResultSet ); - m_xDelegatorRow = m_xDelegatorRow.query( m_xDelegatorResultSet ); - m_xDelegatorRowUpdate = m_xDelegatorRowUpdate.query( m_xDelegatorResultSet ); + m_xDelegatorResultSetUpdate.set(m_xDelegatorResultSet, css::uno::UNO_QUERY); + m_xDelegatorRow.set(m_xDelegatorResultSet, css::uno::UNO_QUERY); + m_xDelegatorRowUpdate.set(m_xDelegatorResultSet, css::uno::UNO_QUERY); Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY); xSet->getPropertyValue(PROPERTY_RESULTSETTYPE) >>= m_nResultSetType; diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 811db40ea8c4..e9bdb9f104bd 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -293,7 +293,7 @@ OConnection::OConnection(ODatabaseSource& _rDB DBG_UNHANDLED_EXCEPTION(); } - m_xTableUIProvider = m_xTableUIProvider.query( m_xMasterConnection ); + m_xTableUIProvider.set(m_xMasterConnection, css::uno::UNO_QUERY); try { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 6bf40a108e9a..25923c4de031 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -676,7 +676,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString xDriver, m_pImpl->m_sConnectURL, m_pImpl->m_xSettings->getPropertyValues(), - m_pImpl->getDefaultDataSourceSettings() + dbaccess::ODatabaseModelImpl::getDefaultDataSourceSettings() ); if ( m_pImpl->isEmbeddedDatabase() ) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 1c06b44da5d7..a6ec586187d9 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -371,7 +371,7 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _ { ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext ); sResult = aConfigHelper.GetDocServiceNameFromMediaType( _rMediaType ); - _rClassId = aConfigHelper.GetSequenceClassIDRepresentation(aConfigHelper.GetExplicitlyRegisteredObjClassID( _rMediaType )); + _rClassId = comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(aConfigHelper.GetExplicitlyRegisteredObjClassID( _rMediaType )); if ( !_rClassId.getLength() && !sResult.isEmpty() ) { Reference< XNameAccess > xObjConfig = aConfigHelper.GetObjConfiguration(); @@ -387,7 +387,7 @@ OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _ && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName ) && aEntryDocName.equals( sResult ) ) { - _rClassId = aConfigHelper.GetSequenceClassIDRepresentation(aClassIDs[nInd]); + _rClassId = comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation(aClassIDs[nInd]); break; } } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index c16ecf7efcae..148ebc32fbb3 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -155,7 +155,7 @@ namespace dbaxml ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); SvtModuleOptions aModuleOptions; uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL( - aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET) )), + aModuleOptions.GetFactoryEmptyDocumentURL( SvtModuleOptions::ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET) )), OUString(), // empty frame name 0, aArgs diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 0c6b9963cf57..637821192444 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -616,7 +616,7 @@ void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _r void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLExceptionInfo& _rError ) { ::connectivity::SQLError aError( getORB() ); - ::connectivity::ErrorCode nErrorCode( aError.getErrorCode( sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED ) ); + ::connectivity::ErrorCode nErrorCode( connectivity::SQLError::getErrorCode( sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED ) ); if ( ((const SQLException*)_rError)->ErrorCode == nErrorCode ) { m_bCannotSelectUnfiltered = true; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index dc5c00d8e59a..c06a5047ccd2 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1137,7 +1137,7 @@ namespace Reference< XFrame > xParentFrame; if ( _rxFrame.is() ) - xParentFrame = xParentFrame.query( _rxFrame->getCreator() ); + xParentFrame.set(_rxFrame->getCreator(), css::uno::UNO_QUERY); // did we find a parent frame? Which is no top-level frame? if ( xParentFrame.is() && !_rxFrame->isTop() ) // TODO: to prevent framework assertions, re-insert this "isTop" once 98303 is fixed diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 77c8c90d98fb..c0d99478b64a 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -600,7 +600,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::star Reference< XChild > xGridAsChild(xGrid, UNO_QUERY); Reference< XLoadable > xFormAsLoadable; if (xGridAsChild.is()) - xFormAsLoadable = xFormAsLoadable.query(xGridAsChild->getParent()); + xFormAsLoadable.set(xGridAsChild->getParent(), css::uno::UNO_QUERY); if (xFormAsLoadable.is() && xFormAsLoadable->isLoaded()) { // set the formats from the table @@ -1530,7 +1530,7 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame: Reference< XUIElement > xUI( xLayouter->getElement( OUString( "private:resource/toolbar/toolbar" ) ), UNO_SET_THROW ); - m_xMainToolbar = m_xMainToolbar.query( xUI->getRealInterface() ); + m_xMainToolbar.set(xUI->getRealInterface(), css::uno::UNO_QUERY); OSL_ENSURE( m_xMainToolbar.is(), "SbaTableQueryBrowser::attachFrame: where's my toolbox?" ); } } @@ -2648,7 +2648,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) Reference<XInterface> xObject; if(xNameAccess->getByName(sSimpleName) >>= xObject) // remember the table or query object { - pData->xObjectProperties = pData->xObjectProperties.query( xObject ); + pData->xObjectProperties.set(xObject, css::uno::UNO_QUERY); // if the query contains a parameterized statement and preview is enabled we won't get any data. if ( nCommandType == CommandType::QUERY && xObject.is() ) { @@ -3200,7 +3200,7 @@ void SbaTableQueryBrowser::impl_initialize() Reference< XChild > xChild( xConnection, UNO_QUERY ); Reference< XPropertySet > xDataSourceProperties; if ( xChild.is() ) - xDataSourceProperties = xDataSourceProperties.query( xChild->getParent() ); + xDataSourceProperties.set(xChild->getParent(), css::uno::UNO_QUERY); if ( xDataSourceProperties.is() ) { try diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 080aaa4cbe0b..e696386b6f4b 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -131,7 +131,7 @@ namespace dbaui Reference< XUIConfigurationManager > xManager( xSupplier->getUIConfigurationManager( _rModuleName ) ); Reference< XImageManager > xImageManager; if ( xManager.is() ) - xImageManager = xImageManager.query( xManager->getImageManager() ); + xImageManager.set(xManager->getImageManager(), css::uno::UNO_QUERY); if ( !xImageManager.is() ) break; @@ -203,8 +203,8 @@ namespace dbaui Sequence< Sequence< PropertyValue> > aHistory = SvtHistoryOptions().GetList( ePICKLIST ); Reference< XNameAccess > xFilterFactory; - xFilterFactory = xFilterFactory.query( ::comphelper::getProcessServiceFactory()->createInstance( - OUString( "com.sun.star.document.FilterFactory" ) ) ); + xFilterFactory.set(::comphelper::getProcessServiceFactory()->createInstance( + OUString( "com.sun.star.document.FilterFactory" ) ), css::uno::UNO_QUERY); sal_uInt32 nCount = aHistory.getLength(); for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem ) diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 594fdc4daa92..01c31a6200d5 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -153,7 +153,7 @@ namespace dbaui } OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { - return m_pImpl->getDatasourceType(_rSet); + return dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(_rSet); } void OUserAdminDlg::clearPassword() { diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 8ebc9967f92c..48c8c75d7f57 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -383,7 +383,7 @@ namespace dbaui delete pExampleSet; pExampleSet = new SfxItemSet(*GetInputSetImpl()); - const OUString eType = m_pImpl->getDatasourceType(*_pItems); + const OUString eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*_pItems); DataSourceMetaData aMeta( eType ); const FeatureSet& rFeatures( aMeta.getFeatureSet() ); @@ -470,7 +470,7 @@ namespace dbaui OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { - return m_pImpl->getDatasourceType(_rSet); + return dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(_rSet); } void AdvancedSettingsDialog::clearPassword() diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 773a86d577dd..88462919c6ad 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -284,7 +284,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { - return m_pImpl->getDatasourceType(_rSet); + return dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(_rSet); } void ODbAdminDialog::clearPassword() diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index c67cd2f8ed28..b7e4592d5a7d 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -80,7 +80,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); m_pImpl->translateProperties(xDatasource, *m_pOutSet); - m_eType = m_pImpl->getDatasourceType(*m_pOutSet); + m_eType = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet); SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MAP_APPFONT)); ShowButtonFixedLine(true); @@ -221,7 +221,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { - return m_pImpl->getDatasourceType(_rSet); + return dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(_rSet); } void ODbTypeWizDialog::clearPassword() diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index b2db57842934..1b8101e6a6c7 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -443,7 +443,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { - OUString sRet = m_pImpl->getDatasourceType(_rSet); + OUString sRet = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) { switch( m_pMySQLIntroPage->getMySQLMode() ) @@ -623,7 +623,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard*, /* void ODbTypeWizDialogSetup::enterState(WizardState _nState) { - m_sURL = m_pImpl->getDatasourceType(*m_pOutSet); + m_sURL = dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet); RoadmapWizard::enterState(_nState); switch(_nState) { diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1bfb73cddd1a..c515159faaa3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2149,7 +2149,7 @@ namespace if ( SQL_ISRULE(pColumnRef,derived_column) ) { - OUString aColumnAlias(rController.getParseIterator().getColumnAlias(pColumnRef)); // might be empty + OUString aColumnAlias(connectivity::OSQLParseTreeIterator::getColumnAlias(pColumnRef)); // might be empty pColumnRef = pColumnRef->getChild(0); OTableFieldDescRef aInfo = new OTableFieldDesc(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 1a9a182fb634..71bb2720d26a 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1493,7 +1493,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs) { Reference< XSingleServiceFactory > xSingleFac( xElements, UNO_QUERY ); if ( xSingleFac.is() ) - xQuery = xQuery.query( xSingleFac->createInstance() ); + xQuery.set(xSingleFac->createInstance(), css::uno::UNO_QUERY); } } else diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 8b701c376cfc..e5584465a520 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -105,7 +105,7 @@ namespace dbaui { // perhaps the composer can supply us with columns? This is necessary for cases // where the dialog is invoked for a rowset which is not yet loaded // #i22878# - xSuppColumns = xSuppColumns.query( m_xComposer ); + xSuppColumns.set(m_xComposer, css::uno::UNO_QUERY); if ( xSuppColumns.is() ) xColumns = xSuppColumns->getColumns(); } diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 073f4e43f34e..da962cff9d98 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -626,7 +626,7 @@ namespace Reference< XDataSource > xDataSource; Reference< XChild > xAsChild( _rxConnection, UNO_QUERY ); if ( xAsChild.is() ) - xDataSource = xDataSource.query( xAsChild->getParent() ); + xDataSource.set(xAsChild->getParent(), css::uno::UNO_QUERY); if ( xDataSource.is() ) return lcl_getInteractionHandler_throw( xDataSource, _rFallback ); |