diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-01-25 21:49:31 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-01-25 22:06:18 +0100 |
| commit | 1a83c2259498b070c8d38beb44017f319cbdbee4 (patch) | |
| tree | 4489eb6dc8fc2b371629b1476b3353a1984b5454 /sd/source/ui/view/Outliner.cxx | |
| parent | 7f1483c0a3315da88a07a063a60c3c0340c9ebb9 (diff) | |
sd lok: Fix normal 'search' performed after a 'search all'.cp-5.0-20
The DBG_ASSERT followed by the same test actually returning immediately
prevents the actual 'search' after a 'search all' being performed.
I hope this does not have any negative consequences; but if it does, we should
fix the root cause, instead of having this kind of defensive programming here.
Change-Id: I909533f301dda9c20cab1968de45e5fa7975e852
Diffstat (limited to 'sd/source/ui/view/Outliner.cxx')
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ca625c89284e..b1535a2b0d62 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -719,11 +719,8 @@ bool Outliner::SearchAndReplaceOnce(std::vector<SearchSelection>* pSelections) DetectChange (); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); - DBG_ASSERT(pOutlinerView!=NULL && GetEditEngine().HasView( &pOutlinerView->GetEditView() ), - "SearchAndReplace without valid view!" ); - - if( NULL == pOutlinerView || !GetEditEngine().HasView( &pOutlinerView->GetEditView() ) ) - return true; + if (!pOutlinerView) + return true; // end of search ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell != 0) |