salinst.cxx (01367266) salinst.cxx (4f2b6604)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

204
205 if( ImplGetSVData()->mbIsTestTool )
206 [NSApp activateIgnoringOtherApps: YES];
207}
208
209sal_Bool ImplSVMainHook( sal_Bool * pbInit )
210{
211 gpbInit = pbInit;
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

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

204
205 if( ImplGetSVData()->mbIsTestTool )
206 [NSApp activateIgnoringOtherApps: YES];
207}
208
209sal_Bool ImplSVMainHook( sal_Bool * pbInit )
210{
211 gpbInit = pbInit;
212
213 bNoSVMain = false;
214 initNSApp();
215
216 NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
217 location: NSZeroPoint
218 modifierFlags: 0
219 timestamp: 0
220 windowNumber: 0
221 context: nil
222 subtype: AquaSalInstance::AppExecuteSVMain
223 data1: 0
224 data2: 0 ];
225 if( pEvent )
226 {
227 [NSApp postEvent: pEvent atStart: NO];
228
212
213 bNoSVMain = false;
214 initNSApp();
215
229 rtl::OUString aExeURL, aExe;
230 osl_getExecutableFile( &aExeURL.pData );
231 osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
232 rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
233
234#ifdef DEBUG
235 aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
236 const char* pArgv[] = { aByteExe.getStr(), NULL };
237 NSApplicationMain( 3, pArgv );
238#else
239 const char* pArgv[] = { aByteExe.getStr(), NULL };
240 NSApplicationMain( 1, pArgv );
241#endif
216 rtl::OUString aExeURL, aExe;
217 osl_getExecutableFile( &aExeURL.pData );
218 osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
219 rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
220
221#ifdef DEBUG
222 aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
223 const char* pArgv[] = { aByteExe.getStr(), NULL };
224 NSApplicationMain( 3, pArgv );
225#else
226 const char* pArgv[] = { aByteExe.getStr(), NULL };
227 NSApplicationMain( 1, pArgv );
228#endif
242 }
243 else
244 {
245 DBG_ERROR( "NSApplication initialization could not be done" );
246 }
247
248 return TRUE; // indicate that ImplSVMainHook is implemented
249}
250
251// =======================================================================
252
253void SalAbort( const XubString& rErrorText )
254{

--- 1080 unchanged lines hidden --- 		229
230 return TRUE; // indicate that ImplSVMainHook is implemented
231}
232
233// =======================================================================
234
235void SalAbort( const XubString& rErrorText )
236{

--- 1080 unchanged lines hidden ---