s/mpEdtOutl/mpEditingOutliner/g

Change-Id: I5eb188cc1808055857f95c73ab838251cd93e4b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120379
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 68 insertions, 68 deletions

diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 5d006fe6c3f7..710da9379628 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -177,7 +177,7 @@ public:
     // #i121917#
     virtual bool HasText() const override;
 
-    bool IsTextEditActive() const { return mpEdtOutl != nullptr; }
+    bool IsTextEditActive() const { return mpEditingOutliner != nullptr; }
     bool IsTextEditActive( const sdr::table::CellPos& rPos );
 
     /** Returns true only if we are in edit mode and the user actually changed anything */
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index e6f183a6569b..546c856ca912 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -144,7 +144,7 @@ private:
     // This method is only allowed for sdr::properties::TextProperties
     SVX_DLLPRIVATE SdrOutliner* GetTextEditOutliner() const
     {
-        return mpEdtOutl;
+        return mpEditingOutliner;
     }
 
     // to allow sdr::properties::TextProperties access to SetPortionInfoChecked()
@@ -181,7 +181,7 @@ protected:
     // an Outliner*, so that
     // 1. the TextObj won't be edited simultaneously by multiple views, and
     // 2. when streaming while editing Flush() can be done
-    SdrOutliner* mpEdtOutl;
+    SdrOutliner* mpEditingOutliner;
 
     // Possible values for eTextKind are:
     //     OBJ_TEXT         regular text frame
@@ -351,7 +351,7 @@ public:
     // #i121917#
     virtual bool HasText() const override;
 
-    bool IsTextEditActive() const { return mpEdtOutl != nullptr; }
+    bool IsTextEditActive() const { return mpEditingOutliner != nullptr; }
 
     /** returns the currently active text. */
     virtual SdrText* getActiveText() const;
@@ -501,7 +501,7 @@ public:
 
     virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
 
-    void SetTextEditOutliner(SdrOutliner* pOutl) { mpEdtOutl = pOutl; }
+    void SetTextEditOutliner(SdrOutliner* pOutl) { mpEditingOutliner = pOutl; }
 
     /** Setup given Outliner equivalently to SdrTextObj::Paint()
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index b48d6b937b41..96471b570841 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2298,17 +2298,17 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool
 
             if (HasText())
             {
-                if(mpEdtOutl)
+                if(mpEditingOutliner)
                 {
-                    mpEdtOutl->SetMaxAutoPaperSize( aSiz );
+                    mpEditingOutliner->SetMaxAutoPaperSize( aSiz );
                     if (bWdtGrow)
                     {
-                        Size aSiz2(mpEdtOutl->CalcTextSize());
+                        Size aSiz2(mpEditingOutliner->CalcTextSize());
                         nWdt=aSiz2.Width()+1; // a little more tolerance
                         if (bHgtGrow) nHgt=aSiz2.Height()+1; // a little more tolerance
                     } else
                     {
-                        nHgt=mpEdtOutl->GetTextHeight()+1; // a little more tolerance
+                        nHgt=mpEditingOutliner->GetTextHeight()+1; // a little more tolerance
                     }
                 }
                 else
@@ -2664,8 +2664,8 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle&
 
     // put text into the Outliner - if necessary the use the text from the EditOutliner
     OutlinerParaObject* pPara= GetOutlinerParaObject();
-    if (mpEdtOutl && !bNoEditText)
-        pPara=mpEdtOutl->CreateParaObject().release();
+    if (mpEditingOutliner && !bNoEditText)
+        pPara=mpEditingOutliner->CreateParaObject().release();
 
     if (pPara)
     {
@@ -2686,7 +2686,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle&
     {
         rOutliner.SetTextObj( nullptr );
     }
-    if (mpEdtOutl && !bNoEditText && pPara)
+    if (mpEditingOutliner && !bNoEditText && pPara)
         delete pPara;
 
     rOutliner.SetUpdateMode(true);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 850cb48b0263..e6d7e0f0cfef 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -69,7 +69,7 @@ std::unique_ptr<sdr::contact::ViewContact> SdrTextObj::CreateObjectSpecificViewC
 
 SdrTextObj::SdrTextObj(SdrModel& rSdrModel)
 :   SdrAttrObj(rSdrModel),
-    mpEdtOutl(nullptr),
+    mpEditingOutliner(nullptr),
     meTextKind(OBJ_TEXT)
 {
     mbTextSizeDirty = false;
@@ -88,7 +88,7 @@ SdrTextObj::SdrTextObj(SdrModel& rSdrModel)
 
 SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrTextObj const & rSource)
 :   SdrAttrObj(rSdrModel, rSource),
-    mpEdtOutl(nullptr)
+    mpEditingOutliner(nullptr)
 {
     mbInEditMode = false;
     mbTextAnimationAllowed = true;
@@ -117,7 +117,7 @@ SdrTextObj::SdrTextObj(SdrModel& rSdrModel, SdrTextObj const & rSource)
         // empty (this operator== seems not prepared for MultiText
         // objects). In the current form it makes only sense to
         // create locally and use locally on a known existing SdrText
-        const Outliner* pEO = rSource.mpEdtOutl;
+        const Outliner* pEO = rSource.mpEditingOutliner;
         std::unique_ptr<OutlinerParaObject> pNewOutlinerParaObject;
 
         if (pEO!=nullptr)
@@ -140,7 +140,7 @@ SdrTextObj::SdrTextObj(
     const tools::Rectangle& rNewRect)
 :   SdrAttrObj(rSdrModel),
     maRect(rNewRect),
-    mpEdtOutl(nullptr),
+    mpEditingOutliner(nullptr),
     meTextKind(OBJ_TEXT)
 {
     mbTextSizeDirty = false;
@@ -162,7 +162,7 @@ SdrTextObj::SdrTextObj(
     SdrModel& rSdrModel,
     SdrObjKind eNewTextKind)
 :   SdrAttrObj(rSdrModel),
-    mpEdtOutl(nullptr),
+    mpEditingOutliner(nullptr),
     meTextKind(eNewTextKind)
 {
     mbTextSizeDirty = false;
@@ -185,7 +185,7 @@ SdrTextObj::SdrTextObj(
     const tools::Rectangle& rNewRect)
 :   SdrAttrObj(rSdrModel),
     maRect(rNewRect),
-    mpEdtOutl(nullptr),
+    mpEditingOutliner(nullptr),
     meTextKind(eNewTextKind)
 {
     mbTextSizeDirty = false;
@@ -773,7 +773,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRe
     // put text into the outliner, if available from the edit outliner
     SdrText* pText = getActiveText();
     OutlinerParaObject* pOutlinerParaObject = pText ? pText->GetOutlinerParaObject() : nullptr;
-    OutlinerParaObject* pPara = (mpEdtOutl && !bNoEditText) ? mpEdtOutl->CreateParaObject().release() : pOutlinerParaObject;
+    OutlinerParaObject* pPara = (mpEditingOutliner && !bNoEditText) ? mpEditingOutliner->CreateParaObject().release() : pOutlinerParaObject;
 
     if (pPara)
     {
@@ -798,7 +798,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRe
         rOutliner.SetTextObj( nullptr );
     }
 
-    if (mpEdtOutl && !bNoEditText && pPara)
+    if (mpEditingOutliner && !bNoEditText && pPara)
         delete pPara;
 
     rOutliner.SetUpdateMode(true);
@@ -866,9 +866,9 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRe
 
 bool SdrTextObj::CanCreateEditOutlinerParaObject() const
 {
-    if( HasTextImpl( mpEdtOutl ) )
+    if( HasTextImpl( mpEditingOutliner ) )
     {
-        return mpEdtOutl->GetParagraphCount() > 0;
+        return mpEditingOutliner->GetParagraphCount() > 0;
     }
     return false;
 }
@@ -876,10 +876,10 @@ bool SdrTextObj::CanCreateEditOutlinerParaObject() const
 std::unique_ptr<OutlinerParaObject> SdrTextObj::CreateEditOutlinerParaObject() const
 {
     std::unique_ptr<OutlinerParaObject> pPara;
-    if( HasTextImpl( mpEdtOutl ) )
+    if( HasTextImpl( mpEditingOutliner ) )
     {
-        sal_Int32 nParaCount = mpEdtOutl->GetParagraphCount();
-        pPara = mpEdtOutl->CreateParaObject(0, nParaCount);
+        sal_Int32 nParaCount = mpEditingOutliner->GetParagraphCount();
+        pPara = mpEditingOutliner->CreateParaObject(0, nParaCount);
     }
     return pPara;
 }
@@ -1466,9 +1466,9 @@ TextChain *SdrTextObj::GetTextChain() const
 
 bool SdrTextObj::IsVerticalWriting() const
 {
-    if(mpEdtOutl)
+    if(mpEditingOutliner)
     {
-        return mpEdtOutl->IsVertical();
+        return mpEditingOutliner->IsVertical();
     }
 
     OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -1550,8 +1550,8 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
 
 bool SdrTextObj::IsTopToBottom() const
 {
-    if (mpEdtOutl)
-        return mpEdtOutl->IsTopToBottom();
+    if (mpEditingOutliner)
+        return mpEditingOutliner->IsTopToBottom();
 
     if (OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject())
         return pOutlinerParaObject->IsTopToBottom();
@@ -1684,7 +1684,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
 
 bool SdrTextObj::IsReallyEdited() const
 {
-    return mpEdtOutl && mpEdtOutl->IsModified();
+    return mpEditingOutliner && mpEditingOutliner->IsModified();
 }
 
 // moved inlines here form hxx
@@ -1884,13 +1884,13 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
     }
     else if ( (IsAutoFit() || IsFitToSize()) && !mbInDownScale)
     {
-        assert(mpEdtOutl);
+        assert(mpEditingOutliner);
         mbInDownScale = true;
 
         // sucks that we cannot disable paints via
-        // mpEdtOutl->SetUpdateMode(FALSE) - but EditEngine skips
+        // mpEditingOutliner->SetUpdateMode(FALSE) - but EditEngine skips
         // formatting as well, then.
-        ImpAutoFitText(*mpEdtOutl);
+        ImpAutoFitText(*mpEditingOutliner);
         mbInDownScale = false;
     }
 }
@@ -1961,20 +1961,20 @@ bool SdrTextObj::IsChainable() const
 
 void SdrTextObj::onChainingEvent()
 {
-    if (!mpEdtOutl)
+    if (!mpEditingOutliner)
         return;
 
     // Outliner for text transfer
     SdrOutliner &aDrawOutliner = ImpGetDrawOutliner();
 
     EditingTextChainFlow aTxtChainFlow(this);
-    aTxtChainFlow.CheckForFlowEvents(mpEdtOutl);
+    aTxtChainFlow.CheckForFlowEvents(mpEditingOutliner);
 
     if (aTxtChainFlow.IsOverflow()) {
         SAL_INFO("svx.chaining", "[CHAINING] Overflow going on");
         // One outliner is for non-overflowing text, the other for overflowing text
         // We remove text directly from the editing outliner
-        aTxtChainFlow.ExecuteOverflow(mpEdtOutl, &aDrawOutliner);
+        aTxtChainFlow.ExecuteOverflow(mpEditingOutliner, &aDrawOutliner);
     } else if (aTxtChainFlow.IsUnderflow()) {
         SAL_INFO("svx.chaining", "[CHAINING] Underflow going on");
         // underflow-induced overflow
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 539dc4a26bd0..1cd7bc57b105 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -124,19 +124,19 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight( tools::Rectangle& rR, bool bHgt,
             aNewSize.setHeight( 0x0FFFFFFF );
     }
 
-    if (mpEdtOutl)
+    if (mpEditingOutliner)
     {
-        mpEdtOutl->SetMaxAutoPaperSize(aNewSize);
+        mpEditingOutliner->SetMaxAutoPaperSize(aNewSize);
         if (bWdtGrow)
         {
-            Size aSiz2(mpEdtOutl->CalcTextSize());
+            Size aSiz2(mpEditingOutliner->CalcTextSize());
             nWdt = aSiz2.Width() + 1; // a little tolerance
             if (bHgtGrow)
                 nHgt = aSiz2.Height() + 1; // a little tolerance
         }
         else
         {
-            nHgt = mpEdtOutl->GetTextHeight() + 1; // a little tolerance
+            nHgt = mpEditingOutliner->GetTextHeight() + 1; // a little tolerance
         }
     }
     else
@@ -388,8 +388,8 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
         {
             Outliner* pOutliner = nullptr;
 
-            if( mpEdtOutl || (pText == getActiveText()) )
-                pOutliner = mpEdtOutl;
+            if( mpEditingOutliner || (pText == getActiveText()) )
+                pOutliner = mpEditingOutliner;
 
             if(!pOutliner)
             {
@@ -403,7 +403,7 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
                 pOutliner->RemoveAttribs( aSelAll, false, rWhichId );
             }
 
-            if(!mpEdtOutl || (pText != getActiveText()) )
+            if(!mpEditingOutliner || (pText != getActiveText()) )
             {
                 const sal_Int32 nParaCount = pOutliner->GetParagraphCount();
                 std::unique_ptr<OutlinerParaObject> pTemp = pOutliner->CreateParaObject(0, nParaCount);
@@ -416,8 +416,8 @@ void SdrTextObj::RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>&
 
 bool SdrTextObj::HasText() const
 {
-    if (mpEdtOutl)
-        return HasTextImpl(mpEdtOutl);
+    if (mpEditingOutliner)
+        return HasTextImpl(mpEditingOutliner);
 
     OutlinerParaObject* pOPO = GetOutlinerParaObject();
 
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 4426c0587218..5840b1f950af 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -39,8 +39,8 @@ bool SdrTextObj::HasTextEdit() const
 
 bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
 {
-    if (mpEdtOutl!=nullptr) return false; // Textedit might already run in another View!
-    mpEdtOutl=&rOutl;
+    if (mpEditingOutliner!=nullptr) return false; // Textedit might already run in another View!
+    mpEditingOutliner=&rOutl;
 
     mbInEditMode = true;
 
@@ -291,7 +291,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
     /* Chaining-related code */
     rOutl.ClearOverflowingParaNum();
 
-    mpEdtOutl = nullptr;
+    mpEditingOutliner = nullptr;
     rOutl.Clear();
     EEControlBits nStat = rOutl.GetControlWord();
     nStat &= ~EEControlBits::AUTOPAGESIZE;
@@ -336,26 +336,26 @@ EEAnchorMode SdrTextObj::GetOutlinerViewAnchorMode() const
 
 void SdrTextObj::ImpSetTextEditParams() const
 {
-    if (mpEdtOutl==nullptr)
+    if (mpEditingOutliner==nullptr)
         return;
 
-    bool bUpdBuf=mpEdtOutl->GetUpdateMode();
-    if (bUpdBuf) mpEdtOutl->SetUpdateMode(false);
+    bool bUpdBuf=mpEditingOutliner->GetUpdateMode();
+    if (bUpdBuf) mpEditingOutliner->SetUpdateMode(false);
     Size aPaperMin;
     Size aPaperMax;
     tools::Rectangle aEditArea;
     TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr);
     bool bContourFrame=IsContourTextFrame();
-    mpEdtOutl->SetMinAutoPaperSize(aPaperMin);
-    mpEdtOutl->SetMaxAutoPaperSize(aPaperMax);
-    mpEdtOutl->SetPaperSize(Size());
-    mpEdtOutl->SetTextColumns(GetTextColumnsNumber(), GetTextColumnsSpacing());
+    mpEditingOutliner->SetMinAutoPaperSize(aPaperMin);
+    mpEditingOutliner->SetMaxAutoPaperSize(aPaperMax);
+    mpEditingOutliner->SetPaperSize(Size());
+    mpEditingOutliner->SetTextColumns(GetTextColumnsNumber(), GetTextColumnsSpacing());
     if (bContourFrame) {
         tools::Rectangle aAnchorRect;
         TakeTextAnchorRect(aAnchorRect);
-        ImpSetContourPolygon(*mpEdtOutl,aAnchorRect, true);
+        ImpSetContourPolygon(*mpEditingOutliner,aAnchorRect, true);
     }
-    if (bUpdBuf) mpEdtOutl->SetUpdateMode(true);
+    if (bUpdBuf) mpEditingOutliner->SetUpdateMode(true);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index b57f6ceda6c3..f35d9c8a623b 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -260,10 +260,10 @@ EditingTextChainFlow::EditingTextChainFlow(SdrTextObj *pLinkTarget) :
 void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
 {
     // if this is editing outliner no need to set parameters
-    if (pFlowOutl == GetLinkTarget()->mpEdtOutl)
+    if (pFlowOutl == GetLinkTarget()->mpEditingOutliner)
         impCheckForFlowEvents(pFlowOutl, nullptr);
     else
-        impCheckForFlowEvents(pFlowOutl, GetLinkTarget()->mpEdtOutl);
+        impCheckForFlowEvents(pFlowOutl, GetLinkTarget()->mpEditingOutliner);
 
     // Broadcast events for cursor handling
     impBroadcastCursorInfo();
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 10cfaa28808b..4632b854fe78 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1407,7 +1407,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
 SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const
 {
     if( mpImpl.is() && (mpImpl->getCell( mpImpl->maEditPos ).get() == &rCell) )
-        return mpEdtOutl;
+        return mpEditingOutliner;
     else
         return nullptr;
 }
@@ -1435,7 +1435,7 @@ bool SdrTableObj::HasText() const
 
 bool SdrTableObj::IsTextEditActive( const CellPos& rPos )
 {
-    return mpEdtOutl && mpImpl.is() && (rPos == mpImpl->maEditPos);
+    return mpEditingOutliner && mpImpl.is() && (rPos == mpImpl->maEditPos);
 }
 
 
@@ -1524,8 +1524,8 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, too
 
     // set text at outliner, maybe from edit outliner
     OutlinerParaObject* pPara= xCell->GetOutlinerParaObject();
-    if (mpEdtOutl && !bNoEditText && mpImpl->mxActiveCell == xCell )
-        pPara=mpEdtOutl->CreateParaObject().release();
+    if (mpEditingOutliner && !bNoEditText && mpImpl->mxActiveCell == xCell )
+        pPara=mpEditingOutliner->CreateParaObject().release();
 
     if (pPara)
     {
@@ -1546,7 +1546,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, too
         rOutliner.SetTextObj( nullptr );
     }
 
-    if (mpEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
+    if (mpEditingOutliner && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
         delete pPara;
 
     rOutliner.SetUpdateMode(true);
@@ -1808,10 +1808,10 @@ void SdrTableObj::RecalcSnapRect()
 
 bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
 {
-    if( mpEdtOutl != nullptr )
+    if( mpEditingOutliner != nullptr )
         return false;
 
-    mpEdtOutl=&rOutl;
+    mpEditingOutliner=&rOutl;
 
     mbInEditMode = true;
 
@@ -1877,7 +1877,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
         SetOutlinerParaObject(std::move(pNewText));
     }
 
-    mpEdtOutl = nullptr;
+    mpEditingOutliner = nullptr;
     rOutl.Clear();
     EEControlBits nStat = rOutl.GetControlWord();
     nStat &= ~EEControlBits::AUTOPAGESIZE;
@@ -2060,7 +2060,7 @@ void SdrTableObj::SetSkipChangeLayout(bool bSkipChangeLayout)
 
 bool SdrTableObj::IsReallyEdited() const
 {
-    return mpEdtOutl && mpEdtOutl->IsModified();
+    return mpEditingOutliner && mpEditingOutliner->IsModified();
 }
 
 bool SdrTableObj::IsFontwork() const