[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-3-10-gae70437
The following commit has been merged in the master branch:
commit ae70437147392ed752feb474b7d84d15f8486795
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 10 17:31:50 2012 +0200
make-shortcuts-in-menus-localized-again.diff: remove unneeded include breaking the build
diff --git a/patches/make-shortcuts-in-menus-localized-again.diff b/patches/make-shortcuts-in-menus-localized-again.diff
index 1c46262..7a7752c 100644
--- a/patches/make-shortcuts-in-menus-localized-again.diff
+++ b/patches/make-shortcuts-in-menus-localized-again.diff
@@ -349,11 +349,10 @@ diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 33f94b2..e2b05e2 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
-@@ -70,6 +70,9 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
+@@ -70,6 +70,8 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
#include <tools/postx.h>
-+#include <svtools/langhelp.hxx>
+#include <vcl/svapp.hxx>
+
#include <unx/salunx.h>
--
LibreOffice packaging repository
Reply to: