summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/Context.cxx9
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx1
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);
-
}
}