diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-04 10:16:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-04 10:16:06 +0200 |
| commit | e6655225e6ee229fb688fb65324e4e9b949065d5 (patch) | |
| tree | 5aea5f4282730b3607f289e7184fceb8f8617fb9 /basic/qa/cppunit | |
| parent | 5a7e4766ca1ae20c6683bb7424f08fc9698ae9b7 (diff) | |
Avoid static BasicDLL (that would be destroyed after DeInitVCL now)
Change-Id: Id8968a7746815ecce79b6eb1ce971b74e770efa4
Diffstat (limited to 'basic/qa/cppunit')
| -rw-r--r-- | basic/qa/cppunit/basictest.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index 369f0dfbbb16..af0c0e808cf8 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -27,10 +27,11 @@ class MacroSnippet bool mbError; SbModuleRef mpMod; StarBASICRef mpBasic; + BasicDLL maDll; // we need a dll instance for resouce manager etc. void InitSnippet() { - CPPUNIT_ASSERT_MESSAGE( "No resource manager", basicDLL().GetBasResMgr() != NULL ); + CPPUNIT_ASSERT_MESSAGE( "No resource manager", maDll.GetBasResMgr() != NULL ); mpBasic = new StarBASIC(); StarBASIC::SetGlobalErrorHdl( LINK( this, MacroSnippet, BasicErrorHdl ) ); } @@ -141,12 +142,6 @@ class MacroSnippet StarBASIC::SetGlobalErrorHdl( Link() ); mbError = false; } - - BasicDLL& basicDLL() - { - static BasicDLL maDll; // we need a dll instance for resouce manager etc. - return maDll; - } }; IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/) |