diff options
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index e4cf2969071c..318bad4026de 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1385,8 +1385,8 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for const PropertyValue* pFinalValues = aFinalValues.getConstArray(); for (sal_Int32 i=0; i<aFinalValues.getLength(); ++i, ++pFinalValues) { - Reference< XPropertySet > xParam; - ::cppu::extractInterface(xParam, aRequest.Parameters->getByIndex(i)); + Reference< XPropertySet > xParam( + aRequest.Parameters->getByIndex(i), css::uno::UNO_QUERY); OSL_ENSURE(xParam.is(), "SbaXDataBrowserController::approveParameter: one of the parameters is no property set!"); if (xParam.is()) { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 7a5aa0baca72..6cc20cd287c7 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -63,7 +63,6 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/extract.hxx> #include <comphelper/servicehelper.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> @@ -789,7 +788,7 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId) Reference< XIndexAccess > xCols(GetPeer()->getColumns(), UNO_QUERY); Reference< XPropertySet > xAffectedCol; if (xCols.is() && (nModelPos != (sal_uInt16)-1)) - ::cppu::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos)); + xAffectedCol.set(xCols->getByIndex(nModelPos), css::uno::UNO_QUERY); if (xAffectedCol.is()) { @@ -868,7 +867,7 @@ void SbaGridControl::SetColAttrs(sal_uInt16 nColId) Reference< XIndexAccess > xCols(GetPeer()->getColumns(), UNO_QUERY); Reference< XPropertySet > xAffectedCol; if (xCols.is() && (nModelPos != (sal_uInt16)-1)) - ::cppu::extractInterface(xAffectedCol,xCols->getByIndex(nModelPos)); + xAffectedCol.set(xCols->getByIndex(nModelPos), css::uno::UNO_QUERY); // get the field the column is bound to Reference< XPropertySet > xField = getField(nModelPos); @@ -1326,8 +1325,9 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) Reference< XIndexAccess > xColumnControls((::com::sun::star::form::XGridPeer*)GetPeer(), UNO_QUERY); if (xColumnControls.is()) { - Reference< ::com::sun::star::awt::XTextComponent > xColControl; - ::cppu::extractInterface(xColControl,xColumnControls->getByIndex(GetViewColumnPos(nCol))); + Reference< ::com::sun::star::awt::XTextComponent > xColControl( + xColumnControls->getByIndex(GetViewColumnPos(nCol)), + css::uno::UNO_QUERY); if (xColControl.is()) { m_bActivatingForDrop = sal_True; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 8dd70fb3c1db..b679a28d64cd 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -3026,8 +3026,9 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection ) xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION) >>= xConn; #if OSL_DEBUG_LEVEL > 1 { - Reference< XComponent > xComp; - ::cppu::extractInterface(xComp, xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION)); + Reference< XComponent > xComp( + xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION), + css::uno::UNO_QUERY); } #endif |