solenv/bin/macosx-codesign-app-bundle | 10 ++++++----
svx/source/unodraw/unoshape.cxx | 5 ++++-
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 0e630b825184fc19a83778b8c130c2be1a068d8e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 23 09:14:52 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 23 13:00:39 2020 +0100
dynamic_cast followed by static_cast
Change-Id: I3f121c2981c3dbec237b11babc91af80309ec356
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106400
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b60c6e686aea..dca42fc19dce 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2615,7 +2615,10 @@ bool SvxShape::getPropertyValueImpl( const OUString&,
const SfxItemPropertySimpl
case OWN_ATTR_ISFONTWORK:
{
- rValue <<= dynamic_cast<const SdrTextObj*>(GetSdrObject()) != nullptr
&& static_cast<SdrTextObj*>(GetSdrObject())->IsFontwork();
+ bool bIsFontwork = false;
+ if (const SdrTextObj* pTextObj = dynamic_cast<const
SdrTextObj*>(GetSdrObject()))
+ bIsFontwork = pTextObj->IsFontwork();
+ rValue <<= bIsFontwork;
break;
}
commit 25460b7fd4fa35717c431c1968f873b61fc901a6
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Nov 20 01:02:02 2020 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Nov 23 13:00:21 2020 +0100
Check first if there is such a "bin" directory before attempting to use it
In the test-install target in Makefile.in we remove the "bin" folder
of the LibreOfficePython framework.
Change-Id: Idf3d440c4f9465f21b5dcae60d4fc5ac21965dd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106284
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106398
Tested-by: Jenkins
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 2353032e3a8a..8aa725745327 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -99,10 +99,12 @@ while read framework; do
if test ! -L "$version" -a -d "$version"; then
# Assume the framework has a XML (and not binary) Info.plist
id=`grep -A 1 '<key>CFBundleIdentifier</key>'
$version/Resources/Info.plist | tail -1 | sed -e 's,.*<string>,,' -e
's,</string>.*,,'`
- # files in bin are not covered by signing the framework...
- for scriptorexecutable in $(find $version/bin/ -type f); do
- codesign --verbose --options=runtime --force --identifier=$id
--sign "$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable" >>
"/tmp/codesign_${fn}.log" 2>&1
- done
+ if test -d $version/bin; then
+ # files in bin are not covered by signing the framework...
+ for scriptorexecutable in $(find $version/bin/ -type f); do
+ codesign --verbose --options=runtime --force
--identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable" >>
"/tmp/codesign_${fn}.log" 2>&1
+ done
+ fi
codesign --verbose --force --identifier=$id --sign
"$MACOSX_CODESIGNING_IDENTITY" "$version" >> "/tmp/codesign_${fn}.log" 2>&1
if [ "$?" != "0" ] ; then
exit 1
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
