diff options
Diffstat (limited to 'editors/calligra/files')
12 files changed, 120 insertions, 236 deletions
diff --git a/editors/calligra/files/karbon_factory_init.cc b/editors/calligra/files/karbon_factory_init.cc deleted file mode 100644 index 76315b5e3378..000000000000 --- a/editors/calligra/files/karbon_factory_init.cc +++ /dev/null @@ -1,23 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2005 The Karbon Developers - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "karbon_factory.h" - -K_EXPORT_COMPONENT_FACTORY( libkarbonpart, KarbonFactory() ) - diff --git a/editors/calligra/files/patch-karbon_Makefile.in b/editors/calligra/files/patch-karbon_Makefile.in deleted file mode 100644 index 329bef8ae6d0..000000000000 --- a/editors/calligra/files/patch-karbon_Makefile.in +++ /dev/null @@ -1,107 +0,0 @@ ---- karbon/Makefile.in.orig Wed Oct 5 12:52:36 2005 -+++ karbon/Makefile.in Fri Nov 25 18:12:28 2005 -@@ -369,7 +369,7 @@ - libkarbonbase_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(KDE_NO_UNDEFINED) - libkarbonbase_la_LIBADD = $(LIB_KOFFICEUI) - --libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined - libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOTEXT) \ - dockers/libkarbondockers.la \ - widgets/libkarbonwidgets.la \ -@@ -388,7 +388,7 @@ - $(LIBFREETYPE_LIBS) - - --libkarbonpart_la_SOURCES = dummy.cpp -+libkarbonpart_la_SOURCES = karbon_factory_init.cc - libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) - libkarbonpart_la_LIBADD = libkarboncommon.la - #>- libkarbonpart_la_METASOURCES = AUTO -@@ -422,10 +422,10 @@ - karbon_la_DEPENDENCIES = libkdeinit_karbon.la - #>- am_karbon_la_OBJECTS = main.lo - #>+ 1 --am_karbon_la_OBJECTS = karbon_dummy.lo -+am_karbon_la_OBJECTS = karbon_karbon_factory_init.lo - #>- karbon_la_OBJECTS = $(am_karbon_la_OBJECTS) - #>+ 1 --karbon_la_OBJECTS = karbon_dummy.lo -+karbon_la_OBJECTS = karbon_karbon_factory_init.lo - libkarbonbase_la_DEPENDENCIES = - am_libkarbonbase_la_OBJECTS = karbon_view_base.lo karbon_part_base.lo - #>- libkarbonbase_la_OBJECTS = $(am_libkarbonbase_la_OBJECTS) -@@ -455,10 +455,10 @@ - @KDE_USE_FINAL_FALSE@libkarboncommon_la_OBJECTS = $(libkarboncommon_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@libkarboncommon_la_OBJECTS = $(libkarboncommon_la_final_OBJECTS) - libkarbonpart_la_DEPENDENCIES = libkarboncommon.la --am_libkarbonpart_la_OBJECTS = dummy.lo -+am_libkarbonpart_la_OBJECTS = karbon_factory_init.lo - #>- libkarbonpart_la_OBJECTS = $(am_libkarbonpart_la_OBJECTS) - #>+ 1 --libkarbonpart_la_OBJECTS = dummy.lo -+libkarbonpart_la_OBJECTS = karbon_factory_init.lo - bin_PROGRAMS = - #>- PROGRAMS = $(bin_PROGRAMS) - #>+ 2 -@@ -473,7 +473,7 @@ - LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/karbon_factory_init.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \ -@@ -486,7 +486,7 @@ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_iface.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo - #>+ 24 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P $(DEPDIR)/libkarbonbase_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cpp.P ./$(DEPDIR)/dummy.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_karbon_factory_init.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P $(DEPDIR)/libkarbonbase_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cpp.P ./$(DEPDIR)/karbon_factory_init.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \ -@@ -498,7 +498,7 @@ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_base.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_iface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P ./$(DEPDIR)/dummy.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_karbon_factory_init.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P ./$(DEPDIR)/karbon_factory_init.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \ -@@ -710,7 +710,7 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_factory_init.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_drag.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_factory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_grid_data.Plo@am__quote@ -@@ -1021,9 +1021,6 @@ - uninstall-recursive - - --dummy.cpp: -- echo > dummy.cpp -- - messages: rc.cpp - $(EXTRACTRC) data/*.rc >> rc.cpp - $(XGETTEXT) rc.cpp *.cpp *.cc */*.cc tools/*.h plugins/*/*.cc -o $(podir)/karbon.pot -@@ -1049,10 +1046,10 @@ - echo 'extern "C" int kdemain(int argc, char* argv[]);' > karbon.la.cc; \ - echo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> karbon.la.cc - --karbon_dummy.cc: -- echo '#include <kdemacros.h>' > karbon_dummy.cc; \ -- echo 'extern "C" int kdemain(int argc, char* argv[]);' >> karbon_dummy.cc; \ -- echo 'extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> karbon_dummy.cc -+karbon_karbon_factory_init.cc: -+ echo '#include <kdemacros.h>' > karbon_karbon_factory_init.cc; \ -+ echo 'extern "C" int kdemain(int argc, char* argv[]);' >> karbon_karbon_factory_init.cc; \ -+ echo 'extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> karbon_karbon_factory_init.cc - karbon_LDFLAGS = $(KDE_RPATH) -no-undefined $(all_libraries) - karbon_LDADD = libkdeinit_karbon.la - karbon_DEPENDENCIES = libkdeinit_karbon.la diff --git a/editors/calligra/files/patch-karbon_karbon_factory.cc b/editors/calligra/files/patch-karbon_karbon_factory.cc deleted file mode 100644 index 7e126d371dbd..000000000000 --- a/editors/calligra/files/patch-karbon_karbon_factory.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- karbon/karbon_factory.cc.orig Fri Nov 25 17:29:39 2005 -+++ karbon/karbon_factory.cc Fri Nov 25 17:29:59 2005 -@@ -32,11 +32,7 @@ - - #include <kdebug.h> - -- - KarbonResourceServer* KarbonFactory::s_rserver = 0; -- -- --K_EXPORT_COMPONENT_FACTORY( libkarbonpart, KarbonFactory() ) - - KInstance* KarbonFactory::s_instance = 0L; - KAboutData* KarbonFactory::s_aboutData = 0L; diff --git a/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h b/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h new file mode 100644 index 000000000000..fa9edfe58389 --- /dev/null +++ b/editors/calligra/files/patch-kexi_main-keximainwindowimpl.h @@ -0,0 +1,10 @@ +--- 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-krita_core-kis_filter.h b/editors/calligra/files/patch-krita_core-kis_filter.h new file mode 100644 index 000000000000..36e476034285 --- /dev/null +++ b/editors/calligra/files/patch-krita_core-kis_filter.h @@ -0,0 +1,10 @@ +--- 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_core_tiles-kis-tilemanager.cc b/editors/calligra/files/patch-krita_core_tiles-kis-tilemanager.cc new file mode 100644 index 000000000000..05286a6e7915 --- /dev/null +++ b/editors/calligra/files/patch-krita_core_tiles-kis-tilemanager.cc @@ -0,0 +1,12 @@ +--- krita/core/tiles/kis_tilemanager.cc.orig Sat Apr 8 04:58:21 2006 ++++ krita/core/tiles/kis_tilemanager.cc Sat Apr 8 04:58:41 2006 +@@ -18,8 +18,8 @@ + + #include <kdebug.h> + +-#include <sys/mman.h> + #include <sys/types.h> ++#include <sys/mman.h> + #include <sys/stat.h> + #include <unistd.h> + #include <string.h> diff --git a/editors/calligra/files/patch-krita_ui-kis_doc.cc b/editors/calligra/files/patch-krita_ui-kis_doc.cc new file mode 100644 index 000000000000..3dc7305d10ab --- /dev/null +++ b/editors/calligra/files/patch-krita_ui-kis_doc.cc @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..20170a079e1d --- /dev/null +++ b/editors/calligra/files/patch-krita_ui-kis_ruler.cc @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..e904f7ddc345 --- /dev/null +++ b/editors/calligra/files/patch-krita_ui-layerlist.cpp @@ -0,0 +1,11 @@ +--- 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-kword-KWFrame.cpp b/editors/calligra/files/patch-kword-KWFrame.cpp new file mode 100644 index 000000000000..e8d8faccd72c --- /dev/null +++ b/editors/calligra/files/patch-kword-KWFrame.cpp @@ -0,0 +1,12 @@ +--- kword/KWFrame.cpp.orig Thu Mar 23 20:59:46 2006 ++++ kword/KWFrame.cpp Sat Apr 8 13:25:08 2006 +@@ -671,7 +671,8 @@ + // This attribute isn't part of the OASIS spec. Doesn't matter since it doesn't affect rendering + // of existing documents, only editing (and only KWord has this kind of option until now). + NewFrameBehavior defaultNfb = frameSet()->isHeaderOrFooter() ? Copy : NoFollowup; +- if ( m_newFrameBehavior != defaultNfb ) { ++ NewFrameBehavior temp_newFrameBehavior = m_newFrameBehavior; ++ if ( temp_newFrameBehavior != defaultNfb ) { + const char* value = "none"; + if ( m_newFrameBehavior == Reconnect ) + value = "followup"; diff --git a/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp b/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp new file mode 100644 index 000000000000..b37beb57d1e6 --- /dev/null +++ b/editors/calligra/files/patch-lib_kotext-KoParagDia.cpp @@ -0,0 +1,44 @@ +--- 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.3-koffice-CAN-2005-3193 b/editors/calligra/files/patch-post-1.3-koffice-CAN-2005-3193 deleted file mode 100644 index 69cb714d18af..000000000000 --- a/editors/calligra/files/patch-post-1.3-koffice-CAN-2005-3193 +++ /dev/null @@ -1,92 +0,0 @@ -Index: filters/kword/pdf/xpdf/xpdf/Stream.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 485850) -+++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 486431) -@@ -404,18 +404,33 @@ void ImageStream::skipLine() { - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { -+ int totalBits; -+ - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ totalBits = nVals * nBits; -+ if ( totalBits == 0 || -+ (totalBits / nBits) / nComps != width || -+ totalBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; -- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ rowBytes = ((totalBits + 7) >> 3) + pixBytes; -+ if (rowBytes < 0) -+ return; -+ - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -@@ -982,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -@@ -2861,6 +2880,10 @@ GBool DCTStream::readBaselineSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -3179,6 +3202,10 @@ FlateStream::FlateStream(Stream *strA, i - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -Index: filters/kword/pdf/xpdf/xpdf/Stream.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Stream.h (revision 485850) -+++ filters/kword/pdf/xpdf/xpdf/Stream.h (revision 486431) -@@ -227,6 +227,7 @@ public: - - int lookChar(); - int getChar(); -+ GBool isOk() { return ok; } - - private: - -@@ -242,6 +243,7 @@ private: - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ |