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

[Noel Grandin (via logerrit)]

 svx/source/svdraw/svdtext.cxx |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit abc09fe149ed971074eecb0cc1808c35add6ccfa
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Apr 16 17:05:25 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Apr 16 18:31:37 2023 +0200

    remove dead code
    
    it is easier to see that is dead if you look at the code
    prior to eec42f0dbcc79a4c9f456ce97fa1066b8031ea28, when we
    were using unique_ptr, which means that the pointer comparisons
    could never be true.
    
    Change-Id: I2e8608e468868a1f6b657a90b3db580334ec0490
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150457
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index e013620b7d06..0fe4fa47d405 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -71,16 +71,6 @@ const SfxItemSet& SdrText::GetItemSet() const
 
 void SdrText::SetOutlinerParaObject( std::optional<OutlinerParaObject> 
pTextObject )
 {
-    // Update HitTestOutliner
-    const SdrTextObj* 
pTestObj(mrObject.getSdrModelFromSdrObject().GetHitTestOutliner().GetTextObj());
-
-    if(pTestObj)
-        if ( (!pTestObj->GetOutlinerParaObject() && !mpOutlinerParaObject)
-            || (pTestObj->GetOutlinerParaObject() && mpOutlinerParaObject && 
*pTestObj->GetOutlinerParaObject() == *mpOutlinerParaObject) )
-        {
-            
mrObject.getSdrModelFromSdrObject().GetHitTestOutliner().SetTextObj(nullptr);
-        }
-
     mpOutlinerParaObject = std::move(pTextObject);
     mbPortionInfoChecked = false;
 }
@@ -98,19 +88,8 @@ const OutlinerParaObject* SdrText::GetOutlinerParaObject() 
const
 /** returns the current OutlinerParaObject and removes it from this instance */
 std::optional<OutlinerParaObject> SdrText::RemoveOutlinerParaObject()
 {
-    // Update HitTestOutliner
-    const SdrTextObj* 
pTestObj(mrObject.getSdrModelFromSdrObject().GetHitTestOutliner().GetTextObj());
-
-    if(pTestObj)
-        if ( (!pTestObj->GetOutlinerParaObject() && !mpOutlinerParaObject)
-            || (pTestObj->GetOutlinerParaObject() && mpOutlinerParaObject && 
*pTestObj->GetOutlinerParaObject() == *mpOutlinerParaObject) )
-        {
-            
mrObject.getSdrModelFromSdrObject().GetHitTestOutliner().SetTextObj(nullptr);
-        }
-
     std::optional<OutlinerParaObject> pOPO = std::move(mpOutlinerParaObject);
     mbPortionInfoChecked = false;
-
     return pOPO;
 }