summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2013-05-13 15:25:51 +0000
committerAndre Fischer <af@apache.org>2013-05-13 15:25:51 +0000
commita97c4ca2c235a4654243cbbdf970800454b5aa56 (patch)
tree61fc503c8461d7e46894c03823bb5563c8890508 /sd
parent2f18055a153f4e66ec72b0c20673032d6edeebab (diff)
121981: Don't change sidebar context while in Impress table.
Notes
Notes: merged as: 2117bfe77d3dfc5eb778e27105bf6c91cafb0ec7
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drviewsa.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 211907c94b5d..141011633ed0 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -871,14 +871,10 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet )
}
+
+
EnumContext::Context DrawViewShell::GetContextForSelection (void) const
{
- if (mpDrawView->GetMarkedObjectList().GetMarkCount() == 1)
- if (mpDrawView->GetTextEditObject() != NULL)
- if (mpDrawView->GetTextEditOutlinerView() != NULL)
- return EnumContext::Context_DrawText;
-
- // All other cases are handled by the SelectionAnalyzer.
return ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SD(
mpDrawView->GetMarkedObjectList(),
meEditMode == EM_MASTERPAGE,