From d934b50dfbe176b4aadbab391f6260b14a6c0a9f Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 10 Dec 2003 20:04:32 +0000
Subject: [PATCH] fixed two koffice/kword bugs

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1945 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE       |  1 +
 .../kword-active-table-load-crash.patch       | 25 +++++++++++++++++++
 .../kword-table-resize-mouse-cursor.patch     | 23 +++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 package/rene/koffice/kword-active-table-load-crash.patch
 create mode 100644 package/rene/koffice/kword-table-resize-mouse-cursor.patch

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 84c07859f..cc2c239a9 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -2,6 +2,7 @@
 *) 2003-12-10 (2.0.0-rc3 - 2.0.0-rc4)
 
  - Alejandro Mery: fixed prelink and updated libelf
+ - fixed two koffice/kword bugs
 
 *) 2003-12-09 (2.0.0-rc3 - 2.0.0-rc4)
 
diff --git a/package/rene/koffice/kword-active-table-load-crash.patch b/package/rene/koffice/kword-active-table-load-crash.patch
new file mode 100644
index 000000000..4eff180f8
--- /dev/null
+++ b/package/rene/koffice/kword-active-table-load-crash.patch
@@ -0,0 +1,25 @@
+
+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();
diff --git a/package/rene/koffice/kword-table-resize-mouse-cursor.patch b/package/rene/koffice/kword-table-resize-mouse-cursor.patch
new file mode 100644
index 000000000..4e29305d3
--- /dev/null
+++ b/package/rene/koffice/kword-table-resize-mouse-cursor.patch
@@ -0,0 +1,23 @@
+
+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 < 0x030101
+         return Qt::splitVCursor;
+ #else
+         return Qt::splitHCursor;
+ #endif
+     case MEANING_RESIZE_ROW:
+-#if QT_VERSION < 0x030200
++#if QT_VERSION < 0x030101
+         return Qt::splitHCursor;
+ #else
+         return Qt::splitVCursor;