diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 15:22:20 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 15:22:20 +0000 |
| commit | 1419b84f94765ac40eab223a94c0bb9870027807 (patch) | |
| tree | 6af3c46096c2cfbfac84c1184ea1f2d04347b345 /sfx2/source/appl/appmain.cxx | |
| parent | d283d7811e14e53f53dcc340c1ea9d0b7cb9f893 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.15.42); FILE MERGED
2003/12/11 09:08:22 mt 1.15.42.2: #i23061# VCL cleanup, removed headers, methods and types...
2003/12/04 15:54:01 mt 1.15.42.1: #i23061# Removed/Changed old StarView stuff
Diffstat (limited to 'sfx2/source/appl/appmain.cxx')
| -rw-r--r-- | sfx2/source/appl/appmain.cxx | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index a71c34f61d7f..4a92afff55bc 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appmain.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2003-09-19 07:56:25 $ + * last change: $Author: vg $ $Date: 2004-01-06 16:22:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #ifndef _CSTITEM_HXX //autogen #include <svtools/cstitem.hxx> #endif -#ifndef _SV_CONFIG_HXX //autogen -#include <vcl/config.hxx> +#ifndef _CONFIG_HXX +#include <tools/config.hxx> #endif #ifndef _EHDL_HXX #include <svtools/ehdl.hxx> @@ -462,36 +462,4 @@ SfxFilterMatcher& SfxApplication::GetFilterMatcher() pAppData_Impl->pMatcher, SfxFilterMatcher, MaybeFileHdl_Impl ) ); } return *pAppData_Impl->pMatcher; -} - -//------------------------------------------------------------------------- - -BOOL SfxApplication::IsStandalone() const -{ -#if SUPD<613//MUSTINI - // Wenn ohne UI gestartet, nat"urlich niemals integrierter Desktop - if ( pAppData_Impl->bBean ) - return TRUE; - - String aExt = SFX_INIMANAGER()->Get( String::CreateFromAscii( "Common"), 0, 0, String::CreateFromAscii("FullScreenDesktop") ); - if ( aExt.Len() ) - { - // INI-Eintrag auswerten - return !( (BOOL) (USHORT) aExt.ToInt32() ); - } - else - { - // Defaults: bei AppServer kein integrierter Desktop, bei FatOffice - // unter WNT integriert, ansonsten nicht - if ( Application::IsRemoteServer() ) - return TRUE; -#ifdef WNT - return FALSE; -#else - return TRUE; -#endif - } -#else//MUSTINI - return FALSE; -#endif -} +}
\ No newline at end of file |