diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-25 09:51:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-25 09:51:31 +0000 |
| commit | eb1f17c74e1a8fd33da5766bc4a788e551d1d411 (patch) | |
| tree | 79ebb8157a66cff575b229daf391329a2c13dc3b /sfx2 | |
| parent | c9ce83c0651cbb6f290ab36402896c06ddec1b85 (diff) | |
INTEGRATION: CWS valgrind01 (1.33.18); FILE MERGED
2003/10/14 13:09:46 hr 1.33.18.1: #i20184#: initialize member before calling CreateFromSVMenu
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index cd923ef51472..b9c7b37a5ebc 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: virtmenu.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2003-09-11 09:46:19 $ + * last change: $Author: rt $ $Date: 2003-11-25 10:51:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,11 +236,6 @@ BOOL IsItemHidden_Impl( USHORT nItemId, int bOleServer, int bMac ) void SfxVirtualMenu::Construct_Impl() { - pWindowMenu = NULL; - pPickMenu = NULL; - pAddonsMenu = NULL; - bIsActive = FALSE; - bControllersUnBound = FALSE; pSVMenu->SetHighlightHdl( LINK(this, SfxVirtualMenu, Highlight) ); pSVMenu->SetActivateHdl( LINK(this, SfxVirtualMenu, Activate) ); pSVMenu->SetDeactivateHdl( LINK(this, SfxVirtualMenu, Deactivate) ); @@ -277,6 +272,11 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId, pParent = pOwnParent; nVisibleItems = 0; pAppCtrl = 0; + pWindowMenu = NULL; + pPickMenu = NULL; + pAddonsMenu = NULL; + bIsActive = FALSE; + bControllersUnBound = FALSE; CreateFromSVMenu(); Construct_Impl(); bHelpInitialized = FALSE; @@ -307,6 +307,11 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp, pParent = 0; pAppCtrl = 0; nVisibleItems = 0; + pWindowMenu = NULL; + pPickMenu = NULL; + pAddonsMenu = NULL; + bIsActive = FALSE; + bControllersUnBound = FALSE; CreateFromSVMenu(); Construct_Impl(); bHelpInitialized = FALSE; |