git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2000 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
@ -1,25 +0,0 @@ |
|||||
|
|
||||
Do not crash when loading .kwd files with active table frame-sets ... |
|
||||
|
|
||||
- Rene Rebe <rene@rocklinux.org> |
|
||||
|
|
||||
--- koffice-1.2.94/kword/kwcanvas.cc.orig 2003-10-27 14:21:54.000000000 +0100
|
|
||||
+++ koffice-1.2.94/kword/kwcanvas.cc 2003-12-09 21:34:00.000000000 +0100
|
|
||||
@@ -2623,6 +2623,8 @@
|
|
||||
if ( !m_currentFrameSetEdit ) |
|
||||
return -1; |
|
||||
KWTextFrameSetEdit *edit=dynamic_cast<KWTextFrameSetEdit *>(m_currentFrameSetEdit->currentTextEdit()); |
|
||||
+ if (!edit)
|
|
||||
+ return -1;
|
|
||||
KWTextFrameSet* textfs = edit->textFrameSet(); |
|
||||
if ( textfs && textfs->getGroupManager() ) |
|
||||
return static_cast<KWTableFrameSet::Cell *>(textfs)->firstRow(); |
|
||||
@@ -2634,6 +2636,8 @@
|
|
||||
if ( !m_currentFrameSetEdit ) |
|
||||
return -1; |
|
||||
KWTextFrameSetEdit *edit=dynamic_cast<KWTextFrameSetEdit *>(m_currentFrameSetEdit->currentTextEdit()); |
|
||||
+ if (!edit)
|
|
||||
+ return -1;
|
|
||||
KWTextFrameSet* textfs = edit->textFrameSet(); |
|
||||
if ( textfs && textfs->getGroupManager() ) |
|
||||
return static_cast<KWTableFrameSet::Cell *>(textfs)->firstCol(); |
|
||||
@ -1,23 +0,0 @@ |
|||||
|
|
||||
Qt-3.1.2 does not has this swapped cursors ... |
|
||||
|
|
||||
- Rene Rebe <rene@rocklinux.org> |
|
||||
|
|
||||
--- koffice-1.2.94/kword/kwdoc.cc 2003-10-27 14:21:55.000000000 +0100
|
|
||||
+++ koffice-1.2.94-fixed/kword/kwdoc.cc 2003-12-10 08:05:39.000000000 +0100
|
|
||||
@@ -3278,13 +3278,13 @@
|
|
||||
return Qt::sizeVerCursor; |
|
||||
case MEANING_RESIZE_COLUMN: |
|
||||
// Bug in (at least) Qt-3.1.1 : Qt::splitVCursor and Qt::splitHCursor are swapped! |
|
||||
-#if QT_VERSION < 0x030200
|
|
||||
+#if QT_VERSION < 0x030102
|
|
||||
return Qt::splitVCursor; |
|
||||
#else |
|
||||
return Qt::splitHCursor; |
|
||||
#endif |
|
||||
case MEANING_RESIZE_ROW: |
|
||||
-#if QT_VERSION < 0x030200
|
|
||||
+#if QT_VERSION < 0x030102
|
|
||||
return Qt::splitHCursor; |
|
||||
#else |
|
||||
return Qt::splitVCursor; |
|
||||