sd/source/ui/view/Outliner.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
New commits: commit 76ba829bf18123daf552afe253a8304a982ceb8d Author: Tomaž Vajngerl <[email protected]> AuthorDate: Wed May 27 14:27:30 2020 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jun 9 15:21:26 2020 +0200 sd: some style fixes in Outliner.cxx Also no need to reset the mpImpl in destructor when it will be reset and destroyed in the next step anyway. Change-Id: I5027f962efc4159e61aa7eda26619db2e3b9434c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95309 Tested-by: Tomaž Vajngerl <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> (cherry picked from commit 43a6def48f425361d79dff46dca41685d5ee03fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95920 diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index e98c1bde5795..c2cff89909a7 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -211,7 +211,6 @@ SdOutliner::SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode ) /// Nothing spectacular in the destructor. SdOutliner::~SdOutliner() { - mpImpl.reset(); } /** Prepare find&replace or spellchecking. This distinguishes between three @@ -467,7 +466,9 @@ bool SdOutliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) const SvxSearchCmd nCommand (mpSearchItem->GetCommand()); if (nCommand == SvxSearchCmd::FIND_ALL || nCommand == SvxSearchCmd::REPLACE_ALL) + { bEndOfSearch = SearchAndReplaceAll (); + } else { RememberStartPosition (); @@ -573,6 +574,7 @@ void SdOutliner::Initialize (bool bDirectionIsForward) bool SdOutliner::SearchAndReplaceAll() { bool bRet = true; + // Save the current position to be restored after having replaced all // matches. RememberStartPosition (); @@ -756,13 +758,13 @@ bool SdOutliner::SearchAndReplaceOnce(std::vector<sd::SearchSelection>* pSelecti pOutlinerView = mpImpl->GetOutlinerView(); } - if (pViewShell != nullptr) + if (pViewShell) { mpView = pViewShell->GetView(); mpWindow = pViewShell->GetActiveWindow(); pOutlinerView->SetWindow(mpWindow); - if( nullptr != dynamic_cast< const sd::DrawViewShell *>( pViewShell.get() )) + if (nullptr != dynamic_cast<const sd::DrawViewShell*>(pViewShell.get())) { // When replacing we first check if there is a selection // indicating a match. If there is then replace it. The @@ -785,7 +787,7 @@ bool SdOutliner::SearchAndReplaceOnce(std::vector<sd::SearchSelection>* pSelecti { ProvideNextTextObject (); - if ( ! mbEndOfSearch) + if (!mbEndOfSearch) { // Remember the current position as the last one with a // text object. @@ -807,7 +809,7 @@ bool SdOutliner::SearchAndReplaceOnce(std::vector<sd::SearchSelection>* pSelecti } } } - else if( nullptr != dynamic_cast< const sd::OutlineViewShell *>( pViewShell.get() )) + else if (nullptr != dynamic_cast<const sd::OutlineViewShell*>(pViewShell.get())) { mpDrawDocument->GetDocSh()->SetWaitCursor(false); // The following loop is executed more than once only when a _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
