diff options
Diffstat (limited to 'editors/koffice-kde4/files')
4 files changed, 0 insertions, 111 deletions
diff --git a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp deleted file mode 100644 index 68068710b7c0..000000000000 --- a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- kexi/main/keximainwindowimpl.cpp.orig Thu Jun 30 17:28:58 2005 -+++ kexi/main/keximainwindowimpl.cpp Thu Jun 30 17:29:14 2005 -@@ -106,8 +106,8 @@ - //#define PROPEDITOR_VISIBILITY_CHANGES - - //temporary fix to manage layout --#include "ksplitter.h" --#define KDOCKWIDGET_P 1 -+// #include "ksplitter.h" -+// #define KDOCKWIDGET_P 1 - - //#ifndef KEXI_NO_MIGRATION - //#include "migration/importwizard.h" diff --git a/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/editors/koffice-kde4/files/patch-krita_core_tiles-kis-tilemanager.cc b/editors/koffice-kde4/files/patch-krita_core_tiles-kis-tilemanager.cc deleted file mode 100644 index 05286a6e7915..000000000000 --- a/editors/koffice-kde4/files/patch-krita_core_tiles-kis-tilemanager.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/koffice-kde4/files/patch-kword-KWFrame.cpp b/editors/koffice-kde4/files/patch-kword-KWFrame.cpp deleted file mode 100644 index e8d8faccd72c..000000000000 --- a/editors/koffice-kde4/files/patch-kword-KWFrame.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- 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"; |