Attachment #47694 for issue #80769

View | Details | Raw Unified | Return to issue 80769
Collapse All | Expand All




#ifndef _LIST_HXX //autogen
#include <tools/list.hxx>
#endif
#ifndef _SHL_HXX //autogen
#include <tools/shl.hxx>
#endif
#ifndef _TOOLS_RC_HXX //autogen
#include <tools/rc.hxx>
#endif

		pCLASSFAC = NULL;
		RemoveFactory( pOLEFAC );
		pOLEFAC = NULL;

#ifdef DBG_UTIL
	// SbiData braucht am Programm-Ende nicht abgeraeumt werden,
	// aber wir wollen keine MLK's beim Purify
	// Wo sollte es sonst geschehen???
	SbiGlobals** pp = (SbiGlobals**) ::GetAppData( SHL_SBC );
	SbiGlobals* p = *pp;
	if( p )
	{
		delete p;
		*pp = 0;
	}
#endif
	}

    // #100326 Set Parent NULL in registered listeners




 *
 ************************************************************************/

#ifndef _SHL_HXX //autogen
#include <tools/shl.hxx>
#endif

#include "sbintern.hxx"
#include "sbunoobj.hxx"
#include "token.hxx"				// Tokenizer


SbiGlobals* GetSbData()
{
    DBG_TESTSOLARMUTEX();
    static SbiGlobals* s_pGlobals = new SbiGlobals;
    return s_pGlobals;
		p = *pp = new SbiGlobals;
	return p;
}

SbiGlobals::SbiGlobals()

Lines 44-52 Link Here

(-)bf_basic/source/classes/sbxmod.cxx (-3 lines)
44	#ifndef _SFXBRDCST_HXX //autogen	44	#ifndef _SFXBRDCST_HXX //autogen
45	#include <svtools/brdcst.hxx>	45	#include <svtools/brdcst.hxx>
46	#endif	46	#endif
47	#ifndef _SHL_HXX //autogen
48	#include <tools/shl.hxx>
49	#endif
50	#include <sbx.hxx>	47	#include <sbx.hxx>
51	#include "sb.hxx"	48	#include "sb.hxx"
52	#include <sbjsmeth.hxx>	49	#include <sbjsmeth.hxx>

Lines 33-41 Link Here

(-)bf_basic/source/runtime/basrdll.cxx (-3 lines)
33	*	33	*
34	************************************************************************/	34	************************************************************************/
35		35
36	#ifndef _SHL_HXX //autogen
37	#include <tools/shl.hxx>
38	#endif
39	/?/ // #ifndef _SV_SVAPP_HXX //autogen	36	/?/ // #ifndef _SV_SVAPP_HXX //autogen
40	/?/ // #include <vcl/svapp.hxx>	37	/?/ // #include <vcl/svapp.hxx>
41	/?/ // #endif	38	/?/ // #endif




 *
 ************************************************************************/

#ifndef _SHL_HXX //autogen
#include <tools/shl.hxx>
#endif

#ifndef _STREAM_HXX //autogen
#include <tools/stream.hxx>
#endif


SbxAppData* GetSbxData_Impl()
{
    DBG_TESTSOLARMUTEX();
    static SbxAppData* pAppData = new SbxAppData;
    return pAppData;
	if( !p )
		p = *ppData  = new SbxAppData;
	return p;
#else
	SbxAppData** ppData;
	SbxAppData* p;
	p = *ppData  = new SbxAppData;
	return p;
#endif
}

SbxAppData::~SbxAppData()

Return to issue 80769

Lines 51-59 Link Here

(-)bf_basic/source/classes/sb.cxx (-16 lines)
51	#ifndef _LIST_HXX //autogen	51	#ifndef _LIST_HXX //autogen
52	#include <tools/list.hxx>	52	#include <tools/list.hxx>
53	#endif	53	#endif
54	#ifndef _SHL_HXX //autogen
55	#include <tools/shl.hxx>
56	#endif
57	#ifndef _TOOLS_RC_HXX //autogen	54	#ifndef _TOOLS_RC_HXX //autogen
58	#include <tools/rc.hxx>	55	#include <tools/rc.hxx>
59	#endif	56	#endif
Lines 709-727 Link Here
709	pCLASSFAC = NULL;	706	pCLASSFAC = NULL;
710	RemoveFactory( pOLEFAC );	707	RemoveFactory( pOLEFAC );
711	pOLEFAC = NULL;	708	pOLEFAC = NULL;
712
713	#ifdef DBG_UTIL
714	// SbiData braucht am Programm-Ende nicht abgeraeumt werden,
715	// aber wir wollen keine MLK's beim Purify
716	// Wo sollte es sonst geschehen???
717	SbiGlobals pp = (SbiGlobals) ::GetAppData( SHL_SBC );
718	SbiGlobals* p = *pp;
719	if( p )
720	{
721	delete p;
722	*pp = 0;
723	}
724	#endif
725	}	709	}
726		710
727	// #100326 Set Parent NULL in registered listeners	711	// #100326 Set Parent NULL in registered listeners

Lines 33-42 Link Here

(-)bf_basic/source/classes/sbintern.cxx (-9 / +3 lines)
33	*	33	*
34	************************************************************************/	34	************************************************************************/
35		35
36	#ifndef _SHL_HXX //autogen
37	#include <tools/shl.hxx>
38	#endif
39
40	#include "sbintern.hxx"	36	#include "sbintern.hxx"
41	#include "sbunoobj.hxx"	37	#include "sbunoobj.hxx"
42	#include "token.hxx" // Tokenizer	38	#include "token.hxx" // Tokenizer
Lines 51-61 Link Here
51		47
52	SbiGlobals* GetSbData()	48	SbiGlobals* GetSbData()
53	{	49	{
54	SbiGlobals pp = (SbiGlobals) ::GetAppData( SHL_SBC );	50	DBG_TESTSOLARMUTEX();
55	SbiGlobals* p = *pp;	51	static SbiGlobals* s_pGlobals = new SbiGlobals;
56	if( !p )	52	return s_pGlobals;
57	p = *pp = new SbiGlobals;
58	return p;
59	}	53	}
60		54
61	SbiGlobals::SbiGlobals()	55	SbiGlobals::SbiGlobals()

Lines 33-42 Link Here

(-)bf_basic/source/sbx/sbxbase.cxx (-16 / +3 lines)
33	*	33	*
34	************************************************************************/	34	************************************************************************/
35		35
36	#ifndef _SHL_HXX //autogen
37	#include <tools/shl.hxx>
38	#endif
39
40	#ifndef _STREAM_HXX //autogen	36	#ifndef _STREAM_HXX //autogen
41	#include <tools/stream.hxx>	37	#include <tools/stream.hxx>
42	#endif	38	#endif
Lines 59-76 Link Here
59		55
60	SbxAppData* GetSbxData_Impl()	56	SbxAppData* GetSbxData_Impl()
61	{	57	{
62	#ifndef DOS	58	DBG_TESTSOLARMUTEX();
63	SbxAppData ppData = (SbxAppData) ::GetAppData( SHL_SBX );	59	static SbxAppData* pAppData = new SbxAppData;
64	SbxAppData* p = *ppData;	60	return pAppData;
65	if( !p )
66	p = *ppData = new SbxAppData;
67	return p;
68	#else
69	SbxAppData** ppData;
70	SbxAppData* p;
71	p = *ppData = new SbxAppData;
72	return p;
73	#endif
74	}	61	}
75		62
76	SbxAppData::~SbxAppData()	63	SbxAppData::~SbxAppData()