diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx | 6 | ||||
| -rw-r--r-- | odk/examples/cpp/DocumentLoader/DocumentLoader.cxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx index e76f64a05a24..780c18ebcd5b 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx @@ -38,6 +38,7 @@ #include <sal/main.h> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/bridge/XUnoUrlResolver.hpp> +#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> @@ -71,10 +72,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // get an instance of the remote office desktop UNO service // and query the XComponentLoader interface - Reference < XComponentLoader > xComponentLoader( - xServiceManager->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), - xContext ), UNO_QUERY_THROW ); + Reference < XDesktop2 > xComponentLoader = Desktop::create(xContext); // open a spreadsheet document Reference< XComponent > xComponent( xComponentLoader->loadComponentFromURL( diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index a41008172fc8..988f15e896ab 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/bridge/XUnoUrlResolver.hpp> +#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> @@ -131,10 +132,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) /* Creates an instance of a component which supports the services specified by the factory. Important: using the office component context. */ - Reference < XComponentLoader > xComponentLoader( - xMultiComponentFactoryServer->createInstanceWithContext( - OUString( "com.sun.star.frame.Desktop" ), - xComponentContext ), UNO_QUERY ); + Reference < XDesktop2 > xComponentLoader = Desktop::create(xComponentContext); /* Loads a component specified by an URL into the specified new or existing frame. |