Rebased ref, commits from common ancestor:
commit 670a778c68db9ea5585088a5674e8e56c24bd44f
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Sat Nov 21 21:04:41 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Nov 23 08:51:01 2020 +0100
Fix Windows build
Change-Id: Iddc6a40743fde3142c121b2b2dfafb3f12753977
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 91a0283f0b4e..3e93a8ca32ae 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -7,6 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifdef _WIN32
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
+
#include <sal/main.h>
#include <osl/file.hxx>
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 44b66a89b846..5f053ec5d319 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -283,7 +283,9 @@ static rtl_uString ** osl_createCommandArgs_Impl (int &
argc, char **)
/* Ensure absolute path */
::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH );
DWORD dwResult
- = GetModuleFileNameW(nullptr, o3tl::toW(aBuffer),
aBuffer.getBufSizeInSymbols());
+ = GetModuleFileNameW(nullptr,
+ reinterpret_cast<wchar_t
*>(static_cast<sal_Unicode*>(aBuffer)),
+ aBuffer.getBufSizeInSymbols());
if ((0 < dwResult) && (dwResult < aBuffer.getBufSizeInSymbols()))
{
/* Replace argv[0] with it's absolute path */
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 6f3b0d578323..e265788d0d52 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -321,7 +321,7 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, getSystemPathFromFileURL <"
+ aCommand
+ "> failed with " + OUString::number(e1)),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
for (int i = 0;; ++i) {
SHFILEINFOW info;
@@ -330,14 +330,16 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
!= 0)
{
throw css::lang::IllegalArgumentException(
- "XSystemShellExecute.execute, cannot process <" +
aCommand + ">", {}, 0);
+ "XSystemShellExecute.execute, cannot process <" +
aCommand + ">",
+ static_cast< XSystemShellExecute* >( this ), 0);
}
if (SHGetFileInfoW(
pathname.getStr(), 0, &info, sizeof info,
SHGFI_ATTRIBUTES)
== 0)
{
throw css::lang::IllegalArgumentException(
- "XSystemShellExecute.execute, SHGetFileInfoW(" +
pathname + ") failed", {},
+ "XSystemShellExecute.execute, SHGetFileInfoW(" +
pathname + ") failed",
+ static_cast< XSystemShellExecute* >( this ),
0);
}
if ((info.dwAttributes & SFGAO_LINK) == 0) {
@@ -351,7 +353,7 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, CoCreateInstance failed
with "
+ OUString::number(e2)),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
sal::systools::COMReference<IPersistFile> file;
try {
@@ -360,21 +362,21 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, QueryInterface failed
with: "
+ o3tl::runtimeToOUString(e3.what())),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
e2 = file->Load(pathname.getStr(), STGM_READ);
if (FAILED(e2)) {
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, IPersistFile.Load
failed with "
+ OUString::number(e2)),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
e2 = link->Resolve(nullptr, SLR_UPDATE | SLR_NO_UI);
if (FAILED(e2)) {
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, IShellLink.Resolve
failed with "
+ OUString::number(e2)),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
wchar_t path[MAX_PATH];
WIN32_FIND_DATAW wfd;
@@ -383,14 +385,14 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, IShellLink.GetPath
failed with "
+ OUString::number(e2)),
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
pathname = path;
// Fail at some arbitrary nesting depth, to avoid an infinite
loop:
if (i == 30) {
throw css::lang::IllegalArgumentException(
"XSystemShellExecute.execute, link depth exceeded for
<" + aCommand + ">",
- {}, 0);
+ static_cast< XSystemShellExecute* >( this ), 0);
}
}
auto const n = pathname.lastIndexOf('.');
@@ -406,7 +408,8 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
ext,
".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY")))
{
throw css::lang::IllegalArgumentException(
- "XSystemShellExecute.execute, cannot process <" +
aCommand + ">", {}, 0);
+ "XSystemShellExecute.execute, cannot process <" +
aCommand + ">",
+ static_cast< XSystemShellExecute* >( this ), 0);
}
}
}
commit 30c7c11ae349bede6003e7dd2a191a1105c99b75
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Fri Nov 20 23:40:52 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Nov 23 08:51:01 2020 +0100
Make writerfilter codegen work with newer libxslt
This code was otherwise sometimes writing only whitespace for the
shift operand, rendering the statement invalid.
Change-Id: I70644a00fc038f56315bc0cd19efb26d71f24acd
diff --git a/writerfilter/source/doctok/resources.xsl
b/writerfilter/source/doctok/resources.xsl
index 204b2c7ed366..5b3260fe339d 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -522,7 +522,7 @@ class </xsl:text>
<xsl:value-of select="$mask"/>
</xsl:if>
<xsl:text>)</xsl:text>
- <xsl:if test="$shift>0">
+ <xsl:if test="string-length($shift)>0 and $shift>0">
<xsl:text>>> </xsl:text>
<xsl:value-of select="$shift"/>
</xsl:if>
commit a171a3b956c660582b6c52a8ddd026283cc32335
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Oct 6 09:37:35 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Nov 23 08:51:01 2020 +0100
Use repacked libxml2 to work with older tar version
Change-Id: Iaef042e651a84557b62d9de07f9d5f2fff693251
diff --git a/download.lst b/download.lst
index c5551a044cde..40688ae15f6c 100644
--- a/download.lst
+++ b/download.lst
@@ -96,9 +96,9 @@ export LIBXMLSEC_TARBALL :=
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.
export LIBXSLT_MD5SUM := db8765c8d076f1b6caafd9f2542a304a
export LIBXSLT_VERSION_MICRO := 34
export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
-export LIBXML_MD5SUM := 10942a1dc23137a8aa07f0639cbfece5
+export LIBXML_MD5SUM := 52f4a18bcdbb167b0dd33c21c4c2094a
export LIBXML_VERSION_MICRO := 10
-export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
+export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO)_repack.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL :=
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
