diff options
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 2 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbashapes.cxx | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/control/throbber.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 7 |
6 files changed, 9 insertions, 11 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 5d32f2d9af72..2775290f9bcd 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -87,7 +87,7 @@ ScVbaControl::getWindowPeer() uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); try { - uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY ); + uno::Reference< awt::XControl > xControl = xControlAccess->getControl( xControlModel ); xWinPeer = xControl->getPeer(); } catch(const uno::Exception&) diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 59e0d9df1fb5..6d6bd434b35e 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -82,7 +82,7 @@ void ScVbaShapes::initBaseCollection() for ( sal_Int32 index=0; index<nLen; ++index ) aShapes.emplace_back( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ); uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( aShapes ) ); - m_xIndexAccess.set( xShapes, uno::UNO_QUERY ); + m_xIndexAccess = xShapes; m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index dedc4e8f90b0..32a29e33c326 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -320,7 +320,7 @@ void LifecycleTest::testToolkit() CPPUNIT_ASSERT(xWindow.is()); // test UNO dispose - css::uno::Reference<css::lang::XComponent> xWinComponent(xWindow, css::uno::UNO_QUERY); + css::uno::Reference<css::lang::XComponent> xWinComponent = xWindow; CPPUNIT_ASSERT(xWinComponent.is()); CPPUNIT_ASSERT(!pVclWin->getRef()->IsDisposed()); xWinComponent->dispose(); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 8485dfcd41af..37c135fbd1bd 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -238,8 +238,7 @@ void Edit::dispose() GetDropTarget()->removeDropTargetListener( xDTL ); } - uno::Reference< lang::XEventListener> xEL( mxDnDListener, uno::UNO_QUERY ); - xEL->disposing( lang::EventObject() ); // #95154# #96585# Empty Source means it's the Client + mxDnDListener->disposing( lang::EventObject() ); // #95154# #96585# Empty Source means it's the Client mxDnDListener.clear(); } @@ -808,7 +807,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool // determine if input-sequence-checking should be applied or not - uno::Reference < i18n::XBreakIterator > xBI( ImplGetBreakIterator(), UNO_QUERY ); + uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator(); bool bIsInputSequenceChecking = rStr.getLength() == 1 && officecfg::Office::Common::I18N::CTL::CTLFont::get() && officecfg::Office::Common::I18N::CTL::CTLSequenceChecking::get() && diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 50621a523637..104a3cc66778 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -81,7 +81,7 @@ namespace { Reference< XGraphic > xGraphic; aMediaProperties.put( "URL", rImageURL ); - xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY ); + xGraphic = xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ); aImages.emplace_back( xGraphic ); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 50fb9c0f4d08..ade5ff504539 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -134,11 +134,10 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() sal_Int16 retVal = 0; - uno::Reference< awt::XExtendedToolkit > xToolkit( - awt::Toolkit::create(m_xContext), - uno::UNO_QUERY); + uno::Reference< awt::XExtendedToolkit > xToolkit = + awt::Toolkit::create(m_xContext); - uno::Reference<frame::XDesktop> xDesktop(frame::Desktop::create(m_xContext), uno::UNO_QUERY); + uno::Reference<frame::XDesktop> xDesktop = frame::Desktop::create(m_xContext); GtkWindow *pParent = RunDialog::GetTransientFor(); if (pParent) |