[Libreoffice-commits] core.git: sd/source
Jan Holesovsky
kendy at collabora.com
Sun May 31 11:36:50 PDT 2015
sd/source/ui/view/Outliner.cxx | 19 -------------------
1 file changed, 19 deletions(-)
New commits:
commit 332e3d4bc9f52538af18eabb1654720ef8c67dba
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sun May 31 20:33:36 2015 +0200
lok: Don't attempt to select the exact text after a failed search.
This is a waste - it gets unselected in the end anyway, and causes problems
for LibreOfficeKit.
Change-Id: I9fea5853fc8fb177b31c77c097e96c51f93a0d7d
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 3e50e51..e073118 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -903,25 +903,6 @@ void Outliner::RestoreStartPosition()
SetViewMode (meStartViewMode);
if (pDrawViewShell.get() != NULL)
SetPage (meStartEditMode, mnStartPageIndex);
-
- if (mpStartEditedObject != NULL)
- {
- // Turn on the text toolbar as it is done in FuText so that
- // undo manager setting/restoring in
- // sd::View::{Beg,End}TextEdit() works on the same view shell.
- pViewShell->GetViewShellBase().GetToolBarManager()->SetToolBarShell(
- ToolBarManager::TBG_FUNCTION,
- RID_DRAW_TEXT_TOOLBOX);
-
- mpView->SdrBeginTextEdit(mpStartEditedObject);
- ::Outliner* pOutliner =
- static_cast<DrawView*>(mpView)->GetTextEditOutliner();
- if (pOutliner!=NULL && pOutliner->GetViewCount()>0)
- {
- OutlinerView* pOutlinerView = pOutliner->GetView(0);
- pOutlinerView->SetSelection(maStartSelection);
- }
- }
}
else if (pViewShell->ISA(OutlineViewShell))
{
More information about the Libreoffice-commits
mailing list