[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sd/source
Marco Cecchetti
marco.cecchetti at collabora.com
Thu Feb 4 14:59:14 UTC 2016
sd/source/ui/view/Outliner.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 48032cd65ec65175dc6b8635d19f0f1e35437f22
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date: Thu Feb 4 15:36:43 2016 +0100
impress - unable to search inside table - fixed
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: I07df8d0330390ac599aac364581aee1c9fd0f809
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b1535a2..ed3f479 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)
More information about the Libreoffice-commits
mailing list