diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-02-25 17:16:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-02-25 17:16:12 +0000 |
| commit | 92e7a4d09d2b22a257a20639c33578b7acfa099e (patch) | |
| tree | d3df718d70fd3c84e335c20847838095d5008b99 /desktop/source | |
| parent | 3274ef4ec111c4957996385f369d1212d9fd2a68 (diff) | |
INTEGRATION: CWS layoutmanager (1.124.2); FILE MERGED
2004/02/19 14:31:25 cd 1.124.2.3: RESYNC: (1.129-1.130); FILE MERGED
2004/01/29 18:36:32 cd 1.124.2.2: RESYNC: (1.124-1.129); FILE MERGED
2004/01/26 09:01:54 as 1.124.2.1: #112900# use StartModule if it is installed only
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 225a0a6ab29b..586fa9f65abe 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.130 $ + * $Revision: 1.131 $ * - * last change: $Author: hr $ $Date: 2004-02-03 20:03:09 $ + * last change: $Author: kz $ $Date: 2004-02-25 18:16:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1396,7 +1396,7 @@ void Desktop::Main() return; } - if (pCmdLineArgs->IsEmpty()) + if (pCmdLineArgs->IsEmpty() && SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) { ::desktop::Desktop::bSuppressOpenDefault = sal_True; RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" ); @@ -1416,7 +1416,7 @@ void Desktop::Main() lArgs[0] <<= xContainerWindow; Reference< XController > xBackingComp( - xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.view.BackingComp") ), lArgs), + xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs), UNO_QUERY); if (xBackingComp.is()) |