diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-09 20:39:06 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-12 18:56:49 +0200 |
| commit | b33b2afe6a8b4224450da7c686beb81dbf5cd24a (patch) | |
| tree | 17c0970756a0c9b9f6a9968acee641a4bdc2802a /sfx2 | |
| parent | 5a72bbd483ddf6c7cc949a8708d1697654cc9ce2 (diff) | |
big step towards real chart sidebar
Change-Id: I9b7d1f963746f7689b02099fbae77c9c943bad58
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Context.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index 3a7ce010b24c..9baf30b07777 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -46,7 +46,14 @@ Context::Context ( sal_Int32 Context::EvaluateMatch ( const Context& rOther) const { - const bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName); + bool bApplicationNameIsAny (rOther.msApplication == AnyApplicationName); + + // special case for charts which use a whole own set of decks + if (msApplication == "com.sun.star.chart2.ChartDocument") + { + bApplicationNameIsAny = false; + } + if (rOther.msApplication.equals(msApplication) || bApplicationNameIsAny) { // Application name matches. diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 93a1b89c904c..bce5bbc7321a 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -416,6 +416,8 @@ void ResourceManager::ReadContextList ( aApplications.push_back(EnumContext::Application_Draw); else if (sApplicationName == "Impress") aApplications.push_back(EnumContext::Application_Impress); + else if (sApplicationName == "Chart") + aApplications.push_back(EnumContext::Application_Chart); else if (sApplicationName == "DrawImpress") { // A special case among the special names: it is diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 027c886089b4..c67447f0770a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -548,7 +548,6 @@ void SidebarController::CreateDeck(const ::rtl::OUString& rDeckId) ::boost::bind(&SidebarController::RequestCloseDeck, this)); mpResourceManager->SetDeckToDescriptor(rDeckId, aDeck); - } } |