diff options
| author | sb <sb@openoffice.org> | 2010-09-20 11:01:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-20 11:01:23 +0200 |
| commit | 0cb17600cd492deabe752815d3d84beda1908ed6 (patch) | |
| tree | 7e91127d9c7c7612e50ba3d5563de9a848a5f585 /smoketestoo_native | |
| parent | 273ca25738502c61ba26190aa854eb38d2f8cd3c (diff) | |
sb123: #i112986# fixed merge conflict
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/smoketest.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index d1cf454c0e4c..a4e532123456 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -28,8 +28,8 @@ #include "sal/config.h" #include "boost/noncopyable.hpp" +#include "com/sun/star/awt/AsyncCallback.hpp" #include "com/sun/star/awt/XCallback.hpp" -#include "com/sun/star/awt/XRequestCallback.hpp" #include "com/sun/star/beans/PropertyState.hpp" #include "com/sun/star/beans/PropertyValue.hpp" #include "com/sun/star/document/MacroExecMode.hpp" @@ -186,11 +186,8 @@ void Test::test() { css::uno::UNO_QUERY_THROW); Result result; // Shifted to main thread to work around potential deadlocks (i112867): - css::uno::Reference< css::awt::XRequestCallback >( - connection_.getFactory()->createInstance( //TODO: AsyncCallback ctor - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback"))), - css::uno::UNO_QUERY_THROW)->addCallback( + com::sun::star::awt::AsyncCallback::create( + connection_.getComponentContext())->addCallback( new Callback( disp, url, css::uno::Sequence< css::beans::PropertyValue >(), new Listener(&result)), |