diff options
| author | Andre Fischer <af@apache.org> | 2013-05-13 15:25:51 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:33 +0100 |
| commit | cb7bbfe182ebbba3dfd9e32bb4937430db4b2f62 (patch) | |
| tree | 6369bb08e4392fe717f2a1e7c0d596beced381de /sd | |
| parent | e5818a4f5bd0f0c347e533c841c6663c2e223245 (diff) | |
Resolves: #i121981# Don't change sidebar context while in Impress table
(cherry picked from commit a97c4ca2c235a4654243cbbdf970800454b5aa56)
Change-Id: I66ece2edb436b6e9f6bff110149d6c0c2aa37c7d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index a580d607fbb4..86c20ddbef78 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -829,14 +829,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, |