[Libreoffice-commits] core.git: 2 commits - filter/source include/tools include/ucbhelper include/unotools include/vcl sal/osl
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 12 19:35:39 UTC 2019
filter/source/xslt/import/spreadsheetml/adorowset2ods.xsl | 8 ++++----
include/tools/urlobj.hxx | 2 +-
include/ucbhelper/resultsetmetadata.hxx | 4 ++--
include/unotools/accessiblestatesethelper.hxx | 2 +-
include/unotools/confignode.hxx | 4 ++--
include/unotools/mediadescriptor.hxx | 2 +-
include/unotools/wincodepage.hxx | 2 +-
include/vcl/fmtfield.hxx | 2 +-
sal/osl/unx/process.cxx | 3 +--
9 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 7a7b6bc25c36569397affc3034ceef75b75da127
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 12 17:09:18 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Aug 12 21:34:38 2019 +0200
Avoid non-async-signal-safe functionality between fork and exec
This is a partial revert of 17642437fe0d68cf868ab430f04b4fdc12f1767f "reduce
ifdef forest". The original code used unsetenv only for certain platforms, and
putenv for others, but code a few lines further down uses unsetenv
unconditionally, so assume that it is safe to use on all relevant platforms
these days.
unsetenv isn't listed as async-signal-safe at <http://pubs.opengroup.org/
onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04_03> "Signal Actions"
(but is already used a few lines further down, also between fork and exec), but
at least we get rid of the memory management involved in the OUString instance.
Change-Id: Iac993db8819d40a0841c455ed04ff9ca2ee2e4eb
Reviewed-on: https://gerrit.libreoffice.org/77368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index c1556c9f0ede..1e3c7d372d69 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -177,8 +177,7 @@ static void ChildStatusProc(void *pData)
if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
SAL_WARN("sal.osl", "Failed to change uid and guid: " << UnixErrnoString(errno));
- const OUString envVar("HOME");
- osl_clearEnvironment(envVar.pData);
+ unsetenv("HOME");
}
if (data.m_pszDir)
commit b0bcd587fba71c34adb85dc5d1b2417104f02748
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Aug 11 19:56:39 2019 +0200
Commit: Andrea Gelmini <andrea.gelmini at gelma.net>
CommitDate: Mon Aug 12 21:34:31 2019 +0200
Fix typos
Change-Id: Id20e239b8a5a2dababe9284dc30d4d155ffecfc5
Reviewed-on: https://gerrit.libreoffice.org/77322
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/filter/source/xslt/import/spreadsheetml/adorowset2ods.xsl b/filter/source/xslt/import/spreadsheetml/adorowset2ods.xsl
index 727dd1df150a..0d36494d27d3 100644
--- a/filter/source/xslt/import/spreadsheetml/adorowset2ods.xsl
+++ b/filter/source/xslt/import/spreadsheetml/adorowset2ods.xsl
@@ -151,7 +151,7 @@
<xsl:otherwise>string</xsl:otherwise>
</xsl:choose>
</xsl:template>
- <!-- An utility to convert a column number (e.g. 27; 1-based) to column name (like AA) -->
+ <!-- A utility to convert a column number (e.g. 27; 1-based) to column name (like AA) -->
<xsl:template name="ColNum2Name">
<xsl:param name="num"/>
<xsl:if test="$num > 0">
@@ -188,7 +188,7 @@
</xsl:choose>
</xsl:if>
</xsl:template>
- <!-- An utility to convert a cell address (e.g. row 2, column 27) to cell name (like AA2) -->
+ <!-- A utility to convert a cell address (e.g. row 2, column 27) to cell name (like AA2) -->
<xsl:template name="CellName">
<xsl:param name="rowNum"/>
<xsl:param name="colNum"/>
@@ -197,7 +197,7 @@
</xsl:call-template>
<xsl:value-of select="$rowNum"/>
</xsl:template>
- <!-- An utility to convert a range given in terms of numbers (e.g. row 1, column 1 to row 2, column 27) to range name (like A1:AA2) -->
+ <!-- A utility to convert a range given in terms of numbers (e.g. row 1, column 1 to row 2, column 27) to range name (like A1:AA2) -->
<xsl:template name="RangeName">
<xsl:param name="rowStartNum"/>
<xsl:param name="colStartNum"/>
@@ -213,4 +213,4 @@
<xsl:with-param name="colNum" select="$colEndNum"/>
</xsl:call-template>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index eb3b961c204b..869b79e94cc4 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -398,7 +398,7 @@ public:
*/
static OUString GetScheme(INetProtocol eTheScheme);
- /** Return the a human-readable name for a given scheme.
+ /** Return the human-readable name for a given scheme.
@param eTheScheme One of the supported URL schemes.
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 3a11d8f99468..5842ee1e56d1 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -313,7 +313,7 @@ public:
*
* @param column is the number of the column for that a value shall
* be returned. The first column is 1, the second is 2, ...
- * @return true, if the column is definetely not writable.
+ * @return true, if the column is definitely not writable.
*/
virtual sal_Bool SAL_CALL
isReadOnly( sal_Int32 column ) override;
@@ -331,7 +331,7 @@ public:
*
* @param column is the number of the column for that a value shall
* be returned. The first column is 1, the second is 2, ...
- * @return true, if a write on the column will definetely succeed.
+ * @return true, if a write on the column will definitely succeed.
*/
virtual sal_Bool SAL_CALL
isDefinitelyWritable( sal_Int32 column ) override;
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 1e6ae7bc0c56..0093e618a0af 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -125,7 +125,7 @@ public:
virtual css::uno::Sequence< css::uno::Type> SAL_CALL
getTypes() override;
- /** Returns a implementation id.
+ /** Returns an implementation id.
*/
virtual css::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId() override;
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index bde22e9ff04b..2f223b8998c9 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -174,7 +174,7 @@ namespace utl
//= OConfigurationTreeRoot
- /** a specialized version of a OConfigurationNode, representing the root
+ /** a specialized version of an OConfigurationNode, representing the root
of a configuration sub tree<p/>
Only this class is able to commit any changes made any any OConfigurationNode
objects.
@@ -253,7 +253,7 @@ namespace utl
/** tolerant version of the <member>createWithServiceFactory</member>
- <p>No assertions are thrown in case of an failure to initialize the configuration service, but once
+ <p>No assertions are thrown in case of a failure to initialize the configuration service, but once
the configuration could be initialized, errors in the creation of the specific node (e.g. because the
given node path does not exist) are still asserted.</p>
*/
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index b568bd770f3a..6a826ce309ac 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -39,7 +39,7 @@ namespace utl {
/** @short can be used to work with a css::document::MediaDescriptor
struct.
- @descr It wraps a unordered_map around the Sequence< css::beans::PropertyValue >, which
+ @descr It wraps an unordered_map around the Sequence< css::beans::PropertyValue >, which
represent the MediaDescriptor item.
Further this helper defines often used functions (as e.g. open of the required streams,
consistent checks etcpp.) and it defines all usable property names.
diff --git a/include/unotools/wincodepage.hxx b/include/unotools/wincodepage.hxx
index f106a0f1760f..f3a6aee97ad3 100644
--- a/include/unotools/wincodepage.hxx
+++ b/include/unotools/wincodepage.hxx
@@ -13,7 +13,7 @@
#include <unotools/unotoolsdllapi.h>
#include <rtl/textenc.h>
-/** Map from a ISO-639 language code (and optionally ISO-3166 country/region code)
+/** Map from an ISO-639 language code (and optionally ISO-3166 country/region code)
to a text encoding of corresponding Windows ANSI or OEM codepage.
@param pLanguage
diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index 287146a62e6f..c2c3bb7d619b 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -120,7 +120,7 @@ public:
bool IsEmptyFieldEnabled() const { return m_bEnableEmptyField; }
void EnableEmptyField(bool bEnable);
- // If disabled, the value will be resetted to the last valid value on leave
+ // If disabled, the value will be reset to the last valid value on leave
void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_ValueState = valueDirty; }
// If the current String is invalid, GetValue() returns this value
More information about the Libreoffice-commits
mailing list