sc/qa/extras/scnamedrangesobj.cxx | 2 - sc/qa/extras/sctablesheetsobj.cxx | 2 - sc/source/core/data/dpobject.cxx | 4 +- sc/source/core/tool/addincol.cxx | 2 - sc/source/core/tool/calcconfig.cxx | 3 -- sc/source/ui/app/drwtrans.cxx | 2 - sc/source/ui/app/transobj.cxx | 2 - sc/source/ui/docshell/dbdocimp.cxx | 3 -- sc/source/ui/drawfunc/chartsh.cxx | 2 - sc/source/ui/unoobj/shapeuno.cxx | 2 - scripting/source/basprov/basprov.cxx | 2 - scripting/source/dlgprov/dlgevtatt.cxx | 6 ++-- scripting/source/dlgprov/dlgprov.cxx | 15 ++++------ scripting/source/protocolhandler/scripthandler.cxx | 3 -- scripting/source/provider/BrowseNodeFactoryImpl.cxx | 7 ++-- scripting/source/provider/MasterScriptProvider.cxx | 4 +- scripting/source/provider/ProviderCache.cxx | 2 - scripting/source/stringresource/stringresource.cxx | 4 +- scripting/source/vbaevents/eventhelper.cxx | 2 - sd/source/core/CustomAnimationEffect.cxx | 2 - sd/source/core/CustomAnimationPreset.cxx | 6 ++-- sd/source/core/sdpage_animations.cxx | 4 +- sd/source/core/stlfamily.cxx | 2 - sd/source/filter/eppt/eppt.cxx | 2 - sd/source/filter/eppt/epptso.cxx | 10 ++----- sd/source/filter/eppt/pptx-epptbase.cxx | 18 +++++------- sd/source/filter/eppt/pptx-epptooxml.cxx | 4 +- sd/source/filter/eppt/pptx-text.cxx | 12 ++------ sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 3 -- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 5 +-- sd/source/ui/accessibility/AccessiblePageShape.cxx | 5 +-- sd/source/ui/animations/CustomAnimationList.cxx | 4 +- sd/source/ui/animations/CustomAnimationPane.cxx | 4 +- sd/source/ui/animations/SlideTransitionPane.cxx | 4 +- sd/source/ui/annotations/annotationmanager.cxx | 4 +- sd/source/ui/dlg/TemplateScanner.cxx | 12 +++----- sd/source/ui/dlg/filedlg.cxx | 2 - sd/source/ui/framework/configuration/ResourceId.cxx | 2 - sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 2 - sd/source/ui/framework/factories/BasicViewFactory.cxx | 3 -- sd/source/ui/framework/factories/Pane.cxx | 2 - sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2 - sd/source/ui/framework/module/CenterViewFocusModule.cxx | 3 -- sd/source/ui/framework/module/ModuleController.cxx | 4 +- sd/source/ui/framework/module/SlideSorterModule.cxx | 2 - sd/source/ui/framework/module/ViewTabBarModule.cxx | 3 -- sd/source/ui/presenter/PresenterCanvas.cxx | 4 +- sd/source/ui/remotecontrol/Communicator.cxx | 6 ++-- sd/source/ui/remotecontrol/Listener.cxx | 2 - sd/source/ui/remotecontrol/Receiver.cxx | 9 ++---- sd/source/ui/sidebar/MasterPageContainer.cxx | 2 - sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 - sd/source/ui/slideshow/slideshowimpl.cxx | 4 +- sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 4 -- sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 6 +--- sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 4 +- sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4 -- sd/source/ui/table/TableDesignPane.cxx | 8 ++--- sd/source/ui/unoidl/DrawController.cxx | 4 +- sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 - sd/source/ui/unoidl/SdUnoOutlineView.cxx | 2 - sd/source/ui/unoidl/unolayer.cxx | 2 - sd/source/ui/unoidl/unomodel.cxx | 8 ++--- sd/source/ui/unoidl/unopage.cxx | 8 ++--- sd/source/ui/view/ViewTabBar.cxx | 12 ++++---- sd/source/ui/view/drviews3.cxx | 5 +-- sd/source/ui/view/drviewsa.cxx | 10 ++----- sd/source/ui/view/outlnvsh.cxx | 4 -- sdext/source/minimizer/configurationaccess.cxx | 4 +- sdext/source/minimizer/impoptimizer.cxx | 4 +- sdext/source/minimizer/unodialog.cxx | 20 +++++++------- sdext/source/pdfimport/filterdet.cxx | 5 +-- sdext/source/pdfimport/pdfiadaptor.cxx | 6 ++-- sdext/source/presenter/PresenterAccessibility.cxx | 9 ++---- sdext/source/presenter/PresenterBitmapContainer.cxx | 2 - sdext/source/presenter/PresenterButton.cxx | 4 +- sdext/source/presenter/PresenterController.cxx | 12 +++----- sdext/source/presenter/PresenterHelpView.cxx | 2 - sdext/source/presenter/PresenterPane.cxx | 2 - sdext/source/presenter/PresenterPaneBorderManager.cxx | 4 +- sdext/source/presenter/PresenterPaneBorderPainter.cxx | 2 - sdext/source/presenter/PresenterPaneContainer.cxx | 2 - sdext/source/presenter/PresenterPaneFactory.cxx | 8 ++--- sdext/source/presenter/PresenterScreen.cxx | 2 - sdext/source/presenter/PresenterScrollBar.cxx | 2 - sdext/source/presenter/PresenterSlidePreview.cxx | 2 - sdext/source/presenter/PresenterSlideShowView.cxx | 6 +--- sdext/source/presenter/PresenterSlideSorter.cxx | 9 ++---- sdext/source/presenter/PresenterSpritePane.cxx | 2 - sdext/source/presenter/PresenterTextView.cxx | 2 - sdext/source/presenter/PresenterTheme.cxx | 2 - sdext/source/presenter/PresenterTimer.cxx | 4 +- sdext/source/presenter/PresenterToolBar.cxx | 8 ++--- sdext/source/presenter/PresenterUIPainter.cxx | 12 ++++---- sdext/source/presenter/PresenterViewFactory.cxx | 8 ++--- sdext/source/presenter/PresenterWindowManager.cxx | 5 +-- 96 files changed, 205 insertions(+), 252 deletions(-)
New commits: commit 06302bb3d1969c4b8a204b6fdc9b15d052861134 Author: Noel Grandin <[email protected]> Date: Wed Nov 4 16:00:12 2015 +0200 use uno::Reference::set method instead of assignment Change-Id: I03a8cc8405e1e7ddf75fabd2ba7d85edddf5b30c diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 942fc2b..6193056 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -216,7 +216,7 @@ void ConfigurationAccess::LoadConfiguration() OptimizerSettings& rCurrent( maSettings.front() ); rCurrent.LoadSettingsFromConfiguration( xSet ); } - xSet = Reference< container::XNameAccess >( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY ); + xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY ); if ( xSet.is() ) { const Sequence< OUString > aElements( xSet->getElementNames() ); @@ -261,7 +261,7 @@ void ConfigurationAccess::SaveConfiguration() rCurrent.SaveSettingsToConfiguration( xSet ); // updating template elements - xSet = Reference< container::XNameReplace >( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY_THROW ); + xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ), UNO_QUERY_THROW ); Reference< container::XNameContainer > xNameContainer( xSet, UNO_QUERY_THROW ); const Sequence< OUString > aElements( xSet->getElementNames() ); diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index db7a788..44af41c 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -402,7 +402,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont { Reference< XBitmap > xFillBitmap; if ( aGraphicIter->maUser[ 0 ].mxPropertySet->getPropertyValue( "FillBitmap" ) >>= xFillBitmap ) - xGraphic = Reference< XGraphic >( xFillBitmap, UNO_QUERY_THROW ); + xGraphic.set( xFillBitmap, UNO_QUERY_THROW ); } else if ( aGraphicIter->maUser[ 0 ].mxShape.is() ) { @@ -686,7 +686,7 @@ bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) Sequence< PropertyValue > aLoadProps( 1 ); aLoadProps[ 0 ].Name = "Hidden"; aLoadProps[ 0 ].Value <<= true; - mxModel = Reference< XModel >( xComponentLoader->loadComponentFromURL( + mxModel.set( xComponentLoader->loadComponentFromURL( maSaveAsURL, "_self", 0, aLoadProps ), UNO_QUERY ); } } diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index b2bd979..3ea8b3d 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -62,7 +62,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference Reference< XFrame > xFrame( mxController->getFrame() ); Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() ); - mxWindowPeer = Reference< XWindowPeer >( xContainerWindow, UNO_QUERY_THROW ); + mxWindowPeer.set( xContainerWindow, UNO_QUERY_THROW ); createWindowPeer( mxWindowPeer ); } @@ -97,7 +97,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x Reference< XToolkit > xToolkit( Toolkit::create( mxContext ), UNO_QUERY_THROW ); if ( !xParentPeer.is() ) xParentPeer = xToolkit->getDesktopWindow(); - mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY ); + mxReschedule.set( xToolkit, UNO_QUERY ); mxDialog->createPeer( xToolkit, xParentPeer ); // xWindowPeer = xControl.getPeer(); return mxDialog->getPeer(); @@ -149,7 +149,7 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< rName, rPropertyNames, rPropertyValues ) ); Reference< XPropertySet > xPropertySet( xButtonModel, UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xButton = Reference< XButton >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xButton.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); if ( xActionListener.is() ) { @@ -174,7 +174,7 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedTextModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xFixedText = Reference< XFixedText >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xFixedText.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -192,7 +192,7 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlCheckBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xCheckBox = Reference< XCheckBox >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xCheckBox.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -210,7 +210,7 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlFormattedFieldModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl = Reference< XControl >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -228,7 +228,7 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlComboBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl = Reference< XComboBox >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -246,7 +246,7 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlRadioButtonModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl = Reference< XRadioButton >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -264,7 +264,7 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlListBoxModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl = Reference< XListBox >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { @@ -282,7 +282,7 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque Reference< XPropertySet > xPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlImageControlModel" ), rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl = Reference< XControl >( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); } catch ( Exception& ) { diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index c57d930..683b4a0 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -77,10 +77,9 @@ FileEmitContext::FileEmitContext( const OUString& rOr m_xSeek(), m_xOut() { - m_xContextStream = uno::Reference< io::XStream >( - io::TempFile::create(xContext), uno::UNO_QUERY_THROW ); + m_xContextStream.set( io::TempFile::create(xContext), uno::UNO_QUERY_THROW ); m_xOut = m_xContextStream->getOutputStream(); - m_xSeek = uno::Reference<io::XSeekable>(m_xOut, uno::UNO_QUERY_THROW ); + m_xSeek.set(m_xOut, uno::UNO_QUERY_THROW ); oslFileError aErr = osl_File_E_None; if( (aErr=osl_openFile( rOrigFile.pData, diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index bbcfad5..2b845e1 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -146,7 +146,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert SAL_INFO("sdext.pdfimport", "try to instantiate subfilter" ); uno::Reference< document::XFilter > xSubFilter; try { - xSubFilter = uno::Reference<document::XFilter>( + xSubFilter.set( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.document.OwnSubFilter", aArgs, @@ -195,7 +195,7 @@ void SAL_CALL PDFIHybridAdaptor::cancel() throw(std::exception) void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); - m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); + m_xModel.set( xDocument, uno::UNO_QUERY ); if( xDocument.is() && ! m_xModel.is() ) throw lang::IllegalArgumentException(); } @@ -328,7 +328,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); - m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); + m_xModel.set( xDocument, uno::UNO_QUERY ); if( xDocument.is() && ! m_xModel.is() ) throw lang::IllegalArgumentException(); } diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index f62389d..d57cef1 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -736,7 +736,7 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext Reference<XPane> xMainPane (mxMainPane, UNO_QUERY); if (xMainPane.is()) { - mxMainWindow = Reference<awt::XWindow>(xMainPane->getWindow(), UNO_QUERY); + mxMainWindow.set(xMainPane->getWindow(), UNO_QUERY); mxMainWindow->addFocusListener(this); } mpAccessibleConsole = AccessibleConsole::Create( @@ -785,7 +785,7 @@ void SAL_CALL PresenterAccessible::initialize (const css::uno::Sequence<css::uno { if (rArguments.getLength() >= 1) { - mxAccessibleParent = Reference<XAccessible>(rArguments[0], UNO_QUERY); + mxAccessibleParent.set(rArguments[0], UNO_QUERY); if (mpAccessibleConsole.is()) mpAccessibleConsole->SetAccessibleParent(mxAccessibleParent); } @@ -834,7 +834,7 @@ void PresenterAccessible::AccessibleObject::SetWindow ( } mxContentWindow = xContentWindow; - mxBorderWindow = Reference<awt::XWindow2>(rxBorderWindow, UNO_QUERY); + mxBorderWindow.set(rxBorderWindow, UNO_QUERY); if (mxContentWindow.is()) { @@ -1335,8 +1335,7 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation() { Reference<XAccessibleComponent> xParentComponent; if (mxParentAccessible.is()) - xParentComponent = Reference<XAccessibleComponent>( - mxParentAccessible->getAccessibleContext(), UNO_QUERY); + xParentComponent.set( mxParentAccessible->getAccessibleContext(), UNO_QUERY); if (xParentComponent.is()) return xParentComponent->getLocationOnScreen(); else diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index eb92132..b89c32a 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -88,7 +88,7 @@ void PresenterBitmapContainer::Initialize ( rxComponentContext->getServiceManager(), UNO_QUERY); if ( ! xFactory.is()) return; - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.drawing.PresenterHelper", rxComponentContext), diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index e96b6c0..e2fbc0c 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -113,7 +113,7 @@ PresenterButton::PresenterButton ( if ( ! xFactory.is()) throw RuntimeException(); - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxComponentContext), @@ -469,7 +469,7 @@ void PresenterButton::SetupButtonBitmaps() pRightBitmap); mxMouseOverBitmap = mxCanvas->getDevice()->createCompatibleAlphaBitmap(maButtonSize); - xCanvas = Reference<rendering::XCanvas>(mxMouseOverBitmap, UNO_QUERY); + xCanvas.set(mxMouseOverBitmap, UNO_QUERY); if (mpMouseOverFont.get()!=NULL && !mpMouseOverFont->mxFont.is() && mxCanvas.is()) mpMouseOverFont->PrepareFont(mxCanvas); if (xCanvas.is()) diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 253ea09..2f12511 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -160,7 +160,7 @@ PresenterController::PresenterController ( rxContext->getServiceManager(), UNO_QUERY); if ( ! xFactory.is()) return; - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.drawing.PresenterHelper", rxContext), @@ -186,7 +186,7 @@ PresenterController::PresenterController ( // Create a URLTransformer. if (xFactory.is()) { - mxUrlTransformer = Reference<util::XURLTransformer>(util::URLTransformer::create(mxComponentContext)); + mxUrlTransformer.set(util::URLTransformer::create(mxComponentContext)); } } @@ -294,8 +294,7 @@ void PresenterController::GetSlides (const sal_Int32 nOffset) if (nSlideIndex < xIndexAccess->getCount()) { mnCurrentSlideIndex = nSlideIndex; - mxCurrentSlide = Reference<drawing::XDrawPage>( - xIndexAccess->getByIndex(nSlideIndex), UNO_QUERY); + mxCurrentSlide.set( xIndexAccess->getByIndex(nSlideIndex), UNO_QUERY); } } } @@ -313,8 +312,7 @@ void PresenterController::GetSlides (const sal_Int32 nOffset) if (xIndexAccess.is()) { if (nNextSlideIndex < xIndexAccess->getCount()) - mxNextSlide = Reference<drawing::XDrawPage>( - xIndexAccess->getByIndex(nNextSlideIndex), UNO_QUERY); + mxNextSlide.set( xIndexAccess->getByIndex(nNextSlideIndex), UNO_QUERY); } } } @@ -1140,7 +1138,7 @@ void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane) mpPaintManager.reset(new PresenterPaintManager(mxMainWindow, mxPresenterHelper, mpPaneContainer)); - mxCanvas = Reference<rendering::XSpriteCanvas>(rxPane->getCanvas(), UNO_QUERY); + mxCanvas.set(rxPane->getCanvas(), UNO_QUERY); if (mxSlideShowController.is()) mxSlideShowController->activate(); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 240f46f..6ab3a74 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -141,7 +141,7 @@ PresenterHelpView::PresenterHelpView ( Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW); Reference<XConfigurationController> xCC ( xCM->getConfigurationController(), UNO_QUERY_THROW); - mxPane = Reference<XPane>(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); + mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); mxWindow = mxPane->getWindow(); ProvideCanvas(); diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 85b1a2ec..79f53a9 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -42,7 +42,7 @@ PresenterPane::PresenterPane ( { Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", mxComponentContext), diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index e29be33..4149717 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -82,7 +82,7 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( { mxPointer = awt::Pointer::create(rxContext); - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxContext), @@ -216,7 +216,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu { try { - mxParentWindow = Reference<awt::XWindow>(rArguments[0], UNO_QUERY_THROW); + mxParentWindow.set(rArguments[0], UNO_QUERY_THROW); // Get the outer and inner windows from the argument list and // build a window list of it. diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 866dcfb..0fe6cf8 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -407,7 +407,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) { - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxContext), diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 2f5de98..8fea337 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -39,7 +39,7 @@ PresenterPaneContainer::PresenterPaneContainer ( Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) { - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxContext), diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index c0d928b..a74ac61 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -87,7 +87,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont { // Get the configuration controller. Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW); - xCC = Reference<XConfigurationController>(xCM->getConfigurationController()); + xCC.set(xCM->getConfigurationController()); mxConfigurationControllerWeak = xCC; if ( ! xCC.is()) { @@ -270,13 +270,11 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( ::rtl::Reference<PresenterPaneBase> xPane; if (bIsSpritePane) { - xPane = ::rtl::Reference<PresenterPaneBase>( - new PresenterSpritePane(xContext, mpPresenterController)); + xPane.set( new PresenterSpritePane(xContext, mpPresenterController)); } else { - xPane = ::rtl::Reference<PresenterPaneBase>( - new PresenterPane(xContext, mpPresenterController)); + xPane.set( new PresenterPane(xContext, mpPresenterController)); } // Supply arguments. diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index d6dee3b..bbf7ad0 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -610,7 +610,7 @@ void PresenterScreen::ShutdownPresenterScreen() if (mpPresenterController.get() != NULL) { mpPresenterController->dispose(); - mpPresenterController = rtl::Reference<PresenterController>(); + mpPresenterController.clear(); } mpPaneContainer = new PresenterPaneContainer(Reference<XComponentContext>(mxContextWeak)); } diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 4917732..20d33d7 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -107,7 +107,7 @@ PresenterScrollBar::PresenterScrollBar ( if ( ! xFactory.is()) throw RuntimeException(); - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxComponentContext), diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 4a610d3..b31f27d 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -92,7 +92,7 @@ PresenterSlidePreview::PresenterSlidePreview ( Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager(), UNO_QUERY); if (xFactory.is()) - mxPreviewRenderer = Reference<drawing::XSlideRenderer>( + mxPreviewRenderer.set( xFactory->createInstanceWithContext( "com.sun.star.drawing.SlideRenderer", rxContext), diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index aaab9bc..8572bbe 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -93,8 +93,7 @@ PresenterSlideShowView::PresenterSlideShowView ( void PresenterSlideShowView::LateInit() { - mxSlideShow = Reference<presentation::XSlideShow> ( - mxSlideShowController->getSlideShow(), UNO_QUERY_THROW); + mxSlideShow.set( mxSlideShowController->getSlideShow(), UNO_QUERY_THROW); Reference<lang::XComponent> xSlideShowComponent (mxSlideShow, UNO_QUERY); if (xSlideShowComponent.is()) xSlideShowComponent->addEventListener(static_cast<awt::XWindowListener*>(this)); @@ -847,8 +846,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( awt::WindowAttribute::SIZEABLE | awt::WindowAttribute::MOVEABLE | awt::WindowAttribute::NODECORATION); - xViewWindow = Reference<awt::XWindow>( - xToolkit->createWindow(aWindowDescriptor),UNO_QUERY_THROW); + xViewWindow.set( xToolkit->createWindow(aWindowDescriptor),UNO_QUERY_THROW); // Make the background transparent. The slide show paints its own background. Reference<awt::XWindowPeer> xPeer (xViewWindow, UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 59032ad..b419922 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -287,7 +287,7 @@ PresenterSlideSorter::PresenterSlideSorter ( Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); - mxPane = Reference<XPane>(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); + mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); mxWindow = mxPane->getWindow(); // Add window listener. @@ -301,7 +301,7 @@ PresenterSlideSorter::PresenterSlideSorter ( mnCurrentSlideIndex = mxSlideShowController->getCurrentSlideIndex(); // Create the scroll bar. - mpVerticalScrollBar = ::rtl::Reference<PresenterScrollBar>( + mpVerticalScrollBar.set( new PresenterVerticalScrollBar( rxContext, mxWindow, @@ -328,7 +328,7 @@ PresenterSlideSorter::PresenterSlideSorter ( mpLayout.reset(new Layout(mpVerticalScrollBar)); // Create the preview cache. - mxPreviewCache = Reference<drawing::XSlidePreviewCache>( + mxPreviewCache.set( xFactory->createInstanceWithContext( "com.sun.star.drawing.PresenterPreviewCache", mxComponentContext), @@ -910,8 +910,7 @@ void PresenterSlideSorter::PaintPreview ( mxComponentContext, rxCanvas); Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY); - Reference<drawing::XDrawPage> xPage = Reference<drawing::XDrawPage>( - xIndexAccess->getByIndex(nSlideIndex), UNO_QUERY); + Reference<drawing::XDrawPage> xPage( xIndexAccess->getByIndex(nSlideIndex), UNO_QUERY); bool bTransition = PresenterController::HasTransition(xPage); bool bCustomAnimation = PresenterController::HasCustomAnimation(xPage); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index ec61044..22e78cd 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -40,7 +40,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx { Reference<lang::XMultiComponentFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", mxComponentContext), diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 8c426aa..d6a9ef0 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -93,7 +93,7 @@ PresenterTextView::PresenterTextView ( // Create the script type detector that is used to split paragraphs into // portions of the same text direction. - mxScriptTypeDetector = Reference<i18n::XScriptTypeDetector>( + mxScriptTypeDetector.set( xFactory->createInstanceWithContext( "com.sun.star.i18n.ScriptTypeDetector", rxContext), diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index a7a68d7..3504c6a 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -705,7 +705,7 @@ ReadContext::ReadContext ( Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) { - mxPresenterHelper = Reference<drawing::XPresenterHelper>( + mxPresenterHelper.set( xFactory->createInstanceWithContext( "com.sun.star.comp.Draw.PresenterHelper", rxContext), diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 7fded7c..27339f7 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -368,7 +368,7 @@ TimerTask::TimerTask ( } if ( ! pTimer.is()) { - pTimer = ::rtl::Reference<PresenterClockTimer>(new PresenterClockTimer(rxContext)); + pTimer.set(new PresenterClockTimer(rxContext)); mpInstance = pTimer; } return pTimer; @@ -385,7 +385,7 @@ PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rx Reference<lang::XMultiComponentFactory> xFactory ( rxContext->getServiceManager(), UNO_QUERY); if (xFactory.is()) - mxRequestCallback = Reference<awt::XRequestCallback>( + mxRequestCallback.set( xFactory->createInstanceWithContext( "com.sun.star.awt.AsyncCallback", rxContext), diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 1a5969a..1597d00 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -695,11 +695,11 @@ void PresenterToolBar::ProcessEntry ( else if ( sType == "PresentationTimeLabel" ) pElement = PresentationTimeLabel::Create(this); else if ( sType == "VerticalSeparator" ) - pElement = ::rtl::Reference<Element>(new VerticalSeparator(this)); + pElement.set(new VerticalSeparator(this)); else if ( sType == "HorizontalSeparator" ) - pElement = ::rtl::Reference<Element>(new HorizontalSeparator(this)); + pElement.set(new HorizontalSeparator(this)); else if ( sType == "Label" ) - pElement = ::rtl::Reference<Element>(new Label(this)); + pElement.set(new Label(this)); else if ( sType == "ChangeOrientation" ) { mpCurrentContainerPart.reset(new ElementContainerPart()); @@ -1086,7 +1086,7 @@ PresenterToolBarView::PresenterToolBarView ( { Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW); Reference<XConfigurationController> xCC(xCM->getConfigurationController(),UNO_QUERY_THROW); - mxPane = Reference<XPane>(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); + mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW); mxWindow = mxPane->getWindow(); mxCanvas = mxPane->getCanvas(); diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx index 4731f74..fe338a4 100644 --- a/sdext/source/presenter/PresenterUIPainter.cxx +++ b/sdext/source/presenter/PresenterUIPainter.cxx @@ -74,7 +74,7 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite ( rBoundingBox.Y, ::std::min(aLeftBitmapSize.Width, rBoundingBox.Width), rBoundingBox.Height); - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aLeftBoundingBox), rxCanvas->getDevice())); @@ -92,7 +92,7 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite ( rBoundingBox.Y, ::std::min(aRightBitmapSize.Width, rBoundingBox.Width), rBoundingBox.Height); - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aRightBoundingBox), rxCanvas->getDevice())); @@ -113,7 +113,7 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite ( rBoundingBox.Height); if (aCenterBoundingBox.Width > 0) { - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aCenterBoundingBox), rxCanvas->getDevice())); @@ -176,7 +176,7 @@ void PresenterUIPainter::PaintVerticalBitmapComposite ( rBoundingBox.Y, rBoundingBox.Width, ::std::min(aTopBitmapSize.Height, rBoundingBox.Height)); - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aTopBoundingBox), rxCanvas->getDevice())); @@ -195,7 +195,7 @@ void PresenterUIPainter::PaintVerticalBitmapComposite ( rBoundingBox.Y + rBoundingBox.Height - nBBoxHeight, rBoundingBox.Width, nBBoxHeight); - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aBottomBoundingBox), rxCanvas->getDevice())); @@ -216,7 +216,7 @@ void PresenterUIPainter::PaintVerticalBitmapComposite ( rBoundingBox.Height - aTopBitmapSize.Height - aBottomBitmapSize.Height); if (aCenterBoundingBox.Height > 0) { - aViewState.Clip = Reference<rendering::XPolyPolygon2D>( + aViewState.Clip.set( PresenterGeometryHelper::CreatePolygon( PresenterGeometryHelper::Intersection(rRepaintBox, aCenterBoundingBox), rxCanvas->getDevice())); diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 073fae4..f40e3a0 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -104,7 +104,7 @@ public: { if (nNextSlideIndex < nCount) { - xSlide = Reference<drawing::XDrawPage>( + xSlide.set( xSlideShowController->getSlideByIndex(nNextSlideIndex), UNO_QUERY); } @@ -391,7 +391,7 @@ Reference<XView> PresenterViewFactory::CreateSlideShowView( Reference<frame::XController>(mxControllerWeak), mpPresenterController)); pShowView->LateInit(); - xView = Reference<XView>(pShowView.get()); + xView.set(pShowView.get()); } catch (RuntimeException&) { @@ -414,7 +414,7 @@ Reference<XView> PresenterViewFactory::CreateSlidePreviewView( try { - xView = Reference<XView>( + xView.set( static_cast<XWeak*>(new NextSlidePreview( mxComponentContext, rxViewId, @@ -454,7 +454,7 @@ Reference<XView> PresenterViewFactory::CreateNotesView( try { - xView = Reference<XView>(static_cast<XWeak*>( + xView.set(static_cast<XWeak*>( new PresenterNotesView( mxComponentContext, rxViewId, diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 9d62d96..863afcf 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -1079,8 +1079,7 @@ void PresenterWindowManager::ProvideBackgroundBitmap() } else { - mxScaledBackgroundBitmap - = Reference<rendering::XBitmap>(xBitmap, UNO_QUERY); + mxScaledBackgroundBitmap.set(xBitmap, UNO_QUERY); } } } @@ -1166,7 +1165,7 @@ void PresenterWindowManager::UpdateWindowList() mxComponentContext, mpPresenterController)); pManager->initialize(aArguments); - mxPaneBorderManager = Reference<XInterface>(static_cast<XWeak*>(pManager.get())); + mxPaneBorderManager.set(static_cast<XWeak*>(pManager.get())); } } catch (RuntimeException&) commit 1d67ca08da4b206a52e34723551ac331808f7b29 Author: Noel Grandin <[email protected]> Date: Wed Nov 4 15:36:26 2015 +0200 use uno::Reference::set method instead of assignment Change-Id: Ib224c60d3e5afc968bf4ef5ff58c3a71893b811c diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 32a00d3..650ecc5 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -544,7 +544,7 @@ bool CustomAnimationEffect::checkForText() ParagraphTarget aParaTarget; maTarget >>= aParaTarget; - xText = Reference< XText >::query( aParaTarget.Shape ); + xText.set( aParaTarget.Shape, UNO_QUERY ); // get paragraph if( xText.is() ) diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 740f8b3..f4da98c 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -71,9 +71,9 @@ static Reference< XNameAccess > getNodeAccess( const Reference< XMultiServiceFac aPropValue.Value <<= rNodePath; aArgs[0] <<= aPropValue; - xConfigAccess = Reference< XNameAccess >::query( - xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess" , - aArgs )); + xConfigAccess.set( + xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", aArgs ), + UNO_QUERY); } catch (const Exception&) { diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index ef1b621..9bfd8e4 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -104,7 +104,7 @@ void SdPage::onParagraphInserted( ::Outliner* pOutliner, Paragraph* pPara, SdrOb if( mxAnimationNode.is() ) { ParagraphTarget aTarget; - aTarget.Shape = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); + aTarget.Shape.set( pObj->getUnoShape(), UNO_QUERY ); /* FIXME: Paragraph should be sal_Int32, though more than 64k * paragrapsh at a shape are unlikely.. */ aTarget.Paragraph = (sal_Int16)pOutliner->GetAbsPos( pPara ); @@ -119,7 +119,7 @@ void SdPage::onParagraphRemoving( ::Outliner* pOutliner, Paragraph* pPara, SdrOb if( mxAnimationNode.is() ) { ParagraphTarget aTarget; - aTarget.Shape = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); + aTarget.Shape.set( pObj->getUnoShape(), UNO_QUERY ); /* FIXME: Paragraph should be sal_Int32, though more than 64k * paragrapsh at a shape are unlikely.. */ aTarget.Paragraph = (sal_Int16)pOutliner->GetAbsPos( pPara ); diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index fa23953..3cd85d5 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -82,7 +82,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets() SdStyleSheet* pSdStyle = static_cast< SdStyleSheet* >( pStyle ); if (pSdStyle->GetName().startsWith(aLayoutName)) { - maStyleSheets[ pSdStyle->GetApiName() ] = rtl::Reference< SdStyleSheet >( pSdStyle ); + maStyleSheets[ pSdStyle->GetApiName() ].set( pSdStyle ); } } } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 3679ca1..d4d133e 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -761,7 +761,7 @@ bool PPTWriter::ImplCreateDocument() css::uno::Reference< css::presentation::XPresentation > aXPresentation( aXPresSupplier->getPresentation() ); if ( aXPresentation.is() ) { - mXPropSet = css::uno::Reference< css::beans::XPropertySet >( aXPresentation, css::uno::UNO_QUERY ); + mXPropSet.set( aXPresentation, css::uno::UNO_QUERY ); if ( mXPropSet.is() ) { OUString aCustomShow; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index e88ad25..47a40d4 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -979,9 +979,7 @@ bool PPTWriter::ImplGetText() { mnTextSize = 0; mbFontIndependentLineSpacing = false; - mXText = css::uno::Reference< - css::text::XSimpleText > - ( mXShape, css::uno::UNO_QUERY ); + mXText.set( mXShape, css::uno::UNO_QUERY ); if ( mXText.is() ) { @@ -2716,7 +2714,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - mXText = css::uno::Reference< css::text::XSimpleText >( mXShape, css::uno::UNO_QUERY ); + mXText.set( mXShape, css::uno::UNO_QUERY ); if ( mXText.is() ) mnTextSize = mXText->getString().getLength(); @@ -3673,8 +3671,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc sal_Int32 nBottom = GetCellBottom( nRow, maRect,aRows,xCell ); mbFontIndependentLineSpacing = false; - mXPropSet = uno::Reference< beans::XPropertySet >( xCell, uno::UNO_QUERY_THROW ); - mXText = uno::Reference< text::XSimpleText >( xCell, uno::UNO_QUERY_THROW ); + mXPropSet.set( xCell, uno::UNO_QUERY_THROW ); + mXText.set( xCell, uno::UNO_QUERY_THROW ); mnTextSize = mXText->getString().getLength(); css::uno::Any aAny; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index aecd1d3..e565fb9 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -258,11 +258,11 @@ bool PPTWriterBase::InitSOIface() { while( true ) { - mXDrawPagesSupplier = Reference< XDrawPagesSupplier >( mXModel, UNO_QUERY ); + mXDrawPagesSupplier.set( mXModel, UNO_QUERY ); if ( !mXDrawPagesSupplier.is() ) break; - mXMasterPagesSupplier = Reference< XMasterPagesSupplier >( mXModel, UNO_QUERY ); + mXMasterPagesSupplier.set( mXModel, UNO_QUERY ); if ( !mXMasterPagesSupplier.is() ) break; mXDrawPages = mXMasterPagesSupplier->getMasterPages(); @@ -323,14 +323,14 @@ bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) if ( !mXDrawPage.is() ) break; } - mXPagePropSet = Reference< XPropertySet >( mXDrawPage, UNO_QUERY ); + mXPagePropSet.set( mXDrawPage, UNO_QUERY ); if ( !mXPagePropSet.is() ) break; if (GetPropertyValue( aAny, mXPagePropSet, OUString("IsBackgroundDark") ) ) aAny >>= mbIsBackgroundDark; - mXShapes = Reference< XShapes >( mXDrawPage, UNO_QUERY ); + mXShapes.set( mXDrawPage, UNO_QUERY ); if ( !mXShapes.is() ) break; @@ -349,8 +349,7 @@ bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) if ( aXMasterDrawPage.is() ) { Reference< XPropertySet > aXMasterPagePropSet; - aXMasterPagePropSet = Reference< XPropertySet > - ( aXMasterDrawPage, UNO_QUERY ); + aXMasterPagePropSet.set( aXMasterDrawPage, UNO_QUERY ); if ( aXMasterPagePropSet.is() ) { bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); @@ -544,8 +543,7 @@ bool PPTWriterBase::GetStyleSheets() maStyleSheetList.push_back( new PPTExStyleSheet( nDefaultTab, dynamic_cast<PPTExBulletProvider*>(this) ) ); SetCurrentStyleSheet( nPageNum ); if ( GetPageByIndex( nPageNum, MASTER ) ) - aXNamed = Reference< XNamed > - ( mXDrawPage, UNO_QUERY ); + aXNamed.set( mXDrawPage, UNO_QUERY ); if ( aXStyleFamiliesSupplier.is() ) aXNameAccess = aXStyleFamiliesSupplier->getStyleFamilies(); @@ -669,11 +667,11 @@ bool PPTWriterBase::CreateMainNotes() if ( !mXDrawPage.is() ) return false; - mXPropSet = css::uno::Reference< css::beans::XPropertySet >( mXDrawPage, css::uno::UNO_QUERY ); + mXPropSet.set( mXDrawPage, css::uno::UNO_QUERY ); if ( !mXPropSet.is() ) return false; - mXShapes = css::uno::Reference< css::drawing::XShapes >( mXDrawPage, css::uno::UNO_QUERY ); + mXShapes.set( mXDrawPage, css::uno::UNO_QUERY ); if ( !mXShapes.is() ) return false; diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 9fa5a97..7f02f83 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1653,8 +1653,8 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste xPropSet->setPropertyValue( "Layout", makeAny( short( aLayoutInfo[ nOffset ].nType ) ) ); DBG(dump_pset( xPropSet )); - mXPagePropSet = Reference< XPropertySet >( xSlide, UNO_QUERY ); - mXShapes = Reference< XShapes >( xSlide, UNO_QUERY ); + mXPagePropSet.set( xSlide, UNO_QUERY ); + mXShapes.set( xSlide, UNO_QUERY ); if( mLayoutInfo[ nOffset ].mnFileIdArray.size() < mnMasterPages ) { mLayoutInfo[ nOffset ].mnFileIdArray.resize( mnMasterPages ); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index c394237..0a7f9ad 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -99,12 +99,8 @@ PortionObj::PortionObj(css::uno::Reference< css::text::XTextRange > & rXTextRang mpFieldEntry = NULL; sal_uInt32 nFieldType = 0; - mXPropSet = css::uno::Reference< - css::beans::XPropertySet > - ( rXTextRange, css::uno::UNO_QUERY ); - mXPropState = css::uno::Reference< - css::beans::XPropertyState > - ( rXTextRange, css::uno::UNO_QUERY ); + mXPropSet.set( rXTextRange, css::uno::UNO_QUERY ); + mXPropState.set( rXTextRange, css::uno::UNO_QUERY ); bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() ); if ( bPropSetsValid ) @@ -709,9 +705,9 @@ ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > & rXTe nBulletFlags = 0; nParaFlags = 0; - mXPropSet = css::uno::Reference< css::beans::XPropertySet >( rXTextContent, css::uno::UNO_QUERY ); + mXPropSet.set( rXTextContent, css::uno::UNO_QUERY ); - mXPropState = css::uno::Reference< css::beans::XPropertyState >( rXTextContent, css::uno::UNO_QUERY ); + mXPropState.set( rXTextContent, css::uno::UNO_QUERY ); if ( mXPropSet.is() && mXPropState.is() ) { diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 4b4e815..986bc4c 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -113,8 +113,7 @@ void AccessibleDocumentViewBase::Init() uno::Reference<drawing::XShapes> xShapeList; uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY); if (xView.is()) - xShapeList = uno::Reference<drawing::XShapes> ( - xView->getCurrentPage(), uno::UNO_QUERY); + xShapeList.set( xView->getCurrentPage(), uno::UNO_QUERY); // Register this object as dispose event listener at the model. if (mxModel.is()) diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 3d00ab5..cecf847 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -107,8 +107,7 @@ void AccessibleDrawDocumentView::Init() uno::Reference<drawing::XShapes> xShapeList; uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY); if (xView.is()) - xShapeList = uno::Reference<drawing::XShapes> ( - xView->getCurrentPage(), uno::UNO_QUERY); + xShapeList.set( xView->getCurrentPage(), uno::UNO_QUERY); // Create the children manager. mpChildrenManager = new ChildrenManager(this, xShapeList, maShapeTreeInfo, *this); @@ -151,7 +150,7 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh uno::Reference<lang::XMultiServiceFactory> xFactory (mxModel, uno::UNO_QUERY); uno::Reference<drawing::XShape> xRectangle; if (xFactory.is()) - xRectangle = uno::Reference<drawing::XShape>(xFactory->createInstance ("com.sun.star.drawing.RectangleShape"), + xRectangle.set(xFactory->createInstance ("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); // Set the shape's size and position. diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index fbb3d95..e5b74bf 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -193,10 +193,9 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() Reference<drawing::XMasterPageTarget> xTarget (mxPage, uno::UNO_QUERY); if (xTarget.is()) { - xSet = Reference<beans::XPropertySet> (xTarget->getMasterPage(), - uno::UNO_QUERY); + xSet.set(xTarget->getMasterPage(), uno::UNO_QUERY); aBGSet = xSet->getPropertyValue ("Background"); - xBGSet = Reference<beans::XPropertySet> (aBGSet, uno::UNO_QUERY); + xBGSet.set(aBGSet, uno::UNO_QUERY); } } // Fetch the fill color. Has to be extended to cope with diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index a423945..4df0848 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -110,10 +110,10 @@ static sal_Int32 getShapeIndex( const Reference< XShape >& xShape ) while( xChild.is() && !xPage.is() ) { Reference< XInterface > x( xChild->getParent() ); - xChild = Reference< XChild >::query( x ); + xChild.set( x, UNO_QUERY ); Reference< XDrawPage > xTestPage( x, UNO_QUERY ); if( xTestPage.is() ) - xPage = Reference< XShapes >::query( x ); + xPage.set( x, UNO_QUERY ); } sal_Int32 nIndex = 1; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 5449581..c6c1445 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -203,7 +203,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, // get current controller and initialize listeners try { - mxView = Reference< XDrawView >::query(mrBase.GetController()); + mxView.set(mrBase.GetController(), UNO_QUERY); addListener(); } catch( Exception& ) @@ -325,7 +325,7 @@ IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener, { if( mrBase.GetMainViewShell()->GetShellType() == ViewShell::ST_IMPRESS ) { - mxView = Reference<XDrawView>::query(mrBase.GetDrawController()); + mxView.set(mrBase.GetDrawController(), UNO_QUERY); onSelectionChanged(); onChangeCurrentPage(); break; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index b3c845c..e7022c0 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -937,7 +937,7 @@ IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: - mxView = Reference<drawing::XDrawView>(); + mxView.clear(); onSelectionChanged(); onChangeCurrentPage(); break; @@ -956,7 +956,7 @@ IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener, // passed with the event. if (mrBase.GetMainViewShell() != 0) { - mxView = Reference<drawing::XDrawView>::query(mrBase.GetController()); + mxView.set(mrBase.GetController(), css::uno::UNO_QUERY); onSelectionChanged(); onChangeCurrentPage(); } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index a860dae..0c08e33 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -185,7 +185,7 @@ void AnnotationManagerImpl::init() try { addListener(); - mxView = Reference< XDrawView >::query(mrBase.GetController()); + mxView.set(mrBase.GetController(), UNO_QUERY); } catch( Exception& ) { @@ -893,7 +893,7 @@ IMPL_LINK_TYPED(AnnotationManagerImpl,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: - mxView = Reference<XDrawView>::query( mrBase.GetController() ); + mxView.set( mrBase.GetController(), UNO_QUERY ); onSelectionChanged(); break; } diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 9cd2261..2848157 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -211,7 +211,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning() if (maFolderContent.isFolder()) { - mxEntryEnvironment = Reference<css::ucb::XCommandEnvironment>(); + mxEntryEnvironment.clear(); // We are interested only in three properties: the entry's name, // its URL, and its content type. @@ -222,8 +222,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning() // Create a cursor to iterate over the templates in this folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_DOCUMENTS_ONLY; - mxEntryResultSet = Reference<css::sdbc::XResultSet>( - maFolderContent.createCursor(aProps, eInclude)); + mxEntryResultSet.set( maFolderContent.createCursor(aProps, eInclude)); } else eNextState = ERROR; @@ -294,12 +293,12 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning() { State eNextState (ERROR); - mxFolderResultSet = Reference<sdbc::XResultSet>(); + mxFolderResultSet.clear(); try { // Create content for template folders. - mxFolderEnvironment = Reference<css::ucb::XCommandEnvironment>(); + mxFolderEnvironment.clear(); ::ucbhelper::Content aTemplateDir (mxTemplateRoot, mxFolderEnvironment, comphelper::getProcessComponentContext()); // Define the list of properties we are interested in. @@ -309,8 +308,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning() // Create an cursor to iterate over the template folders. ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_ONLY; - mxFolderResultSet = Reference<sdbc::XResultSet>( - aTemplateDir.createCursor(aProps, eInclude)); + mxFolderResultSet.set( aTemplateDir.createCursor(aProps, eInclude)); if (mxFolderResultSet.is()) eNextState = GATHER_FOLDER_LIST; } diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 91de865..0dd9182 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -225,7 +225,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker(); // get the control access - mxControlAccess = css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > ( xFileDlg, css::uno::UNO_QUERY ); + mxControlAccess.set( xFileDlg, css::uno::UNO_QUERY ); if( mxControlAccess.is() ) { diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 38536b8..71461c5 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -500,7 +500,7 @@ void ResourceId::ParseResourceURL() { // Create the URL transformer. Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); - xURLTransformer = Reference<util::XURLTransformer>(util::URLTransformer::create(xContext)); + xURLTransformer.set(util::URLTransformer::create(xContext)); mxURLTransformerWeak = xURLTransformer; SdGlobalResourceContainer::Instance().AddResource( Reference<XInterface>(xURLTransformer,UNO_QUERY)); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 1ca0709..1004ae6 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -78,7 +78,7 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) try { // Get the XController from the first argument. - mxController = Reference<frame::XController>(aArguments[0], UNO_QUERY_THROW); + mxController.set(aArguments[0], UNO_QUERY_THROW); // Tunnel through the controller to obtain a ViewShellBase. Reference<lang::XUnoTunnel> xTunnel (mxController, UNO_QUERY_THROW); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 3f6b1de..a0cfc14 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -141,8 +141,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( // Get the pane for the anchor URL. Reference<XPane> xPane; if (mxConfigurationController.is()) - xPane = Reference<XPane>(mxConfigurationController->getResource(rxViewId->getAnchor()), - UNO_QUERY); + xPane.set(mxConfigurationController->getResource(rxViewId->getAnchor()), UNO_QUERY); // For main views use the frame view of the last main view. ::sd::FrameView* pFrameView = NULL; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 3d02f34..8d369d9 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -180,7 +180,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas() ::cppcanvas::SpriteCanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::createSpriteCanvas(*mpWindow)); if (pCanvas.get() != NULL) - xCanvas = Reference<rendering::XCanvas>(pCanvas->getUNOSpriteCanvas(), UNO_QUERY); + xCanvas.set(pCanvas->getUNOSpriteCanvas(), UNO_QUERY); } return xCanvas; diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 888de15..41bdda7 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -216,7 +216,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( bResult = true; // Attach to the window of the new pane. - xWindow = Reference<awt::XWindow>(xPane->getWindow(), UNO_QUERY); + xWindow.set(xPane->getWindow(), UNO_QUERY); if (xWindow.is()) { xWindow->addWindowListener(this); diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 986f6fb..eb4ae58 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -133,8 +133,7 @@ void CenterViewFocusModule::HandleNewView ( AnchorBindingMode_DIRECT)); Reference<XView> xView; if (xViewIds.getLength() > 0) - xView = Reference<XView>( - mxConfigurationController->getResource(xViewIds[0]),UNO_QUERY); + xView.set( mxConfigurationController->getResource(xViewIds[0]),UNO_QUERY); Reference<lang::XUnoTunnel> xTunnel (xView, UNO_QUERY); if (xTunnel.is() && mpBase!=NULL) { diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 8d355a6..fa63b77 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -211,7 +211,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) LoadedFactoryContainer::const_iterator iLoadedFactory ( mpLoadedFactories->find(iFactory->second)); if (iLoadedFactory != mpLoadedFactories->end()) - xFactory = Reference<XInterface>(iLoadedFactory->second, UNO_QUERY); + xFactory.set(iLoadedFactory->second, UNO_QUERY); if ( ! xFactory.is()) { // Create a new instance of the factory. @@ -251,7 +251,7 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) try { // Get the XController from the first argument. - mxController = Reference<frame::XController>(aArguments[0], UNO_QUERY_THROW); + mxController.set(aArguments[0], UNO_QUERY_THROW); InstantiateStartupServices(); } diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 32dc1e7..93a2420 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -125,7 +125,7 @@ void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) Reference<XConfigurationController> xCC ( mxControllerManager->getConfigurationController()); if (xCC.is()) - xBar = Reference<XTabBar>(xCC->getResource(mxViewTabBarId), UNO_QUERY); + xBar.set(xCC->getResource(mxViewTabBarId), UNO_QUERY); } if (xBar.is()) diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index ccf08fb..ca564db 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -143,8 +143,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar) { Reference<XTabBar> xBar (rxTabBar); if ( ! xBar.is()) - xBar = Reference<XTabBar>( - mxConfigurationController->getResource(mxViewTabBarId), UNO_QUERY); + xBar.set( mxConfigurationController->getResource(mxViewTabBarId), UNO_QUERY); if (xBar.is()) { diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 35afe64..2339fd0 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -851,7 +851,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( xDevice->createCompatibleLinePolyPolygon(aPoints)); if (xLinePolygon.is()) xLinePolygon->setClosed(0, sal_True); - xPolygon = Reference<rendering::XPolyPolygon2D>(xLinePolygon, UNO_QUERY); + xPolygon.set(xLinePolygon, UNO_QUERY); } return xPolygon; @@ -894,7 +894,7 @@ void SAL_CALL PresenterCustomSprite::disposing() mxSprite = NULL; if (xComponent.is()) xComponent->dispose(); - mpCanvas = rtl::Reference<PresenterCanvas>(); + mpCanvas.clear(); } //----- XSprite --------------------------------------------------------------- diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index bf399ca..33f05f2 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -67,10 +67,10 @@ void Communicator::execute() uno::Reference<presentation::XPresentationSupplier> xPS; if( xFrame.is() ) - xPS = uno::Reference<presentation::XPresentationSupplier>( xFrame->getController()->getModel(), uno::UNO_QUERY ); + xPS.set( xFrame->getController()->getModel(), uno::UNO_QUERY ); uno::Reference<presentation::XPresentation2> xPresentation; if( xPS.is() ) - xPresentation = uno::Reference<presentation::XPresentation2>( xPS->getPresentation(), uno::UNO_QUERY ); + xPresentation.set( xPS->getPresentation(), uno::UNO_QUERY ); if ( xPresentation.is() && xPresentation->isRunning() ) { presentationStarted( xPresentation->getController() ); @@ -142,7 +142,7 @@ void Communicator::presentationStarted( const css::uno::Reference< { if ( pTransmitter ) { - mListener = rtl::Reference<Listener>( new Listener( this, pTransmitter ) ); + mListener.set( new Listener( this, pTransmitter ) ); mListener->init( rController ); } } diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index afa7cde..72b3c95 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -37,7 +37,7 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon { if ( aController.is() ) { - mController = css::uno::Reference< css::presentation::XSlideShowController >( aController ); + mController.set( aController ); aController->addSlideShowListener( this ); sal_Int32 aSlides = aController->getSlideCount(); diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 892d72b..d540f09 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -75,13 +75,10 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand ) uno::Reference< frame::XDesktop2 > xFramesSupplier = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Reference< frame::XFrame > xFrame ( xFramesSupplier->getActiveFrame(), uno::UNO_QUERY_THROW ); uno::Reference<presentation::XPresentationSupplier> xPS ( xFrame->getController()->getModel(), uno::UNO_QUERY_THROW); - xPresentation = uno::Reference<presentation::XPresentation2>( - xPS->getPresentation(), uno::UNO_QUERY_THROW); + xPresentation.set( xPS->getPresentation(), uno::UNO_QUERY_THROW); // Throws an exception if now slideshow running - xSlideShowController = uno::Reference<presentation::XSlideShowController>( - xPresentation->getController(), uno::UNO_QUERY_THROW ); - xSlideShow = uno::Reference<presentation::XSlideShow>( - xSlideShowController->getSlideShow(), uno::UNO_QUERY_THROW ); + xSlideShowController.set( xPresentation->getController(), uno::UNO_QUERY_THROW ); + xSlideShow.set( xSlideShowController->getSlideShow(), uno::UNO_QUERY_THROW ); } catch (uno::RuntimeException &) { diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 897d95a..71121d3 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -842,7 +842,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() // Create a new model. OUString sModelServiceName ( "com.sun.star.presentation.PresentationDocument"); - mxModel = uno::Reference<frame::XModel>( + mxModel.set( ::comphelper::getProcessServiceFactory()->createInstance( sModelServiceName), uno::UNO_QUERY); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index b1aa583..0f24434 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -306,7 +306,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) SdPage* pMasterPage = GetSelectedMasterPage(); assert(pMasterPage); //rhbz#902884 if (pMasterPage) - xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY); + xSelectedMaster.set(pMasterPage->getUnoPage(), uno::UNO_QUERY); SfxViewFrame* pViewFrame = mrBase.GetViewFrame(); if (pViewFrame != NULL && xSelectedMaster.is()) { diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 60b7206..0c5e1ae 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -303,7 +303,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X { if( isValidSlideNumber( nSlideNumber ) ) try { - xSlide = Reference< XDrawPage >( mxSlides->getByIndex(nSlideNumber), UNO_QUERY_THROW ); + xSlide.set( mxSlides->getByIndex(nSlideNumber), UNO_QUERY_THROW ); if( meMode == PREVIEW ) { @@ -1091,7 +1091,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp { try { - mxShow = Reference< XSlideShow >( createSlideShow(), UNO_QUERY_THROW ); + mxShow.set( createSlideShow(), UNO_QUERY_THROW ); mxView = new SlideShowView( *mpShowWindow, diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 39ad6ef..7a78696 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -107,9 +107,7 @@ CacheConfiguration::CacheConfiguration() return; // Get the node for the slide sorter preview cache. - mxCacheNode = Reference<container::XNameAccess>( - xHierarchy->getByHierarchicalName(sPathToNode), - UNO_QUERY); + mxCacheNode.set( xHierarchy->getByHierarchicalName(sPathToNode), UNO_QUERY); } catch (RuntimeException &) { diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 94b1aa8..ed77f94 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -446,8 +446,7 @@ void SlideSorterModel::UpdatePageList() xController->getModel(), UNO_QUERY); if (xSupplier.is()) { - xPages = Reference<container::XIndexAccess>( - xSupplier->getMasterPages(), UNO_QUERY); + xPages.set( xSupplier->getMasterPages(), UNO_QUERY); } } break; @@ -458,8 +457,7 @@ void SlideSorterModel::UpdatePageList() xController->getModel(), UNO_QUERY); if (xSupplier.is()) { - xPages = Reference<container::XIndexAccess>( - xSupplier->getDrawPages(), UNO_QUERY); + xPages.set( xSupplier->getDrawPages(), UNO_QUERY); } } break; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 18137ae..e79f8ed 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -88,7 +88,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) { try { - mxViewId = Reference<XResourceId>(rArguments[0], UNO_QUERY_THROW); + mxViewId.set(rArguments[0], UNO_QUERY_THROW); // Get the XController. Reference<frame::XController> xController (rArguments[1], UNO_QUERY_THROW); @@ -102,7 +102,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) pBase = pController->GetViewShellBase(); // Get the parent window. - mxParentWindow = Reference<awt::XWindow>(rArguments[2], UNO_QUERY_THROW); + mxParentWindow.set(rArguments[2], UNO_QUERY_THROW); vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow); mxParentWindow->addWindowListener(this); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1406801..188f19b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -236,9 +236,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController if (IsMainViewShell()) { // Create uno controller for the main view shell. - xSubController = Reference<drawing::XDrawSubController>( - new SdUnoSlideView ( - *mpSlideSorter)); + xSubController.set( new SdUnoSlideView( *mpSlideSorter)); } return xSubController; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index c29e590..c03408e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -122,14 +122,14 @@ TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBas // get current controller and initialize listeners try { - mxView = Reference< XDrawView >::query(mrBase.GetController()); + mxView.set(mrBase.GetController(), UNO_QUERY); addListener(); Reference< XController > xController( mrBase.GetController(), UNO_QUERY_THROW ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilies( xFamiliesSupp->getStyleFamilies() ); const OUString sFamilyName( "table" ); - mxTableFamily = Reference< XIndexAccess >( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); + mxTableFamily.set( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); } catch (const Exception&) { @@ -289,7 +289,7 @@ void TableDesignWidget::onSelectionChanged() Reference< XShapeDescriptor > xDesc( aSel, UNO_QUERY ); if( xDesc.is() && ( xDesc->getShapeType() == "com.sun.star.drawing.TableShape" || xDesc->getShapeType() == "com.sun.star.presentation.TableShape" ) ) { - xNewSelection = Reference< XPropertySet >::query( xDesc ); + xNewSelection.set( xDesc, UNO_QUERY ); } } } @@ -459,7 +459,7 @@ IMPL_LINK_TYPED(TableDesignWidget,EventMultiplexerListener, break; case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: - mxView = Reference<XDrawView>::query( mrBase.GetController() ); + mxView.set( mrBase.GetController(), UNO_QUERY ); onSelectionChanged(); break; } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index c2f6ced..39a4992 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -339,7 +339,7 @@ Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage() // When there is not yet a sub controller (during initialization) then fall back // to the current page in mpCurrentPage. if ( ! xPage.is() && mpCurrentPage.is()) - xPage = Reference<drawing::XDrawPage>(mpCurrentPage->getUnoPage(), UNO_QUERY); + xPage.set(mpCurrentPage->getUnoPage(), UNO_QUERY); return xPage; } @@ -849,7 +849,7 @@ void DrawController::DisposeFrameworkControllers() if (xComponent.is()) xComponent->dispose(); - xComponent = Reference<XComponent>(mxConfigurationController, UNO_QUERY); + xComponent.set(mxConfigurationController, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); } diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 0228b5e..1caf0ec 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -451,7 +451,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() SdrPage* pPage = pPV ? pPV->GetPage() : NULL; if(pPage) - xPage = Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ); + xPage.set( pPage->getUnoPage(), UNO_QUERY ); return xPage; } diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 6068012..da661fa 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -101,7 +101,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage() SdPage* pPage = mrOutlineViewShell.getCurrentPage(); if (pPage != NULL) - xPage = Reference<drawing::XDrawPage>::query(pPage->getUnoPage()); + xPage.set(pPage->getUnoPage(), UNO_QUERY); return xPage; } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index e887c8f..53b40c7 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -764,7 +764,7 @@ uno::Reference<drawing::XLayer> SdLayerManager::GetLayer (SdrLayer* pLayer) // Search existing xLayer for the given pLayer. if (mpLayers->findRef (xRef, static_cast<void*>(pLayer), compare_layers)) - xLayer = uno::Reference<drawing::XLayer> (xRef, uno::UNO_QUERY); + xLayer.set(xRef, uno::UNO_QUERY); // Create the xLayer if necessary. if ( ! xLayer.is()) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 94a655f..e426351 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -332,7 +332,7 @@ const css::uno::Sequence< sal_Int8 > & SdXImpressDocument::getUnoTunnelId() thro SdXImpressDocument* SdXImpressDocument::getImplementation( const uno::Reference< uno::XInterface >& xInt ) { - css::uno::Reference< css::lang::XUnoTunnel > xUT( xInt, css::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( xInt, uno::UNO_QUERY ); if( xUT.is() ) return reinterpret_cast<SdXImpressDocument*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( SdXImpressDocument::getUnoTunnelId() ))); else @@ -623,7 +623,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD if( !rList.empty() ) { - xRet = uno::Reference< container::XIndexAccess >(document::IndexedPropertyValues::create( ::comphelper::getProcessComponentContext() ), uno::UNO_QUERY); + xRet.set(document::IndexedPropertyValues::create( ::comphelper::getProcessComponentContext() ), uno::UNO_QUERY); uno::Reference < container::XIndexContainer > xCont( xRet, uno::UNO_QUERY ); DBG_ASSERT( xCont.is(), "SdXImpressDocument::getViewData() failed for OLE object" ); @@ -810,7 +810,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMast initializeDocument(); SdPage* pPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); if( pPage ) - xPage = uno::Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ); + xPage.set( pPage->getUnoPage(), uno::UNO_QUERY ); } return xPage; } @@ -3095,7 +3095,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pMPage->EnsureMasterPageDefaultBackground(); } - xDrawPage = uno::Reference< drawing::XDrawPage >::query( pMPage->getUnoPage() ); + xDrawPage.set( pMPage->getUnoPage(), uno::UNO_QUERY ); // create and insert new notes masterpage SdPage* pMNotesPage = mpModel->mpDoc->AllocSdPage(true); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index ac6b7a1..5010430 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1598,7 +1598,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if( pObj ) - xShape = Reference< drawing::XShape >::query( pObj->getUnoShape() ); + xShape.set( pObj->getUnoShape(), UNO_QUERY ); } mpView->HideSdrPage(); @@ -1649,7 +1649,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); if( pObj ) - xShape = Reference< drawing::XShape >::query( pObj->getUnoShape() ); + xShape.set( pObj->getUnoShape(), UNO_QUERY ); } mpView->HideSdrPage(); @@ -2364,7 +2364,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) if(SvxFmDrawPage::mpPage->TRG_HasMasterPage()) { SdrPage& rMasterPage = SvxFmDrawPage::mpPage->TRG_GetMasterPage(); - xPage = uno::Reference< drawing::XDrawPage >( rMasterPage.getUnoPage(), uno::UNO_QUERY ); + xPage.set( rMasterPage.getUnoPage(), uno::UNO_QUERY ); } return xPage; @@ -2638,7 +2638,7 @@ SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) SdrObject* pObj = pPage->GetObj( nIndex ); sal_uInt32 nNavPos = pObj->GetNavigationPosition(); DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" ); - maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY ); + maShapes[nNavPos].set( pObj->getUnoShape(), UNO_QUERY ); } } } diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 8e3b344..a7b3372 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -210,7 +210,7 @@ vcl::Window* ViewTabBar::GetAnchorWindow( Reference<XConfigurationController> xCC ( xControllerManager->getConfigurationController()); if (xCC.is()) - xPane = Reference<XPane>(xCC->getResource(rxViewTabBarId->getAnchor()), UNO_QUERY); + xPane.set(xCC->getResource(rxViewTabBarId->getAnchor()), UNO_QUERY); } catch (const RuntimeException&) { @@ -351,11 +351,11 @@ bool ViewTabBar::ActivatePage() Reference<XView> xView; try { - xView = Reference<XView>(xConfigurationController->getResource( - ResourceId::create( - ::comphelper::getProcessComponentContext(), - FrameworkHelper::msCenterPaneURL)), - UNO_QUERY); + xView.set(xConfigurationController->getResource( + ResourceId::create( + ::comphelper::getProcessComponentContext(), + FrameworkHelper::msCenterPaneURL)), + UNO_QUERY); } catch (const DeploymentException&) { diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 3446b8a..c9f3aa4 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -396,9 +396,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) Reference<XController> xController( xFrame->getController(), UNO_SET_THROW ); // Restore the configuration. - xControllerManager = Reference<XControllerManager>( xController, UNO_QUERY_THROW); - xConfigurationController = Reference<XConfigurationController>( - xControllerManager->getConfigurationController()); + xControllerManager.set( xController, UNO_QUERY_THROW ); + xConfigurationController.set( xControllerManager->getConfigurationController() ); if ( ! xConfigurationController.is()) throw RuntimeException(); xConfigurationController->restoreConfiguration(xConfiguration); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 0c8d943..444e8bd 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -337,9 +337,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) { mxScannerManager = scanner::ScannerManager::create( xContext ); - mxScannerListener = uno::Reference< lang::XEventListener >( - static_cast< ::cppu::OWeakObject* >( new ScannerEventListener( this ) ), - uno::UNO_QUERY ); + mxScannerListener.set( static_cast< ::cppu::OWeakObject* >( new ScannerEventListener( this ) ), + uno::UNO_QUERY ); } catch (Exception& exception) { @@ -377,10 +376,7 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo if (IsMainViewShell()) { // Create uno sub controller for the main view shell. - xSubController = css::uno::Reference<css::drawing::XDrawSubController>( - new SdUnoDrawView ( - *this, - *GetView())); + xSubController.set( new SdUnoDrawView( *this, *GetView())); } return xSubController; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 88d743d..fa085c0 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -175,9 +175,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController() if (IsMainViewShell()) { // Create uno sub controller for the main view shell. - xSubController = Reference<drawing::XDrawSubController>( - new SdUnoOutlineView ( - *this)); + xSubController.set( new SdUnoOutlineView(*this) ); } return xSubController; commit 0eb9f56db5dad711f12283d097e1d56a801ba526 Author: Noel Grandin <[email protected]> Date: Wed Nov 4 15:36:18 2015 +0200 use uno::Reference::set method instead of assignment Change-Id: I2b592fd3327f4bbe4685e84711dc9d6f19222a97 diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index a5371e2..4a176b9 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -66,7 +66,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet) //set value from xnamedranges.hxx uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW); - xSheet = uno::Reference< sheet::XSpreadsheet >(xIndexAccess->getByIndex(nSheet),UNO_QUERY_THROW); + xSheet.set(xIndexAccess->getByIndex(nSheet),UNO_QUERY_THROW); return xNamedRanges; } diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index a71192c..570b957 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -84,7 +84,7 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init() if(!mxComponent.is()) mxComponent = loadFromDesktop(aFileURL); CPPUNIT_ASSERT(mxComponent.is()); - xDocument = uno::Reference< sheet::XSpreadsheetDocument >(mxComponent, UNO_QUERY_THROW); + xDocument.set(mxComponent, UNO_QUERY_THROW); uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), UNO_QUERY_THROW); return xReturn; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 50fc32d..0c52b11 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1898,7 +1898,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb { uno::Reference<uno::XInterface> xIntDim = ScUnoHelpFunctions::AnyToInterface( xIntDims->getByIndex(rElemDesc.Dimension) ); - xDim = uno::Reference<container::XNamed>( xIntDim, uno::UNO_QUERY ); + xDim.set( xIntDim, uno::UNO_QUERY ); } OSL_ENSURE( xDim.is(), "dimension not found" ); if ( !xDim.is() ) return; @@ -2776,7 +2776,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS pArray[3] <<= OUString( rDesc.aParPass ); xInit->initialize( aSeq ); } - xRet = uno::Reference<sheet::XDimensionsSupplier>( xInterface, uno::UNO_QUERY ); + xRet.set( xInterface, uno::UNO_QUERY ); } catch(uno::Exception&) { diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 48f060f..506b276 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1546,7 +1546,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) uno::Reference<uno::XInterface> xInterface; rNewRes >>= xInterface; if ( xInterface.is() ) - xVarRes = uno::Reference<sheet::XVolatileResult>( xInterface, uno::UNO_QUERY ); + xVarRes.set( xInterface, uno::UNO_QUERY ); if (!xVarRes.is()) nErrCode = errNoValue; // unknown interface diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index f36309b..20d5530 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -28,8 +28,7 @@ static rtl::Reference<ConfigurationListener> getMiscListener() { static rtl::Reference<ConfigurationListener> xListener; if (!xListener.is()) - xListener = rtl::Reference<ConfigurationListener>( - new ConfigurationListener("/org.openoffice.Office.Common/Misc")); + xListener.set(new ConfigurationListener("/org.openoffice.Office.Common/Misc")); return xListener; } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 8d28ef2..527ff99 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -574,7 +574,7 @@ bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi bRet = true; xWorkStore->dispose(); - xWorkStore = uno::Reference < embed::XStorage >(); + xWorkStore.clear(); rxOStm->Commit(); } catch ( uno::Exception& ) diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 15ac5ad..b539596 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -467,7 +467,7 @@ bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* p bRet = true; xWorkStore->dispose(); - xWorkStore = uno::Reference < embed::XStorage >(); + xWorkStore.clear(); rxOStm->Commit(); } break; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 08499ef..ce439e6 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -195,8 +195,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // only text (title is still needed, for the cancel button) ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 ); - uno::Reference<sdbc::XRowSet> xRowSet = uno::Reference<sdbc::XRowSet>( - xResultSet, uno::UNO_QUERY ); + uno::Reference<sdbc::XRowSet> xRowSet( xResultSet, uno::UNO_QUERY ); bool bDispose = false; if ( !xRowSet.is() ) { diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 1fb50a9..9e08c74 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -97,7 +97,7 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) if( pObject && dynamic_cast<const SdrOle2Obj*>( pObject) != nullptr ) { - Reference< drawing::XShape > xSourceDoc = Reference< drawing::XShape >( pObject->getUnoShape(), UNO_QUERY_THROW ); + Reference< drawing::XShape > xSourceDoc( pObject->getUnoShape(), UNO_QUERY_THROW ); GraphicHelper::SaveShapeAsGraphic( xSourceDoc ); } } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index e536e19..c7e8787 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -99,7 +99,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : osl_atomic_increment( &m_refCount ); { - mxShapeAgg = uno::Reference<uno::XAggregation>( xShape, uno::UNO_QUERY ); + mxShapeAgg.set( xShape, uno::UNO_QUERY ); // extra block to force deletion of the temporary before setDelegator } diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 594d7de..2816d85 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -274,7 +274,7 @@ namespace basprov m_pAppBasicManager = SfxApplication::GetBasicManager(); if ( !m_xLibContainerApp.is() ) - m_xLibContainerApp = Reference< script::XLibraryContainer >( SfxGetpApp()->GetBasicContainer(), UNO_QUERY ); + m_xLibContainerApp.set( SfxGetpApp()->GetBasicContainer(), UNO_QUERY ); } diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 1eb20b7..55666ee 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -111,7 +111,7 @@ namespace dlgprov if ( xSMgr.is() ) { args[0] <<= xModel; - mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY ); + mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY ); } if ( rxControl.is() ) { @@ -315,7 +315,7 @@ namespace dlgprov for ( sal_Int32 i2 = 0; i2 < nControlCount; ++i2 ) { - pObjects2[i2] = Reference< XInterface >( pControls[i2], UNO_QUERY ); + pObjects2[i2].set( pControls[i2], UNO_QUERY ); } nestedAttachEvents( aObjects, Helper, sDialogCodeName ); } @@ -341,7 +341,7 @@ namespace dlgprov Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); if ( xSMgr.is() ) { - m_xEventAttacher = Reference< XEventAttacher >( xSMgr->createInstanceWithContext( + m_xEventAttacher.set( xSMgr->createInstanceWithContext( "com.sun.star.script.EventAttacher", m_xContext ), UNO_QUERY ); if ( !m_xEventAttacher.is() ) diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 1d51a3a..5451886 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -284,7 +284,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; Reference< uri::XUriReference > uriRef; for (;;) { - uriRef = Reference< uri::XUriReference >( xFac->parse( aURL ), UNO_QUERY ); + uriRef.set( xFac->parse( aURL ), UNO_QUERY ); if ( !uriRef.is() ) { OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: "); @@ -334,7 +334,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; if ( sLocation == "application" ) { - xLibContainer = Reference< XLibraryContainer >( SfxGetpApp()->GetDialogContainer(), UNO_QUERY ); + xLibContainer.set( SfxGetpApp()->GetDialogContainer(), UNO_QUERY ); } else if ( sLocation == "document" ) { @@ -447,7 +447,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; Reference< container::XNameContainer > xDialogModel( createDialogModel( xInput , xStringResourceManager, aDialogSourceURLAny ), UNO_QUERY_THROW); - xCtrlModel = Reference< XControlModel >( xDialogModel, UNO_QUERY ); + xCtrlModel.set( xDialogModel, UNO_QUERY ); } ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
