From 0143805a565418d2a114c16b7eeba3b784176d9e Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Mon, 27 May 2013 11:18:04 +0000 Subject: 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 --- include/sfx2/shell.hxx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'include/sfx2') 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 then broadcast the context name that was + defined with an earlier call to SetContextName(). + When then broadcast the 'default' context. + */ + void BroadcastContextForActivation (const bool bIsActivated); #ifndef _SFXSH_HXX SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); -- cgit