diff options
| author | Andre Fischer <af@apache.org> | 2013-10-02 08:52:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-02 16:03:55 +0100 |
| commit | 03b52b540549d6e5c61fd7c8c1bf05c43eac0ddd (patch) | |
| tree | 97a5474adb802006b6b3f4db8a2b881b76f4e733 /include | |
| parent | 9fec7c4e0d4fb4cf660d6304f8e11e47077f9ffa (diff) | |
Resolves: #i123276# Properly forward Deactivate() call...
and still don't broadcast context change.
(cherry picked from commit 520cc667c80cea6bb48422825250b72ff36bb4ef)
Conflicts:
sd/source/ui/view/drviews1.cxx
sfx2/inc/sfx2/shell.hxx
sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
sfx2/source/control/shell.cxx
sfx2/source/sidebar/ContextChangeBroadcaster.cxx
Change-Id: I753009041a999bc31a0528e37f0a499897f311c5
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/shell.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/sidebar/ContextChangeBroadcaster.hxx | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index b5455a8216ad..7bde39f915da 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -249,6 +249,10 @@ public: */ void BroadcastContextForActivation (const bool bIsActivated); + /** Enabled or disable the context broadcaster. Returns the old state. + */ + bool SetContextBroadcasterEnabled (const bool bIsEnabled); + SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); diff --git a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx index 25701d3d9f8f..b1012da342b8 100644 --- a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx +++ b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx @@ -41,8 +41,17 @@ public: void Activate (const cssu::Reference<css::frame::XFrame>& rxFrame); void Deactivate (const cssu::Reference<css::frame::XFrame>& rxFrame); + /** Enable or disable the broadcaster. + @param bIsEnabled + The new value of the "enabled" state. + @return + The old value of the "enabled" state is returned. + */ + bool SetBroadcasterEnabled (const bool bIsEnabled); + private: rtl::OUString msContextName; + bool mbIsBroadcasterEnabled; void BroadcastContextChange ( const cssu::Reference<css::frame::XFrame>& rxFrame, |