/[gentoo-x86]/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Apr 26 11:53:14 2012 UTC (2 years, 4 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stable on ppc wrt bug#411449. Cleanup.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 From 14dfa9de27ddab9bb0bbe64e6c0a4b5e4caab742 Mon Sep 17 00:00:00 2001
2 From: David Tardon <dtardon@redhat.com>
3 Date: Thu, 8 Mar 2012 14:15:09 +0100
4 Subject: [PATCH] yet another clash with macro name
5
6 Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
7 ---
8 fpicker/source/unx/kde4/KDE4FilePicker.cxx | 4 ++++
9 1 files changed, 4 insertions(+), 0 deletions(-)
10
11 diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
12 index 69be3b1..9c3ded3 100644
13 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
14 +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
15 @@ -60,6 +60,8 @@
16 #undef SETTINGS_MOUSE
17 #define LO_SETTINGS_LOCALE SETTINGS_LOCALE
18 #undef SETTINGS_LOCALE
19 +#define LO_SETTINGS_STYLE SETTINGS_STYLE
20 +#undef SETTINGS_STYLE
21
22 #include <kfiledialog.h>
23 #include <kwindowsystem.h>
24 @@ -77,6 +79,8 @@
25 #undef LO_SETTINGS_MOUSE
26 #define SETTINGS_LOCALE LO_SETTINGS_LOCALE
27 #undef LO_SETTINGS_LOCALE
28 +#define SETTINGS_STYLE LO_SETTINGS_STYLE
29 +#undef LO_SETTINGS_STYLE
30
31 using namespace ::com::sun::star;
32
33 --
34 1.7.3.4

  ViewVC Help
Powered by ViewVC 1.1.20