diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:05:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:05:01 +0000 |
| commit | 0afba3cb6ddd7a9706c8f1dfc75b7bf376b935e8 (patch) | |
| tree | 35a0849fa9b24409b17607ad32ccbfb887a683ca /sd | |
| parent | cc44fc533906b14f7831d604c5a950f54d6612bb (diff) | |
INTEGRATION: CWS inplaceobjects (1.3.60); FILE MERGED
2006/09/28 12:29:04 mba 1.3.60.2: RESYNC: (1.3-1.4); FILE MERGED
2006/09/27 15:23:45 mba 1.3.60.1: #i66239#: make ToolbarManager aware of removed toolbars in Layoutmanager in case of OLEActivation
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 1d11784a6e10..2f3e164c91ca 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ToolBarManager.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:32:34 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:05:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -322,6 +322,8 @@ public: */ void ReleaseAllToolBarShells (void); + void ToolBarsDestroyed(void); + void PreUpdate (void); void PostUpdate (void); void Update (void); @@ -637,6 +639,11 @@ void ToolBarManager::SelectionHasChanged ( } +void ToolBarManager::ToolBarsDestroyed(void) +{ + if (mpImpl.get() != NULL) + mpImpl->ToolBarsDestroyed(); +} //===== ToolBarManager::Implementation ======================================= @@ -678,7 +685,6 @@ ToolBarManager::Implementation::Implementation ( - /** The order of statements is important. First unregister listeners, which may post user events. Then remove pending user events. @@ -697,6 +703,10 @@ ToolBarManager::Implementation::~Implementation (void) } +void ToolBarManager::Implementation::ToolBarsDestroyed(void) +{ + maToolBarList.MarkAllToolBarsAsNotActive(); +} void ToolBarManager::Implementation::SetValid (bool bValid) |