Update koffice to 1.3.1

Changes:

KOfficeCore:
* Changed .desktop file setup so that changes to the K menu structure, to
  file-program associations, or other distribution customizations cannot
  prevent KOffice applications from starting.
* Fixed parsing of number+unit, due to change in Qt 3.3. Fixes problems
  when opening OOWriter documents in particular.
* Don't show the filter dialog when generating thumbnails
* Improved error handling to catch "partition full" problems.
KOfficeUI:
* Fix overwriting of templates
* Fix loading icons when creating templates
* Allow template icons up to 64x64 instead of 60x60 and scale better if
  too big

KoText library features (shared between KWord and KPresenter):
* Date variables for printing-date, last-modified, and creation-date were
  not loaded correctly.
* Background spellchecking works again
* Fixed crash during background spellchecking (refcounting of formats)
* Fixed race condition during background spellchecking (leading to
  misplaced red underlines)
* Repaint paragraph after bg spell checking, in all cases (errors or not),
  otherwise newly-added-to-the-dictionary words were still red-underlined
* Fixed hyphenation checkbox not correctly set in font dialog
* Fixed wrong hyphenation in many cases, due to wrong word sent to
  hyphenation engine
* Font dialog usability: turn radiobuttons superscript/subscript into
  checkboxes to make it possible to deactivate both.
* Usability in style dialog: when creating a new style, select it as the
  'next style' for itself
* Allow decimal values in "multiple" (proportional) linespacing.
* Fixed wrong left margin on multiline paragraphs with a counter.

KWord
* Fixed "add bookmark" for the case where there's no selection
* Keep bookmark valid after deleting its paragraph
* Usability improvements in "select bookmark" dialog
* Fixed drawing of borders for copied frames (e.g. header/footers)
* Fixed "text doesn't immediately run around copied frame on new page"
* Fixed crash when activating text view mode and there's no text frameset
* Allow to save custom shortcuts for 'insert variable' actions
* Fixed crash when undoing a paste action
* Fixed crash related to tables and deleting frames
* Fixed crash when pasting plain text over a selection
* Fixed wrong conversion of values in config dialog when switching units

KPresenter
* Fixed possible crash in presentation mode if not all slides are shown
* Fixed wrong clipping of fullscreen presentation
* Fixed show the duration for the correct page if not all slides are shown
* Fixed crash in infinite loop presentation mode when first slide is not
  shown
* Fixed speed of automatic presentation (it was reversed)
* Fixed wrong positioning of text when using "Vertical Alignment"
* Fixed redrawing of lines in drawing mode in case of a repaint event
* Save HTML Slideshow export settings does not add extension to filenames
* If a page is shown more than once during a presentation, add the time
  for the duration instead of showing only the last duration.

KSpread
* undo not working after deleting multiple cells
* fixed crash when opening a file over the network

Kivio
* Add missing code to make the 'Crop picture to edges' option in the page
  export dialog work.
* Fixed painting bug when moving stencils containing text.
* Add boundaries to the zoom to prevent lockups and crashes.

4 files changed, 36 insertions, 19 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 0d1c819447f..2bf5586718e 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2004/04/26 02:06:23 snj Exp $
+# $NetBSD: Makefile,v 1.41 2004/05/04 11:47:30 markd Exp $
 
-DISTNAME=	koffice-1.3
-PKGREVISION=	2
+DISTNAME=	koffice-1.3.1
 CATEGORIES=	misc kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.3/src/ \
-		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.3/src/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.3/src/
+MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.3.1/src/ \
+		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.3.1/src/ \
+		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.3.1/src/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 0275dfff446..e5a474f5acb 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/02/09 10:13:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/05/04 11:47:30 markd Exp $
 bin/karbon
 bin/kchart
 bin/kformula
@@ -1107,6 +1107,7 @@ share/kde/apps/kivio/icons/hicolor/16x16/actions/layer_novisible.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/layer_print.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/layer_remove.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/layer_visible.png
+share/kde/apps/kivio/icons/hicolor/16x16/actions/linestyle.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/linewidth.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/open_stencilset.png
 share/kde/apps/kivio/icons/hicolor/16x16/actions/page_disabled.png
@@ -1134,6 +1135,8 @@ share/kde/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/font_under.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.xpm
+share/kde/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
+share/kde/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/select_all.png
 share/kde/apps/kivio/icons/hicolor/22x22/actions/send_stencil_to_back.png
@@ -2368,7 +2371,6 @@ share/kde/apps/koffice/icons/crystalsvg/16x16/actions/tab_first.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/tab_last.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/tab_left.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/tab_right.png
-share/kde/apps/koffice/icons/crystalsvg/16x16/actions/text_strike.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/text_sub.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/text_super.png
 share/kde/apps/koffice/icons/crystalsvg/16x16/actions/textcolor.png
@@ -2436,7 +2438,6 @@ share/kde/apps/koffice/icons/crystalsvg/22x22/actions/shadowRU.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/shadowU.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/sub.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/super.png
-share/kde/apps/koffice/icons/crystalsvg/22x22/actions/text_strike.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/toggle_docbrowser.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/unsortedList.png
 share/kde/apps/koffice/icons/crystalsvg/22x22/actions/view_remove.png
@@ -2766,6 +2767,7 @@ share/kde/apps/kspread/icons/crystalsvg/16x16/actions/special_paste.png
 share/kde/apps/kspread/icons/crystalsvg/16x16/actions/text_bottom.png
 share/kde/apps/kspread/icons/crystalsvg/16x16/actions/text_top.png
 share/kde/apps/kspread/icons/crystalsvg/16x16/actions/vertical_text.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/black_sum.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_all.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_bottom.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_fall.png
@@ -2779,9 +2781,17 @@ share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_top.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_up.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/border_vertical.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/funct.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/mergecell.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/middle.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/money.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/multirow.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/percent.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/prec_minus.png
 share/kde/apps/kspread/icons/crystalsvg/22x22/actions/prec_plus.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/sort_decrease.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/sort_incr.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/text_bottom.png
+share/kde/apps/kspread/icons/crystalsvg/22x22/actions/text_top.png
 share/kde/apps/kspread/icons/crystalsvg/32x32/actions/border_all.png
 share/kde/apps/kspread/icons/crystalsvg/32x32/actions/border_bottom.png
 share/kde/apps/kspread/icons/crystalsvg/32x32/actions/border_fall.png
@@ -3124,13 +3134,17 @@ share/kde/services/karbon_svg_import.desktop
 share/kde/services/karbon_wmf_export.desktop
 share/kde/services/karbon_wmf_import.desktop
 share/kde/services/karbon_xcf_export.desktop
+share/kde/services/karbonpart.desktop
+share/kde/services/kchartpart.desktop
 share/kde/services/kfile_koffice.desktop
 share/kde/services/kfile_ooo.desktop
 share/kde/services/kformula_latex_export.desktop
 share/kde/services/kformula_mathml_export.desktop
 share/kde/services/kformula_mathml_import.desktop
 share/kde/services/kformula_png_export.desktop
+share/kde/services/kformulapart.desktop
 share/kde/services/kivioconnectortool.desktop
+share/kde/services/kiviopart.desktop
 share/kde/services/kivioselecttool.desktop
 share/kde/services/kiviotexttool.desktop
 share/kde/services/kiviozoomtool.desktop
@@ -3139,6 +3153,7 @@ share/kde/services/kofficethumbnail.desktop
 share/kde/services/kounavail.desktop
 share/kde/services/kpresenter_ooimpress_export.desktop
 share/kde/services/kpresenter_ooimpress_import.desktop
+share/kde/services/kpresenterpart.desktop
 share/kde/services/kprkword.desktop
 share/kde/services/kspelltool.desktop
 share/kde/services/kspread_applixspread_import.desktop
@@ -3153,7 +3168,9 @@ share/kde/services/kspread_opencalc_export.desktop
 share/kde/services/kspread_opencalc_import.desktop
 share/kde/services/kspread_qpro_import.desktop
 share/kde/services/kspreadcalc.desktop
+share/kde/services/kspreadpart.desktop
 share/kde/services/kugar_kugar_import.desktop
+share/kde/services/kugarpart.desktop
 share/kde/services/kword_abiword_export.desktop
 share/kde/services/kword_abiword_import.desktop
 share/kde/services/kword_amipro_export.desktop
@@ -3179,6 +3196,7 @@ share/kde/services/kword_wml_export.desktop
 share/kde/services/kword_wml_import.desktop
 share/kde/services/kword_wp_export.desktop
 share/kde/services/kword_wp_import.desktop
+share/kde/services/kwordpart.desktop
 share/kde/services/kwserialletter_classic.desktop
 share/kde/services/kwserialletter_qtsqldb_power.desktop
 share/kde/services/ole_excel97_import.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 330948a2df4..2bfb060a8c0 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2004/02/10 21:06:33 markd Exp $
+$NetBSD: distinfo,v 1.13 2004/05/04 11:47:30 markd Exp $
 
-SHA1 (koffice-1.3.tar.bz2) = f9c6736e6409ff4be4bbfd5407a1dfee9adf6d1d
-Size (koffice-1.3.tar.bz2) = 10622005 bytes
-SHA1 (patch-aa) = 865725ae91baa89ea3a9e87613cc9837e1034ac7
+SHA1 (koffice-1.3.1.tar.bz2) = 7d5ff4e3c01a20901c2a72114e0f4930fce3ea60
+Size (koffice-1.3.1.tar.bz2) = 10615570 bytes
+SHA1 (patch-aa) = 64f32eaaa0f6e29f6ec3c9b92ecf4599cd11f178
 SHA1 (patch-ab) = 6f253484f6c09877cca6b1d1d7610725c895e13a
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index 6af145f486d..c00bdc4b08d 100644
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2004/01/28 08:43:11 markd Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/04 11:47:30 markd Exp $
 
---- filters/karbon/msod/msodimport.cc.orig	2003-10-04 20:22:54.000000000 +0000
-+++ filters/karbon/msod/msodimport.cc	2003-10-04 20:23:03.000000000 +0000
-@@ -30,7 +30,7 @@
+--- filters/karbon/msod/msodimport.cc.orig	2004-04-12 21:18:28.000000000 +1200
++++ filters/karbon/msod/msodimport.cc
+@@ -30,7 +30,7 @@ DESCRIPTION
  #include <qpointarray.h>
  
  typedef KGenericFactory<MSODImport, KoFilter> MSODImportFactory;
--K_EXPORT_COMPONENT_FACTORY( libmsodimport, MSODImportFactory( "karbonmsodimport" ) );
-+K_EXPORT_COMPONENT_FACTORY( libkarbonmsodimport, MSODImportFactory( "karbonmsodimport" ) );
+-K_EXPORT_COMPONENT_FACTORY( libmsodimport, MSODImportFactory( "karbonmsodimport" ) )
++K_EXPORT_COMPONENT_FACTORY( libkarbonmsodimport, MSODImportFactory( "karbonmsodimport" ) )
  
  const int MSODImport::s_area = 30505;