[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions/source sc/source solenv/gbuild solenv/inc svtools/source

[Matthias Seidel]

 extensions/source/update/check/updatecheckconfig.hxx |    4 ++--
 sc/source/ui/miscdlgs/retypepassdlg.src              |    2 +-
 solenv/gbuild/platform/freebsd.mk                    |    7 +++++++
 solenv/inc/unxfbsd.mk                                |    7 ++++++-
 svtools/source/java/javaerror.src                    |    2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 2549527d994cd3747a35ca51781f5fb79bb5b9c6
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sun Apr 22 00:00:24 2018 +0000

    Fixed typos, removed whitespace

diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index 27262b2cb0cc..b5b311ada4da 100755
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -80,8 +80,8 @@ private:
 
 
 /* This class implements the non published UNO service com.sun.star.setup.UpdateCheckConfig,
- * which primary use is to be able to track changes done in the Toos -> Options page of this
- * component, as this is not supported by the OOo configuration for extendable groups.
+ * which primary use is to be able to track changes done in the Tools -> Options page of this
+ * component, as this is not supported by the AOO configuration for extendable groups.
  */
 
 class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index daba4b3ede34..9717acaca5b4 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -58,7 +58,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
 
         WordBreak = TRUE ;
 
-        Text [ en-US ] = "The document you are about to export has one or more protected items with password that cannot be exported.  Please re-type your password to be able to export your document." ;
+        Text [ en-US ] = "The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document." ;
     };
 
     FixedLine FL_DOCUMENT
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index ec24338661f0..3a2a118ab522 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -48,7 +48,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED
 {
     Buttons = WB_OK;
     DefButton = WB_DEF_OK ;
-    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select  it under Tools - Options - %PRODUCTNAME - Java.";
+    Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java.";
 };
 
 ErrorBox ERRORBOX_RESTARTREQUIRED
commit 00df62bded7abff051b3defcc56ad0731693c8cd
Author: Don Lewis <truckman at apache.org>
Date:   Sat Apr 21 23:17:08 2018 +0000

    Unbreak build on FreeBSD with clang 6.0 and newer.  Clang 6 changed
    
    the its default C++ standard from C++98 to C++14 and our old code
    is not prepared for that.  Avoid the problem by adding the -std=gnu++98
    compiler flag.
    
    Add the -fstack-protector compiler flag on FreeBSD INTEL and X86_64.

diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 5f4bc943186e..0148fc23fe57 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -92,6 +92,7 @@ gb_CXXFLAGS := \
 	-fno-use-cxa-atexit \
 	-fvisibility-inlines-hidden \
 	-fvisibility=hidden \
+	-std=gnu++98 \
 	-pipe
 ifeq ($(COM),CLANG)
 gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH
@@ -142,6 +143,12 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
+ifneq ($(filter $(CPUNAME),INTEL X86_64),)
+gb_CFLAGS += -fstack-protector
+gb_CXXFLAGS += -fstack-protector
+gb_LinkTarget_LDFLAGS += -fstack-protector
+endif
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 gb_COMPILEROPT1FLAGS := -O0
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index baa01f5ba4bb..92db30a813d4 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -105,11 +105,16 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
 # -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS) 
+CFLAGSCXX= -pipe $(ARCH_FLAGS) -std=gnu++98
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 CFLAGSCXX += -fvisibility-inlines-hidden
 .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 
+.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64"
+CFLAGSCC += -fstack-protector
+CFLAGSCXX += -fstack-protector
+.ENDIF
+
 # Compiler flags for compiling static object in multi threaded environment with graphical user interface
 CFLAGSOBJGUIMT=
 # Compiler flags for compiling static object in multi threaded environment with character user interface