configure.ac | 2 +-
l10ntools/inc/tokens.h | 2 +-
l10ntools/source/export.cxx | 2 +-
l10ntools/source/srclex.l | 4 ++--
sal/osl/all/log.cxx | 27 +++++++++++++++------------
sal/qa/osl/file/osl_File.cxx | 2 +-
6 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit 100c2a51604a1bde45062426fb4a05c0502142d5
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 29 21:18:37 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 21:20:09 2020 +0100
Release 5.4.13
Change-Id: Ib459674dc1970636ab0050401bda915b7b3c0e4c
diff --git a/configure.ac b/configure.ac
index 9f2d8bb17402..83ac32bdd8b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.12.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.13.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 28cca6737cdc83e50023181aa8328e225e46e886
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 29 21:19:24 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 21:20:09 2020 +0100
Fix build with recent WIN SDK
TEXT was already defined somewhere
Change-Id: If78ed6fd2c7d7d75a977ca531b8fbb399ec0b5dd
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 95370cf70a7e..6d0d15d72e5e 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -42,7 +42,7 @@
#define SMALRESOURCE 505 /* PageItem { */
#define TEXTLINE 506 /* TEXT = "hhh" */
#define LONGTEXTLINE 507 /* TEXT = "hhh" TEST "HHH" ... */
-#define TEXT 508 /* "Something like this" */
+#define _TEXT 508 /* "Something like this" */
#define LEVELUP 509 /* { */
#define LEVELDOWN 510 /* }; */
#define APPFONTMAPPING 511 /* MAP_APPFONT(10,10) */
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index b4995ca04fb5..8c6a21b8a8b9 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -557,7 +557,7 @@ void Export::Execute( int nToken, const char * pToken )
}
}
break;
- case TEXT:
+ case _TEXT:
case LISTTEXT_:
case LISTTEXT: {
// this is an entry for a List
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 8fbb58361319..894807271e66 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -135,8 +135,8 @@ void YYWarning();
}
\".*\" {
-/* TEXT // "A Text" */
- WorkOnTokenSet( TEXT, yytext );
+/* _TEXT // "A Text" */
+ WorkOnTokenSet( _TEXT, yytext );
}
"{"[ \t]*\\? {
commit a3e9cd54b3ee4658cc0429c8858beea86035616a
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Jun 5 14:23:08 2018 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 20:33:36 2020 +0100
sal: WNT -> _WIN32
Still some holdouts from that bad old habit it seems.
Reviewed-on: https://gerrit.libreoffice.org/55331
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 92ed91610d30246e671226da081da748f6b16aae)
Change-Id: Ib0fe2c7eb006649b121668c549ff8e0bb060e120
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 0fa1a75cd54e..b9d54fb200f2 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -31,7 +31,7 @@
#if defined ANDROID
#include <android/log.h>
-#elif defined WNT
+#elif defined _WIN32
#include <process.h>
#include <windows.h>
#define OSL_DETAIL_GETPID _getpid()
@@ -100,7 +100,7 @@ char const * getEnvironmentVariable(const char* env) {
return p2;
}
-#ifdef WNT
+#ifdef _WIN32
# define INI_STRINGBUF_SIZE 1024
bool getValueFromLoggingIniFile(const char* key, char* value) {
@@ -143,7 +143,7 @@ char const * getLogLevel() {
if (env != nullptr)
return env;
-#ifdef WNT
+#ifdef _WIN32
static char logLevel[INI_STRINGBUF_SIZE];
if (getValueFromLoggingIniFile("LogLevel", logLevel))
return logLevel;
@@ -158,7 +158,7 @@ std::ofstream * getLogFile() {
if (!logFile)
{
-#ifdef WNT
+#ifdef _WIN32
static char logFilePath[INI_STRINGBUF_SIZE];
if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
logFile = logFilePath;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 4e635a1d559f..d62ae760ea12 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -5085,7 +5085,7 @@ namespace osl_Directory
rc != osl::FileBase::E_None
);
}
-#endif /* WNT */
+#endif /* _WIN32 */
CPPUNIT_TEST_SUITE(createPath);
CPPUNIT_TEST(with_relative_path);
commit a512b664187ff6bc3927b9866a483f70c1610cd3
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Mon Jun 4 13:41:22 2018 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 20:17:52 2020 +0100
sal: fix logfile path retrieval from logging.ini
Change-Id: I39803413533ae5b291d2e1abf4aa1bfe1f5900b5
Reviewed-on: https://gerrit.libreoffice.org/55268
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 423d01ec92a2c99ca8309a78f6763478e299f6a3)
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 9e5ce2021401..0fa1a75cd54e 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -155,14 +155,19 @@ char const * getLogLevel() {
std::ofstream * getLogFile() {
// First check the environment variable, then the setting in logging.ini
static char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
- if (!logFile)
- return nullptr;
+ if (!logFile)
+ {
#ifdef WNT
- static char logFilePath[INI_STRINGBUF_SIZE];
- if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
- logFile = logFilePath;
+ static char logFilePath[INI_STRINGBUF_SIZE];
+ if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
+ logFile = logFilePath;
+ else
+ return nullptr;
+#else
+ return nullptr;
#endif
+ }
// stays until process exits
static std::ofstream file(logFile, std::ios::app | std::ios::out);
commit c48462fa05ae70d03068ad280bc89d8c9f9a4560
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 2 11:11:37 2018 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 20:17:22 2020 +0100
Make SAL_LOG_FILE work on Windows also without logging.ini
...as used by solenv/gbuild/UITest.mk
Change-Id: Iefc1c1dc2f775c6872a5075a16e049f00d60273a
Reviewed-on: https://gerrit.libreoffice.org/50618
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit ca638eedc65a7f9ae99094a728696905ca95766d)
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index ef070bb53780..9e5ce2021401 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -162,8 +162,6 @@ std::ofstream * getLogFile() {
static char logFilePath[INI_STRINGBUF_SIZE];
if (getValueFromLoggingIniFile("LogFilePath", logFilePath))
logFile = logFilePath;
- else
- return nullptr;
#endif
// stays until process exits
commit 30f63b6e89c99bc3ea40e47e3e4663faa8764934
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 22 13:02:42 2018 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 20:17:06 2020 +0100
loplugin:nullptr (clang-cl)
Change-Id: Ie60f2cc7c3b0bcba7ddf2e7a0f6837c821b33dcc
Reviewed-on: https://gerrit.libreoffice.org/48313
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 5dd62512f520bbccfa864c6454c2c7c4b1462504)
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 18375da78a56..ef070bb53780 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -105,7 +105,7 @@ char const * getEnvironmentVariable(const char* env) {
bool getValueFromLoggingIniFile(const char* key, char* value) {
char buffer[MAX_PATH];
- GetModuleFileName(NULL, buffer, MAX_PATH);
+ GetModuleFileName(nullptr, buffer, MAX_PATH);
std::string sProgramDirectory = std::string(buffer);
std::string::size_type pos = sProgramDirectory.find_last_of( "\\/" );
sProgramDirectory = sProgramDirectory.substr(0, pos+1);
commit 694f3eba8d59ddea45e4f80cdc3ec53e67474efc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 19 09:39:01 2018 +0000
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 29 20:16:43 2020 +0100
coverity#1427647 acknowledge Resource leak is deliberate
Change-Id: I9d4beccfa7ca8953360d67d08a3b2f04d2ccfed9
Reviewed-on: https://gerrit.libreoffice.org/48178
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 4d27776a8c570ae4fc525c78ecd135c30dc7ae49)
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index a21d3d7b0833..18375da78a56 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -154,7 +154,7 @@ char const * getLogLevel() {
std::ofstream * getLogFile() {
// First check the environment variable, then the setting in logging.ini
- char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
+ static char const * logFile = getEnvironmentVariable("SAL_LOG_FILE");
if (!logFile)
return nullptr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
