From 43c85fd615b99b7d633eedc49017f9abf433592d Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 19 Dec 2003 09:24:51 +0000 Subject: [PATCH] patches are no longer needed, since merged in KDE git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2000 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../kword-active-table-load-crash.patch | 25 ------------------- .../kword-table-resize-mouse-cursor.patch | 23 ----------------- 2 files changed, 48 deletions(-) delete mode 100644 package/rene/koffice/kword-active-table-load-crash.patch delete mode 100644 package/rene/koffice/kword-table-resize-mouse-cursor.patch diff --git a/package/rene/koffice/kword-active-table-load-crash.patch b/package/rene/koffice/kword-active-table-load-crash.patch deleted file mode 100644 index 4eff180f8..000000000 --- a/package/rene/koffice/kword-active-table-load-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ - -Do not crash when loading .kwd files with active table frame-sets ... - - - Rene Rebe - ---- 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(m_currentFrameSetEdit->currentTextEdit()); -+ if (!edit) -+ return -1; - KWTextFrameSet* textfs = edit->textFrameSet(); - if ( textfs && textfs->getGroupManager() ) - return static_cast(textfs)->firstRow(); -@@ -2634,6 +2636,8 @@ - if ( !m_currentFrameSetEdit ) - return -1; - KWTextFrameSetEdit *edit=dynamic_cast(m_currentFrameSetEdit->currentTextEdit()); -+ if (!edit) -+ return -1; - KWTextFrameSet* textfs = edit->textFrameSet(); - if ( textfs && textfs->getGroupManager() ) - return static_cast(textfs)->firstCol(); diff --git a/package/rene/koffice/kword-table-resize-mouse-cursor.patch b/package/rene/koffice/kword-table-resize-mouse-cursor.patch deleted file mode 100644 index ce61860db..000000000 --- a/package/rene/koffice/kword-table-resize-mouse-cursor.patch +++ /dev/null @@ -1,23 +0,0 @@ - -Qt-3.1.2 does not has this swapped cursors ... - - - Rene Rebe - ---- 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;