diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2016-02-04 15:36:43 +0100 |
|---|---|---|
| committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2016-02-04 15:56:50 +0100 |
| commit | 48032cd65ec65175dc6b8635d19f0f1e35437f22 (patch) | |
| tree | d31bfec64f6a2312ddf052fe420e437c2c01c31c | |
| parent | 0c173061133bad123ce7b53bc70be21b77667d56 (diff) | |
impress - unable to search inside table - fixed
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: I07df8d0330390ac599aac364581aee1c9fd0f809
| -rw-r--r-- | sd/source/ui/view/Outliner.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index b1535a2b0d62..ed3f4790da21 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1240,11 +1240,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 != NULL) && pObject->HasText() && ! pObject->IsEmptyPresObj(); } @@ -1254,7 +1249,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() : NULL; if (mpParaObj != NULL) |