diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 16:02:04 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 16:02:04 +0000 |
commit | a2f0bda4940ffd0fc35ad7c19a20b09e8ce613a0 (patch) | |
tree | 17345f5e234840050cd555d4cdebaeda05c25aa5 /odk/examples/cpp | |
parent | 57d6eab350cfe3a9c759efcb1a79eb2f7e8d0e02 (diff) |
INTEGRATION: CWS sdksample (1.9.40); FILE MERGED
2005/01/12 15:17:56 jsc 1.9.40.3: #i39890# change to new OpenDocument format
2004/07/21 16:17:16 jsc 1.9.40.2: #i29308# take care of full qualified path
2004/07/21 14:28:17 jsc 1.9.40.1: #i29308# take care of full qualified path
Diffstat (limited to 'odk/examples/cpp')
-rw-r--r-- | odk/examples/cpp/DocumentLoader/DocumentLoader.cxx | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index f3127e4cdd7a..374029d9ed86 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DocumentLoader.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2004-02-02 20:07:32 $ + * last change: $Author: rt $ $Date: 2005-01-31 17:02:04 $ * * The Contents of this file are made available subject to the terms of * the BSD license. @@ -46,6 +46,7 @@ ***************************************************************************** *****************************************************************************/ #include <stdio.h> +#include <wchar.h> #include <cppuhelper/bootstrap.hxx> @@ -74,7 +75,7 @@ int SAL_CALL main( int argc, char **argv ) if (argc < 2) { printf("using: DocumentLoader <file_url> [<uno_connection_url>]\n\n" - "example: DocumentLoader \"file:///e:/temp/test.sxw\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n"); + "example: DocumentLoader \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n"); exit(1); } if (argc == 3) @@ -82,7 +83,6 @@ int SAL_CALL main( int argc, char **argv ) sConnectionString = OUString::createFromAscii(argv[2]); } - // Creates a simple registry service instance. Reference< XSimpleRegistry > xSimpleRegistry( ::cppu::createSimpleRegistry() ); @@ -102,28 +102,6 @@ int SAL_CALL main( int argc, char **argv ) Reference< XComponentContext > xComponentContext( ::cppu::bootstrap_InitialComponentContext( xSimpleRegistry ) ); - /* Bootstraps an initial component context with service manager upon default - types and services registry. This includes insertion of initial services: - - (registry) service manager, shared lib loader, - - simple registry, nested registry, - - implementation registration - - registry typedescription provider, typedescription manager (also - installs it into cppu core) - - This function tries to find its parameters via these bootstrap variables: - - UNO_TYPES -- a space separated list of file urls of type rdbs - - UNO_SERVICES -- a space separated list of file urls of service rdbs - - UNO_WRITERDB -- a file url of a write rdb (e.g. user.rdb) - - For further info, please look at: - http://udk.openoffice.org/common/man/concept/uno_default_bootstrapping.html - */ - /* - Reference< XComponentContext > xComponentContext( - ::cppu::defaultBootstrap_InitialComponentContext() ); - OSL_ASSERT( xcomponentcontext.is() ); - */ - /* Gets the service manager instance to be used (or null). This method has been added for convenience, because the service manager is a often used object. @@ -174,12 +152,13 @@ int SAL_CALL main( int argc, char **argv ) /* Loads a component specified by an URL into the specified new or existing frame. */ - OUString sDocUrl, sWorkingDir; + OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl; osl_getProcessWorkingDir(&sWorkingDir.pData); - osl::FileBase::getAbsoluteFileURL( sWorkingDir, OUString::createFromAscii(argv[1]), sDocUrl); + osl::FileBase::getFileURLFromSystemPath( OUString::createFromAscii(argv[1]), sDocPathUrl); + osl::FileBase::getAbsoluteFileURL( sWorkingDir, sDocPathUrl, sAbsoluteDocUrl); Reference< XComponent > xComponent = xComponentLoader->loadComponentFromURL( - sDocUrl, OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, + sAbsoluteDocUrl, OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, Sequence < ::com::sun::star::beans::PropertyValue >() ); // dispose the local service manager |