1 files changed, 9 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index fbd48a555a65..c5c31e20aa47 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -1003,20 +1003,23 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
             pPattern->FillEditParaItems( &aDefaults );  // including alignment etc. (for reading)
         }
 
-        const ScBaseCell* pCell = pDoc->GetCell( aCellPos );
-        if ( pCell && pCell->GetCellType() == CELLTYPE_EDIT )
-            pEditEngine->SetTextNewDefaults( *((const ScEditCell*)pCell)->GetData(), aDefaults );
+        if (pDoc->GetCellType(aCellPos) == CELLTYPE_EDIT)
+        {
+            const EditTextObject* pObj = pDoc->GetEditText(aCellPos);
+            if (pObj)
+                pEditEngine->SetTextNewDefaults(*pObj, aDefaults);
+        }
         else
         {
-            GetCellText( aCellPos, aText );
+            GetCellText(aCellPos, aText);
             if (aText.Len())
-                pEditEngine->SetTextNewDefaults( aText, aDefaults );
+                pEditEngine->SetTextNewDefaults(aText, aDefaults);
             else
                 pEditEngine->SetDefaults(aDefaults);
         }
     }
 
-    bDataValid = sal_True;
+    bDataValid = true;
     return pForwarder;
 }