diff options
| author | Andre Fischer <af@apache.org> | 2013-05-27 11:18:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 17:03:22 +0100 |
| commit | 0143805a565418d2a114c16b7eeba3b784176d9e (patch) | |
| tree | 6334f551f1971c252c00730dffcc7a640198ef30 /include/sfx2 | |
| parent | ec3fafa60efa8f4bec1ca53e5bbe0e7b2be61f54 (diff) | |
Resolves: #i122332# Don't change sidebar context when switching...
to other application window
(cherry picked from commit 604502e2a4b53f35aedbf0205598a9b691c0d532)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/inc/sfx2/shell.hxx
sfx2/source/control/shell.cxx
svx/inc/svx/sidebar/SelectionAnalyzer.hxx
svx/inc/svx/sidebar/SelectionChangeHandler.hxx
Change-Id: Id3c427e02714ef0d6686a78094e2f7f3b390a693
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/shell.hxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index cb5b149714df..ddeb677e3127 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -238,7 +238,20 @@ public: virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); - void SetContextName (const ::rtl::OUString& rsContextName); + /** Set the name of the sidebar context that is broadcast on calls + to Activation(). + */ + void SetContextName (const ::rtl::OUString& rsContextName); + + /** Broadcast a sidebar context change. + This method is typically called from Activate() or + Deactivate(). + @param bIsActivated + When <TRUE/> then broadcast the context name that was + defined with an earlier call to SetContextName(). + When <FALSE/> then broadcast the 'default' context. + */ + void BroadcastContextForActivation (const bool bIsActivated); #ifndef _SFXSH_HXX SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); |