Update to KOffice 1.5.1

12 files changed, 176 insertions, 96 deletions

diff --git a/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp b/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp
new file mode 100644
index 000000000000..2f0cd77eaa23
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp
@@ -0,0 +1,11 @@
+--- kexi/kexidb/preparedstatement.cpp.orig	Thu May 25 15:55:54 2006
++++ kexi/kexidb/preparedstatement.cpp	Thu May 25 16:02:59 2006
+@@ -104,7 +104,7 @@
+ 		}
+ 		s.append(")");
+ 		s.prepend(QCString("INSERT INTO ") + table->name().latin1()
+-			+ (allTableFieldsUsed ? "" : (" (" + namesList + ")"))
++			+ (allTableFieldsUsed ? QCString("") : (" (" + namesList + ")"))
+ 			+ " VALUES (");
+ 	}
+ 	return s;
diff --git a/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in b/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in
new file mode 100644
index 000000000000..2a6b7ab620e5
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in
@@ -0,0 +1,33 @@
+--- kexi/kexidb/drivers/sqlite2/Makefile.in	Wed May 17 12:07:36 2006
++++ kexi/kexidb/drivers/sqlite2/Makefile.in	Tue May 23 19:05:20 2006
+@@ -929,12 +929,6 @@
+ 	uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
+ 	uninstall-kde_servicesDATA
+ 
+-
+-# we need the .mocs to be built
+-sqliteconnection.lo: ../sqlite/sqliteconnection.lo
+-sqlitecursor.lo: ../sqlite/sqlitecursor.lo
+-sqlitedriver.lo: ../sqlite/sqlitedriver.lo
+-sqlitepreparedstatement.lo: ../sqlite/sqlitepreparedstatement.lo
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -949,7 +943,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=sqlitecursor.h sqlitedriver.h sqliteconnection.h Makefile.in kexidb_sqlite2driver.desktop sqliteconnection_p.h sqlite2.pro Makefile.am 
++KDE_DIST=sqlitecursor.h sqliteconnection.h sqlite2.pro Makefile.in kexidb_sqlite2driver.desktop Makefile.am sqliteconnection_p.h sqlitedriver.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -997,7 +991,7 @@
+ 
+ 
+ #>+ 11
+-kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp  ../sqlite/sqliteconnection.lo $(srcdir)/sqlitedriver.cpp  ../sqlite/sqlitedriver.lo $(srcdir)/sqlitecursor.cpp  ../sqlite/sqlitecursor.lo $(srcdir)/sqlitepreparedstatement.cpp  ../sqlite/sqlitepreparedstatement.lo 
++kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp $(srcdir)/sqlitedriver.cpp $(srcdir)/sqlitecursor.cpp $(srcdir)/sqlitepreparedstatement.cpp 
+ 	@echo 'creating kexidb_sqlite2driver_la.all_cpp.cpp ...'; \
+ 	rm -f kexidb_sqlite2driver_la.all_cpp.files kexidb_sqlite2driver_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kexidb_sqlite2driver_la.all_cpp.final; \
diff --git a/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h b/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h
deleted file mode 100644
index fa9edfe58389..000000000000
--- a/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kexi/main/keximainwindowimpl.h	2006/03/24 09:22:37	522034
-+++ kexi/main/keximainwindowimpl.h	2006/04/05 19:04:48	526845
-@@ -466,6 +466,7 @@
- 		Private *d;
- 
- 	friend class KexiDialogBase;
-+	friend class Private;
- };
- 
- #endif
diff --git a/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in b/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in
new file mode 100644
index 000000000000..9dc40bb8226c
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in
@@ -0,0 +1,14 @@
+--- kexi/plugins/forms/Makefile.in.orig	Sun May 21 14:54:47 2006
++++ kexi/plugins/forms/Makefile.in	Sun May 21 14:56:19 2006
+@@ -658,9 +658,10 @@
+ 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
+ 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
+ 
+-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ 
+ kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
diff --git a/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in b/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in
new file mode 100644
index 000000000000..75d9bb157887
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in
@@ -0,0 +1,42 @@
+--- kexi/plugins/reports/Makefile.in.orig	Sun May 21 14:56:30 2006
++++ kexi/plugins/reports/Makefile.in	Sun May 21 15:02:13 2006
+@@ -65,16 +65,20 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+ kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \
+-	../../widget/utils/libkexiguiutils.la \
+-	../../widget/libkexiextendedwidgets.la \
+-	../../formeditor/libkformdesigner.la \
+-	../forms/libkexiformutils.la ./libkexireportutils.la
++	$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	./libkexireportutils.la
+ am_kexihandler_report_la_OBJECTS = kexireports.lo
+ #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS)
+ #>+ 1
+ kexihandler_report_la_OBJECTS = kexireports.lo
+ kexireportwidgets_la_DEPENDENCIES =  \
+ 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ 	./libkexireportutils.la
+ am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \
+ 	kexireportfactory.lo
+@@ -645,10 +649,12 @@
+ libkexireportutils_la_SOURCES = \
+ 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
+ 
+-libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+-	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
+ 
+ kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
+ kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
diff --git a/editors/calligra/files/patch-krita_core-kis_filter.h b/editors/calligra/files/patch-krita_core-kis_filter.h
deleted file mode 100644
index 36e476034285..000000000000
--- a/editors/calligra/files/patch-krita_core-kis_filter.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/core/kis_filter.h	2006/03/24 09:22:37	522034
-+++ krita/core/kis_filter.h	2006/04/06 17:18:18	527039
-@@ -28,6 +28,7 @@
- #include "kis_types.h"
- #include "kis_filter_registry.h"
- #include "kis_id.h"
-+#include "kis_paint_device.h"
- #include "kis_progress_subject.h"
- #include "kis_filter_configuration.h"
- #include "kis_colorspace.h"
diff --git a/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in b/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in
new file mode 100644
index 000000000000..7e5d73f256d8
--- /dev/null
+++ b/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in
@@ -0,0 +1,11 @@
+--- krita/plugins/filters/cimg/Makefile.in.orig	Mon May 22 12:44:21 2006
++++ krita/plugins/filters/cimg/Makefile.in	Mon May 22 12:44:39 2006
+@@ -562,7 +562,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L
++KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+ kde_services_DATA = kritacimg.desktop
+ 
+ # all_includes must remain last!
diff --git a/editors/calligra/files/patch-krita_ui-kis_doc.cc b/editors/calligra/files/patch-krita_ui-kis_doc.cc
deleted file mode 100644
index 3dc7305d10ab..000000000000
--- a/editors/calligra/files/patch-krita_ui-kis_doc.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/kis_doc.cc	2006/03/24 09:22:37	522034
-+++ krita/ui/kis_doc.cc	2006/04/06 17:18:18	527039
-@@ -844,7 +844,7 @@
- KisImageSP KisDoc::newImage(const QString& name, Q_INT32 width, Q_INT32 height, KisColorSpace * colorstrategy)
- {
-     if (!init())
--        return false;
-+        return 0;
- 
-     setUndo(false);
- 
diff --git a/editors/calligra/files/patch-krita_ui-kis_ruler.cc b/editors/calligra/files/patch-krita_ui-kis_ruler.cc
deleted file mode 100644
index 20170a079e1d..000000000000
--- a/editors/calligra/files/patch-krita_ui-kis_ruler.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- krita/ui/kis_ruler.cc	2006/04/03 08:02:37	525898
-+++ krita/ui/kis_ruler.cc	2006/04/06 17:18:18	527039
-@@ -18,6 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  */
- #include <qpainter.h>
-+#include <qstyle.h>
- 
- #include "kdebug.h"
- 
diff --git a/editors/calligra/files/patch-krita_ui-layerlist.cpp b/editors/calligra/files/patch-krita_ui-layerlist.cpp
deleted file mode 100644
index e904f7ddc345..000000000000
--- a/editors/calligra/files/patch-krita_ui-layerlist.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- krita/ui/layerlist.cpp	2006/03/24 09:22:37	522034
-+++ krita/ui/layerlist.cpp	2006/04/06 17:18:18	527039
-@@ -890,7 +890,7 @@
-     QListViewItemIterator it(this);
- 
-     while (it.current()) {
--        if (it.current() == item) {
-+        if (static_cast<const LayerItem *>(it.current()) == item) {
-             return true;
-         }
-         ++it;
diff --git a/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp b/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp
deleted file mode 100644
index b37beb57d1e6..000000000000
--- a/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- lib/kotext/KoParagDia.cpp	2006/04/02 23:37:38	525830
-+++ lib/kotext/KoParagDia.cpp	2006/04/06 19:39:40	527078
-@@ -772,6 +772,20 @@
- /******************************************************************/
- /* Class: KoStylePreview. Previewing text with style ;)           */
- /******************************************************************/
-+class MyFlow : public KoTextFlow {
-+    public:
-+        MyFlow(QWidget *parent, KoTextZoomHandler *zoom) {
-+            m_parent = parent;
-+            m_zoomHandler = zoom;
-+        }
-+        int availableHeight() const {
-+            return m_zoomHandler->pixelToLayoutUnitY(m_parent->height());
-+        }
-+    private:
-+        QWidget *m_parent;
-+        KoTextZoomHandler *m_zoomHandler;
-+};
-+
- KoStylePreview::KoStylePreview( const QString& title, const QString& text, QWidget* parent, const char* name )
-     : QGroupBox( title, parent, name )
- {
-@@ -780,20 +794,6 @@
-     QFont font = KoGlobal::defaultFont();
-     m_textdoc = new KoTextDocument( m_zoomHandler, new KoTextFormatCollection( font, QColor(), KGlobal::locale()->language(), false ) );
- 
--    class MyFlow : public KoTextFlow {
--        public:
--            MyFlow(QWidget *parent, KoTextZoomHandler *zoom) {
--                m_parent = parent;
--                m_zoomHandler = zoom;
--            }
--            int availableHeight() const {
--                return m_zoomHandler->pixelToLayoutUnitY(m_parent->height());
--            }
--        private:
--            QWidget *m_parent;
--            KoTextZoomHandler *m_zoomHandler;
--    };
--
-     m_textdoc->setFlow( new MyFlow(this, m_zoomHandler) );
-     //m_textdoc->setWidth( KoTextZoomHandler::ptToLayoutUnitPt( 1000 ) );
-     KoTextParag * parag = m_textdoc->firstParag();
diff --git a/editors/calligra/files/patch-post-1.5.1-kexi b/editors/calligra/files/patch-post-1.5.1-kexi
new file mode 100644
index 000000000000..798a3a872111
--- /dev/null
+++ b/editors/calligra/files/patch-post-1.5.1-kexi
@@ -0,0 +1,65 @@
+Index: kexi/plugins/forms/kexidataprovider.cpp
+===================================================================
+--- kexi/plugins/forms/kexidataprovider.cpp	(revision 542130)
++++ kexi/plugins/forms/kexidataprovider.cpp	(revision 542131)
+@@ -92,7 +92,8 @@
+  	for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); 
+ 		it!=m_fieldNumbersForDataItems.constEnd(); ++it)
+ 	{
+-		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() << endl;
++		kexipluginsdbg << "fill data of '" << it.key()->dataSource() <<  "' at idx=" << it.data() 
++			<< " data=" << row.at(it.data()) << endl;
+ 		it.key()->setValue( row.at(it.data()) );
+ 	}
+ }
+Index: kexi/plugins/forms/widgets/kexidbautofield.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbautofield.cpp	(revision 542131)
+@@ -446,8 +446,11 @@
+ 		@todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool]
+ 		(see doc/dev/settings.txt) */
+ 			if (!text.isEmpty()) {
+-				realText = text[0].upper();
+-				realText += (text.mid(1) + ": ");
++				realText = text[0].upper() + text.mid(1);
++				if (m_widgetType!=Boolean) {
++//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
++					realText += ": ";
++				}
+ 			}
+ 		}
+ 		else
+Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+===================================================================
+--- kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542130)
++++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp	(revision 542131)
+@@ -27,7 +27,9 @@
+  : QCheckBox(text, parent, name), KexiFormDataItemInterface()
+ {
+ 	m_invalidState = false;
++//! todo: tristate 
+ 	setTristate(true);
++	setFocusPolicy(QWidget::StrongFocus);
+ 	connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int)));
+ }
+ 
+@@ -56,13 +58,16 @@
+ 
+ void KexiDBCheckBox::setValueInternal(const QVariant &add, bool )
+ {
+-	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++//	setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) );
++	setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) );
+ }
+ 
+ QVariant
+ KexiDBCheckBox::value()
+ {
+-	return QVariant( isChecked(), 3 );
++	if (state()==NoChange)
++		return QVariant();
++	return QVariant(state()==On, 1);
+ }
+ 
+ void KexiDBCheckBox::slotStateChanged(int )