summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-20 03:08:02 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-20 03:08:02 -0500
commit1a436852966432ac4be3d4890b3f46c9584d7892 (patch)
tree8a2a1e945d0806b67dfc21cffcac556b2316108e
parent9627687cd24ee26ac6f614207a312cfbb73c8f6d (diff)
downloadtde-1a436852966432ac4be3d4890b3f46c9584d7892.tar.gz
tde-1a436852966432ac4be3d4890b3f46c9584d7892.zip
Fix TDE filepickers in OpenOffice
-rw-r--r--main/thirdparty/libreoffice/3.3.2/patches/NOTES3
-rw-r--r--main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff2
2 files changed, 4 insertions, 1 deletions
diff --git a/main/thirdparty/libreoffice/3.3.2/patches/NOTES b/main/thirdparty/libreoffice/3.3.2/patches/NOTES
new file mode 100644
index 000000000..15a4f25d6
--- /dev/null
+++ b/main/thirdparty/libreoffice/3.3.2/patches/NOTES
@@ -0,0 +1,3 @@
+This patchset is intended for Debian and has not been tested on other systems, however the patch libreoffice-trinity.diff should apply cleanly to a stock LibreOffice source tree and function properly if enabled.
+
+After patch application, you will need to rerun autoconf from within the libreoffice-build directory in order to apply the changes made to configure.in
diff --git a/main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff
index 7431c4c29..812e4b0ee 100644
--- a/main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff
+++ b/main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff
@@ -10604,7 +10604,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++#endif
++
++ // The executable name
-++ const char *pFname = "tdefilepicker";
+++ char pFname[1024]; snprintf(pFname, sizeof pFname, "%s/%s", getenv("OLDPWD"), "tdefilepicker");
++
++ // ID of the main window
++ const int nIdLen = 20;