From 5c91631dbfc9394687fb84cc76384601a566d6ff Mon Sep 17 00:00:00 2001 From: Marco Cecchetti <marco.cecchetti@collabora.com> Date: Thu, 4 Feb 2016 15:36:43 +0100 Subject: impress - unable to search inside table - fixed Change-Id: I07df8d0330390ac599aac364581aee1c9fd0f809 --- sd/source/ui/view/Outliner.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sd/source') diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index de9756eca9cf..c413cf92a5ae 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1226,11 +1226,6 @@ bool Outliner::ShowWrapArroundDialog() bool Outliner::IsValidTextObject (const ::sd::outliner::IteratorPosition& rPosition) { - // TODO implement iteration through table cells and remove this workaround - ::sdr::table::SdrTableObj* pTableObject = dynamic_cast< ::sdr::table::SdrTableObj* >( rPosition.mxObject.get() ); - if( pTableObject != nullptr ) - return false; - SdrTextObj* pObject = dynamic_cast< SdrTextObj* >( rPosition.mxObject.get() ); return (pObject != nullptr) && pObject->HasText() && ! pObject->IsEmptyPresObj(); } @@ -1240,7 +1235,7 @@ void Outliner::PutTextIntoOutliner() mpTextObj = dynamic_cast<SdrTextObj*>( mpObj ); if ( mpTextObj && mpTextObj->HasText() && !mpTextObj->IsEmptyPresObj() ) { - SdrText* pText = mpTextObj->getText( mnText ); + SdrText* pText = mpTextObj->getText( maCurrentPosition.mnText ); mpParaObj = pText ? pText->GetOutlinerParaObject() : nullptr; if (mpParaObj != nullptr) -- cgit