diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 13:33:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 13:33:11 +0000 |
| commit | 332f1551ca13346c957f82a47079183f93dfad49 (patch) | |
| tree | 49aff98894659d6f5418d0046a05941e5c13b75e /vcl/source/app/svmain.cxx | |
| parent | ae05c039393a7a4bfa101b557a796fd26ca298d3 (diff) | |
INTEGRATION: CWS impressa11y (1.64.58); FILE MERGED
2008/05/29 12:41:30 af 1.64.58.6: RESYNC: (1.70-1.72); FILE MERGED
2008/01/22 15:24:48 af 1.64.58.5: RESYNC: (1.68-1.70); FILE MERGED
2007/06/18 17:25:40 af 1.64.58.4: RESYNC: (1.67-1.68); FILE MERGED
2007/04/19 18:23:38 af 1.64.58.3: RESYNC: (1.65-1.67); FILE MERGED
2007/01/08 15:36:01 af 1.64.58.2: RESYNC: (1.64-1.65); FILE MERGED
2006/10/18 13:00:08 af 1.64.58.1: #i70548# Reordered code in DeInitVCL to avoid crash on leaving Office after turning on accessibility.
Diffstat (limited to 'vcl/source/app/svmain.cxx')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index f86801dde9d1..a2f8c947c241 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svmain.cxx,v $ - * $Revision: 1.72 $ + * $Revision: 1.73 $ * * This file is part of OpenOffice.org. * @@ -452,6 +452,13 @@ void DeInitVCL() pSVData->mpDefaultWin = NULL; } + // #114285# Moved here from ImplDeInitSVData... + if ( pSVData->mpUnoWrapper ) + { + pSVData->mpUnoWrapper->Destroy(); + pSVData->mpUnoWrapper = NULL; + } + pSVData->maAppData.mxMSF.clear(); if( pSVData->mpApp ) @@ -506,13 +513,6 @@ void DeInitVCL() if ( pSVData->maAppData.mpFirstEventHook ) ImplFreeEventHookData(); - // #114285# Moved here from ImplDeInitSVData... - if ( pSVData->mpUnoWrapper ) - { - pSVData->mpUnoWrapper->Destroy(); - pSVData->mpUnoWrapper = NULL; - } - ImplDeletePrnQueueList(); delete pSVData->maGDIData.mpScreenFontList; pSVData->maGDIData.mpScreenFontList = NULL; |