mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

25 lines
1.0 KiB

  1. Do not crash when loading .kwd files with active table frame-sets ...
  2. - Rene Rebe <rene@rocklinux.org>
  3. --- koffice-1.2.94/kword/kwcanvas.cc.orig 2003-10-27 14:21:54.000000000 +0100
  4. +++ koffice-1.2.94/kword/kwcanvas.cc 2003-12-09 21:34:00.000000000 +0100
  5. @@ -2623,6 +2623,8 @@
  6. if ( !m_currentFrameSetEdit )
  7. return -1;
  8. KWTextFrameSetEdit *edit=dynamic_cast<KWTextFrameSetEdit *>(m_currentFrameSetEdit->currentTextEdit());
  9. + if (!edit)
  10. + return -1;
  11. KWTextFrameSet* textfs = edit->textFrameSet();
  12. if ( textfs && textfs->getGroupManager() )
  13. return static_cast<KWTableFrameSet::Cell *>(textfs)->firstRow();
  14. @@ -2634,6 +2636,8 @@
  15. if ( !m_currentFrameSetEdit )
  16. return -1;
  17. KWTextFrameSetEdit *edit=dynamic_cast<KWTextFrameSetEdit *>(m_currentFrameSetEdit->currentTextEdit());
  18. + if (!edit)
  19. + return -1;
  20. KWTextFrameSet* textfs = edit->textFrameSet();
  21. if ( textfs && textfs->getGroupManager() )
  22. return static_cast<KWTableFrameSet::Cell *>(textfs)->firstCol();