app.cxx (288ab9e2) app.cxx (2ad018be)
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 118 unchanged lines hidden (view full) ---

127#include <unotools/pathoptions.hxx>
128#include <svl/languageoptions.hxx>
129#include <unotools/internaloptions.hxx>
130#include <svtools/miscopt.hxx>
131#include <svtools/menuoptions.hxx>
132#include <unotools/syslocaleoptions.hxx>
133#include <unotools/syslocale.hxx>
134#include <svl/folderrestriction.hxx>
1/*************************************************************************
2 *
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * Copyright 2000, 2010 Oracle and/or its affiliates.
6 *
7 * OpenOffice.org - a multi-platform office productivity suite
8 *

--- 118 unchanged lines hidden (view full) ---

127#include <unotools/pathoptions.hxx>
128#include <svl/languageoptions.hxx>
129#include <unotools/internaloptions.hxx>
130#include <svtools/miscopt.hxx>
131#include <svtools/menuoptions.hxx>
132#include <unotools/syslocaleoptions.hxx>
133#include <unotools/syslocale.hxx>
134#include <svl/folderrestriction.hxx>
135#include <svl/eitem.hxx>
136#include <svl/itemset.hxx>
135#include <unotools/tempfile.hxx>
136#include <rtl/logfile.hxx>
137#include <rtl/ustrbuf.hxx>
138#include <rtl/strbuf.hxx>
139#include <rtl/bootstrap.hxx>
140#include <rtl/instance.hxx>
141#include <unotools/configmgr.hxx>
142#include <vcl/help.hxx>
143#include <vcl/msgbox.hxx>
144#include <vcl/bitmap.hxx>
145#include <vcl/stdtext.hxx>
146#include <vcl/msgbox.hxx>
147#include <sfx2/sfx.hrc>
137#include <unotools/tempfile.hxx>
138#include <rtl/logfile.hxx>
139#include <rtl/ustrbuf.hxx>
140#include <rtl/strbuf.hxx>
141#include <rtl/bootstrap.hxx>
142#include <rtl/instance.hxx>
143#include <unotools/configmgr.hxx>
144#include <vcl/help.hxx>
145#include <vcl/msgbox.hxx>
146#include <vcl/bitmap.hxx>
147#include <vcl/stdtext.hxx>
148#include <vcl/msgbox.hxx>
149#include <sfx2/sfx.hrc>
150#include <sfx2/app.hxx>
148#include <ucbhelper/contentbroker.hxx>
149#include <unotools/bootstrap.hxx>
150#include <cppuhelper/bootstrap.hxx>
151
152#include "vos/process.hxx"
153
154#include <svtools/fontsubstconfig.hxx>
155#include <svtools/accessibilityoptions.hxx>

--- 1957 unchanged lines hidden (view full) ---

2113 try
2114 {
2115 // the shutdown icon sits in the systray and allows the user to keep
2116 // the office instance running for quicker restart
2117 // this will only be activated if -quickstart was specified on cmdline
2118 RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) createInstance com.sun.star.office.Quickstart" );
2119
2120 sal_Bool bQuickstart = GetCommandLineArgs()->IsQuickstart();
151#include <ucbhelper/contentbroker.hxx>
152#include <unotools/bootstrap.hxx>
153#include <cppuhelper/bootstrap.hxx>
154
155#include "vos/process.hxx"
156
157#include <svtools/fontsubstconfig.hxx>
158#include <svtools/accessibilityoptions.hxx>

--- 1957 unchanged lines hidden (view full) ---

2116 try
2117 {
2118 // the shutdown icon sits in the systray and allows the user to keep
2119 // the office instance running for quicker restart
2120 // this will only be activated if -quickstart was specified on cmdline
2121 RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) createInstance com.sun.star.office.Quickstart" );
2122
2123 sal_Bool bQuickstart = GetCommandLineArgs()->IsQuickstart();
2124 if ( !bQuickstart )
2125 {
2126 SfxItemSet aOptSet( SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER );
2127 SFX_APP()->GetOptions(aOptSet);
2128 const SfxPoolItem* pItem;
2129 if ( SFX_ITEM_SET == aOptSet.GetItemState( SID_ATTR_QUICKLAUNCHER, sal_False, &pItem ) )
2130 bQuickstart = ((const SfxBoolItem*)pItem)->GetValue();
2131 }
2132
2121 Sequence< Any > aSeq( 1 );
2122 aSeq[0] <<= bQuickstart;
2123
2124 // Try to instanciate quickstart service. This service is not mandatory, so
2125 // do nothing if service is not available
2133 Sequence< Any > aSeq( 1 );
2134 aSeq[0] <<= bQuickstart;
2135
2136 // Try to instanciate quickstart service. This service is not mandatory, so
2137 // do nothing if service is not available
2126
2138
2127 // #i105753# the following if was invented for performance
2128 // unfortunately this broke the QUARTZ behavior which is to always run
2129 // in quickstart mode since Mac applications do not usually quit
2130 // when the last document closes
2131 #ifndef QUARTZ
2132 if ( bQuickstart )
2133 #endif
2134 {

--- 1211 unchanged lines hidden --- 		2139 // #i105753# the following if was invented for performance
2140 // unfortunately this broke the QUARTZ behavior which is to always run
2141 // in quickstart mode since Mac applications do not usually quit
2142 // when the last document closes
2143 #ifndef QUARTZ
2144 if ( bQuickstart )
2145 #endif
2146 {

--- 1211 unchanged lines hidden ---