summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-22 17:09:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-24 08:08:00 +0100
commitad73967e99235a2ba9b5a2106c5d6d0f8efaa1ca (patch)
tree5b11b7812b84c2647c64d1002bad7ed8a1d1754d /svtools
parenta53577e6ff3629c4e9219616960d89eea9463593 (diff)
Remove unnecessary extractInterface
Change-Id: I4848bf84615274ad5732223a354fb7a6b845d9a8
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx5
-rw-r--r--svtools/source/uno/genericunodialog.cxx4
2 files changed, 4 insertions, 5 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 2c0d731bb6d8..167369b50837 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -25,7 +25,6 @@
#include <svtools/helpid.hrc>
#include <svtools/svtresid.hxx>
#include <tools/debug.hxx>
-#include <comphelper/extract.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -942,7 +941,9 @@ void AssignmentPersistentData::Commit()
// get the table and the columns
Reference< XColumnsSupplier > xSuppTableCols;
if (m_xCurrentDatasourceTables->hasByName(sSelectedTable))
- ::cppu::extractInterface(xSuppTableCols, m_xCurrentDatasourceTables->getByName(sSelectedTable));
+ xSuppTableCols.set(
+ m_xCurrentDatasourceTables->getByName(sSelectedTable),
+ css::uno::UNO_QUERY);
Reference< XNameAccess > xColumns;
if (xSuppTableCols.is())
xColumns = xSuppTableCols->getColumns();
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 3f225cd7a591..189b3b5853de 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <toolkit/awt/vclxwindow.hxx>
-#include <comphelper/extract.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
@@ -127,8 +126,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any&
{
case UNODIALOG_PROPERTY_ID_PARENT:
{
- Reference<starawt::XWindow> xNew;
- ::cppu::extractInterface(xNew, rValue);
+ Reference<starawt::XWindow> xNew(rValue, css::uno::UNO_QUERY);
if (xNew != m_xParent)
{
rConvertedValue <<= xNew;