solenv/gbuild/platform/macosx.mk | 1 - solenv/inc/unxmacx.mk | 2 +- svx/inc/svx/svxitems.hrc | 3 --- svx/source/items/svxitems.src | 5 ----- 4 files changed, 1 insertion(+), 10 deletions(-)
New commits: commit 742ce8b35e67a6b6bdfd2e784ea5abcdfd054085 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri Apr 12 08:49:47 2013 +0000 121788: - remove duplicate resource introduced by accident diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index f001e41..d6f035c 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -70,9 +70,6 @@ #define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) #define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) -// enum ColorName ----------------------------------------------------------- -#define RID_SVXITEMS_COLOR_WHITE (RID_SVXITEMS_START + 76) - // enum FontFamily ------------------------------------------------------- #define RID_SVXITEMS_FONTFAMILY_BEGIN (RID_SVXITEMS_START + 100) #define RID_SVXITEMS_FONTFAMILY_DONTKNOW (RID_SVXITEMS_START + 100) diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index fc7c236..cf064cd 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -211,11 +211,6 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP { Text [ en-US ] = "Image" ; }; -// enum ColorName ----------------------------------------------------------- -String RID_SVXITEMS_COLOR_WHITE -{ - Text [ en-US ] = "White" ; -}; // end enum ColorName ----------------------------------------------------------- String RID_SVXITEMS_HORJUST_STANDARD { commit 5255f9f08d68f4d8702f026dc1d2a840de62d627 Author: Herbert Dürr <h...@apache.org> Date: Fri Apr 12 08:22:42 2013 +0000 stop using Mac specific compiler option "Wno-long-double" having this option results in a warning for each compile on gcc>=4.2 or clang. Apple says in http://lists.cs.uiuc.edu/pipermail/llvmdev/2008-June/015095.html "[...] the best thing is not to use it. There is no reason to." diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 4cfeeb9..7f6ce10 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -90,7 +90,6 @@ gb_CXXFLAGS := \ -Wendif-labels \ -Wextra \ -Wno-ctor-dtor-privacy \ - -Wno-long-double \ -Wno-non-virtual-dtor \ -fPIC \ -fmessage-length=0 \ diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 9a41eb3..007f24a 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -111,7 +111,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # Normal C++ compilation flags -CFLAGSCXX=-pipe -malign-natural -fsigned-char -Wno-long-double $(ARCH_FLAGS) +CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS) CFLAGSCXX+= -Wno-ctor-dtor-privacy PICSWITCH:=-fPIC
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits