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/svx/sidebar | |
| 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/svx/sidebar')
| -rw-r--r-- | include/svx/sidebar/SelectionAnalyzer.hxx | 16 | ||||
| -rw-r--r-- | include/svx/sidebar/SelectionChangeHandler.hxx | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx index 601a96e977f9..1a3623265b69 100644 --- a/include/svx/sidebar/SelectionAnalyzer.hxx +++ b/include/svx/sidebar/SelectionAnalyzer.hxx @@ -37,19 +37,25 @@ class SVX_DLLPUBLIC SelectionAnalyzer public : static sfx2::sidebar::EnumContext::Context GetContextForSelection_SC ( const SdrMarkList& rMarkList); + + enum ViewType + { + VT_Standard, + VT_Master, + VT_Handout, + VT_Notes, + VT_Outline + }; static sfx2::sidebar::EnumContext::Context GetContextForSelection_SD ( const SdrMarkList& rMarkList, - const bool bIsMasterPage, - const bool bIsHandoutPage, - const bool bIsNotesPage); + const ViewType eViewType); private: static sfx2::sidebar::EnumContext::Context GetContextForObjectId_SC ( const sal_uInt16 nObjectId); static sfx2::sidebar::EnumContext::Context GetContextForObjectId_SD ( const sal_uInt16 nObjectId, - const bool bIsHandoutPage, - const bool bIsNotesPage); + const ViewType eViewType); static sal_uInt32 GetInventorTypeFromMark ( const SdrMarkList& rMarkList); static sal_uInt16 GetObjectTypeFromMark ( diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 29116e5249b8..da1e4e703a12 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -53,7 +53,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler { public: SelectionChangeHandler ( - const boost::function<sfx2::sidebar::EnumContext::Context(void)>& rSelectionChangeCallback, + const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, const cssu::Reference<css::frame::XController>& rxController, const sfx2::sidebar::EnumContext::Context eDefaultContext); virtual ~SelectionChangeHandler (void); @@ -71,7 +71,7 @@ public: void Disconnect (void); private: - const boost::function<sfx2::sidebar::EnumContext::Context(void)> maSelectionChangeCallback; + const boost::function<rtl::OUString(void)> maSelectionChangeCallback; cssu::Reference<css::frame::XController> mxController; const sfx2::sidebar::EnumContext::Context meDefaultContext; bool mbIsConnected; |