[Libreoffice-commits] core.git: sd/source

[Tomaž Vajngerl (via logerrit)]

 sd/source/ui/func/fusearch.cxx |   54 ++++++++++++++++++++---------------------
 sd/source/ui/inc/fusearch.hxx  |    4 +--
 2 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 474aed49d6d1457f8262593c1d9c71731bda8896
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed May 20 21:12:19 2020 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed May 20 23:14:24 2020 +0200

    sd: FuSearch - prefix member vars
    
    Change-Id: I6048962a5db43b7ff9a9d20398484d7082648840
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94601
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 817d357fa25b..9d12624c57bd 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -52,8 +52,8 @@ FuSearch::FuSearch (
     SdDrawDocument* pDoc,
     SfxRequest& rReq )
     : FuPoor(pViewSh, pWin, pView, pDoc, rReq),
-      pSdOutliner(nullptr),
-      bOwnOutliner(false)
+      m_pSdOutliner(nullptr),
+      m_bOwnOutliner(false)
 {
 }
 
@@ -70,17 +70,17 @@ void FuSearch::DoExecute( SfxRequest& )
 
     if ( dynamic_cast< const DrawViewShell *>( mpViewShell ) !=  nullptr )
     {
-        bOwnOutliner = true;
-        pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
+        m_bOwnOutliner = true;
+        m_pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
     }
     else if ( dynamic_cast< const OutlineViewShell *>( mpViewShell ) !=  
nullptr )
     {
-        bOwnOutliner = false;
-        pSdOutliner = mpDoc->GetOutliner();
+        m_bOwnOutliner = false;
+        m_pSdOutliner = mpDoc->GetOutliner();
     }
 
-    if (pSdOutliner)
-       pSdOutliner->PrepareSpelling();
+    if (m_pSdOutliner)
+       m_pSdOutliner->PrepareSpelling();
 }
 
 FuSearch::~FuSearch()
@@ -88,11 +88,11 @@ FuSearch::~FuSearch()
     if ( ! mpDocSh->IsInDestruction() && mpDocSh->GetViewShell()!=nullptr)
         mpDocSh->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( 
SidArraySpell );
 
-    if (pSdOutliner)
-        pSdOutliner->EndSpelling();
+    if (m_pSdOutliner)
+        m_pSdOutliner->EndSpelling();
 
-    if (bOwnOutliner)
-        delete pSdOutliner;
+    if (m_bOwnOutliner)
+        delete m_pSdOutliner;
 }
 
 void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem )
@@ -105,32 +105,32 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* 
pSearchItem )
     if (pViewShell == nullptr)
         return;
 
-    if ( pSdOutliner && dynamic_cast< const DrawViewShell *>( pViewShell ) !=  
nullptr && !bOwnOutliner )
+    if (m_pSdOutliner && dynamic_cast<const DrawViewShell*>(pViewShell) && 
!m_bOwnOutliner)
     {
-        pSdOutliner->EndSpelling();
+        m_pSdOutliner->EndSpelling();
 
-        bOwnOutliner = true;
-        pSdOutliner = new SdOutliner( mpDoc, OutlinerMode::TextObject );
-        pSdOutliner->PrepareSpelling();
+        m_bOwnOutliner = true;
+        m_pSdOutliner = new SdOutliner(mpDoc, OutlinerMode::TextObject);
+        m_pSdOutliner->PrepareSpelling();
     }
-    else if ( pSdOutliner && dynamic_cast< const OutlineViewShell *>( 
pViewShell ) !=  nullptr && bOwnOutliner )
+    else if (m_pSdOutliner && dynamic_cast<const 
OutlineViewShell*>(pViewShell) && m_bOwnOutliner)
     {
-        pSdOutliner->EndSpelling();
-        delete pSdOutliner;
+        m_pSdOutliner->EndSpelling();
+        delete m_pSdOutliner;
 
-        bOwnOutliner = false;
-        pSdOutliner = mpDoc->GetOutliner();
-        pSdOutliner->PrepareSpelling();
+        m_bOwnOutliner = false;
+        m_pSdOutliner = mpDoc->GetOutliner();
+        m_pSdOutliner->PrepareSpelling();
     }
 
-    if (pSdOutliner)
+    if (m_pSdOutliner)
     {
-        bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem);
+        bool bEndSpelling = m_pSdOutliner->StartSearchAndReplace(pSearchItem);
 
         if (bEndSpelling)
         {
-            pSdOutliner->EndSpelling();
-            pSdOutliner->PrepareSpelling();
+            m_pSdOutliner->EndSpelling();
+            m_pSdOutliner->PrepareSpelling();
         }
     }
 }
diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx
index 98351a25734b..310e42a5d9f3 100644
--- a/sd/source/ui/inc/fusearch.hxx
+++ b/sd/source/ui/inc/fusearch.hxx
@@ -39,8 +39,8 @@ public:
 private:
     virtual ~FuSearch() override;
 
-    SdOutliner* pSdOutliner;
-    bool bOwnOutliner;
+    SdOutliner* m_pSdOutliner;
+    bool m_bOwnOutliner;
 
     FuSearch (
         ViewShell* pViewSh,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits