subject:"\[Libreoffice\-commits\] core.git\: solenv\/bin"

[Libreoffice-commits] core.git: solenv/bin

2023-11-10 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/scriptitems.pm |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 500def307635fc4359c542df60a963da23225b54
Author: Mike Kaganski 
AuthorDate: Fri Nov 10 18:05:41 2023 +0100
Commit: Mike Kaganski 
CommitDate: Fri Nov 10 21:37:32 2023 +0100

Improve error logging in remove_Files_Without_Sourcedirectory

Change-Id: I7ed7c08bd57bb5d1b11bc7c029decd571a6758f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159236
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 0c374054895d..54f3618d1078 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1132,8 +1132,7 @@ sub remove_Files_Without_Sourcedirectory
 my $infoline;
 
 my $error_occurred = 0;
-my @missingfiles = ();
-push(@missingfiles, "ERROR: The following files could not be found: \n");
+my $missingfiles = "The following files could not be found:\n";
 
 my @newfilesarray = ();
 
@@ -1152,7 +1151,7 @@ sub remove_Files_Without_Sourcedirectory
 $infoline = "ERROR: Removing file $filename from file list.\n";
 push( @installer::globals::logfileinfo, $infoline);
 
-push(@missingfiles, "ERROR: File not found: $filename\n");
+$missingfiles = "$missingfiles  $filename\n";
 $error_occurred = 1;
 
 next;   # removing this file from list, if sourcepath is empty
@@ -1164,7 +1163,7 @@ sub remove_Files_Without_Sourcedirectory
 $infoline = "ERROR: Removing file $filename from file 
list.\n";
 push( @installer::globals::logfileinfo, $infoline);
 
-push(@missingfiles, "ERROR: File not found: $filename\n");
+$missingfiles = "$missingfiles  $filename\n";
 $error_occurred = 1;
 
 next;   # removing this file from list, if sourcepath is 
empty
@@ -1186,7 +1185,7 @@ sub remove_Files_Without_Sourcedirectory
 $infoline = "ERROR: Removing file $filename from file 
list.\n";
 push( @installer::globals::logfileinfo, $infoline);
 
-push(@missingfiles, "ERROR: File not found: $filename\n");
+$missingfiles = "$missingfiles  $filename\n";
 $error_occurred = 1;
 
 next;   # removing this file from list, if sourcepath is 
empty
@@ -1211,8 +1210,7 @@ sub remove_Files_Without_Sourcedirectory
 
 if ( $error_occurred )
 {
-for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print 
"$missingfiles[$i]"; }
-installer::exiter::exit_program("ERROR: Missing files", 
"remove_Files_Without_Sourcedirectory");
+installer::exiter::exit_program($missingfiles, 
"remove_Files_Without_Sourcedirectory");
 }
 
 return \@newfilesarray;

[Libreoffice-commits] core.git: solenv/bin

2023-11-05 Thread Andrea Gelmini (via logerrit)

 solenv/bin/job-limiter.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24e1d6dbd27fa6c37723b55bbab5f5b5cce279f2
Author: Andrea Gelmini 
AuthorDate: Sun Nov 5 14:21:02 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Nov 5 17:51:48 2023 +0100

Fix typo

Change-Id: Ie41ca6c56bf44b04bd2d65b6cb64594d66295f24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158951
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/solenv/bin/job-limiter.cpp b/solenv/bin/job-limiter.cpp
index a94aafde9687..9111ead35127 100644
--- a/solenv/bin/job-limiter.cpp
+++ b/solenv/bin/job-limiter.cpp
@@ -87,7 +87,7 @@ int wmain(int argc, wchar_t* argv[])
 semaphore_handle = CreateSemaphoreW(NULL, 3, 4, semaphorename);
 // keep this process alive for other jobs to grab the semaphore, 
otherwise it is gone too
 // quickly and everything creates their own semaphore that immediately 
has enough slots,
-// completely bypassing the point of havig a limiter...
+// completely bypassing the point of having a limiter...
 Sleep(500);
 }
 if (semaphore_handle == NULL)

[Libreoffice-commits] core.git: solenv/bin

2023-11-05 Thread Andrea Gelmini (via logerrit)

 solenv/bin/job-limiter.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0053dfbabd8b6711ea7e9354e5792048931daf7c
Author: Andrea Gelmini 
AuthorDate: Sun Nov 5 14:20:42 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Nov 5 17:51:31 2023 +0100

Fix typo

Change-Id: I84186bee245a95a74e92c974ca94bb81c31ee1ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158950
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/solenv/bin/job-limiter.cpp b/solenv/bin/job-limiter.cpp
index c5757bfb4a27..a94aafde9687 100644
--- a/solenv/bin/job-limiter.cpp
+++ b/solenv/bin/job-limiter.cpp
@@ -12,7 +12,7 @@
 // Ideally it would hook into make's jobserver, but it is too easy to deadlock 
the build at the
 // packaging stage (all jobs are started at once, consuming all available 
slots as part of general
 // parallelism, and then each job waiting for an additional job token but 
since all jobs are in
-// waiting stage: you have a dealock)
+// waiting stage: you have a deadlock).
 // That in turn is an advantage for a simple approach with separate lock and 
release commands, since
 // everything is started at once, and all jobs that will be queued are all 
jobs that use the helper,
 // there will be jobs in waiting state and keeping the semaphore active as 
long as it matters.

[Libreoffice-commits] core.git: solenv/bin sysui/desktop

2023-11-02 Thread Christian Lohmaier (via logerrit)

 solenv/bin/macosx-codesign-app-bundle |6 +-
 sysui/desktop/macosx/sandbox_inherit.entitlements |   10 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit a2f298adf5b6aae54bd9c20a7fbfd007dd356617
Author: Christian Lohmaier 
AuthorDate: Thu Nov 2 10:30:34 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Nov 2 10:33:37 2023 +0100

tdf#158038 fix opening pdf files in appstore ver (sandbox issue w/ helper 
tool)


https://developer.apple.com/documentation/xcode/embedding-a-helper-tool-in-a-sandboxed-app

"Adding other entitlements to the tool can cause problems. If the tool
immediately crashes with a code signing error when your app runs the
tool, check that the tool is signed with just these two entitlements:
com.apple.security.app-sandbox and com.apple.security.inherit."

This is indeed what happened..

Change-Id: Id03948c03b7d453aae4ca58719f582576e30a16f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158790
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index cdbf7ce964ae..695b3ae97922 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -24,10 +24,13 @@ done
 
 APP_BUNDLE="$1"
 entitlements=
+entitlements_helper=
 application_identifier=
 if test -n "$ENABLE_MACOSX_SANDBOX"; then
 # In a sandboxed build executables need the entitlements
 entitlements="--entitlements $BUILDDIR/lo.xcent"
+# helper utilities must be signed with only the sandbox and inherit 
entitlements
+entitlements_helper="--entitlements 
$SRCDIR/sysui/desktop/macosx/sandbox_inherit.entitlements"
 application_identifier=`/usr/libexec/PlistBuddy -c "print 
com.apple.application-identifier"  $BUILDDIR/lo.xcent`
 # remove the key from the entitlement - only use it when signing the whole 
bundle in the final step
 /usr/libexec/PlistBuddy -c "delete com.apple.application-identifier"  
$BUILDDIR/lo.xcent
@@ -39,6 +42,7 @@ if test -n "$ENABLE_MACOSX_SANDBOX"; then
 else
 # We then want to sign data files, too, hmm.
 entitlements="--entitlements $BUILDDIR/hardened_runtime.xcent"
+entitlements_helper=$entitlements
 other_files="\
  -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
  -or -name '*.jar' -or -name 'LICENSE' -or -name 'LICENSE.html' \
@@ -127,7 +131,7 @@ while read file; do
;;
*)
id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-   codesign --force --timestamp --options=runtime 
--identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file" || exit 1
+   codesign --force --timestamp --options=runtime 
--identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements_helper "$file" || exit 1
;;
 esac
 done
diff --git a/sysui/desktop/macosx/sandbox_inherit.entitlements 
b/sysui/desktop/macosx/sandbox_inherit.entitlements
new file mode 100644
index ..794eada1cad3
--- /dev/null
+++ b/sysui/desktop/macosx/sandbox_inherit.entitlements
@@ -0,0 +1,10 @@
+
+http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+
+
+   com.apple.security.app-sandbox
+   
+   com.apple.security.inherit
+   
+
+

[Libreoffice-commits] core.git: solenv/bin

2023-09-28 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/epmfile.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb8c3bd992e44af4fec64aab9b707e89ca57dcb9
Author: Christian Lohmaier 
AuthorDate: Fri Aug 11 14:51:07 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Sep 28 16:50:11 2023 +0200

rpm packaging: don't add /usr/.build-id/* symlinks

the packages are meant to be fully relocatable, having that additional
dir makes that more tedious and the files don't add any benefit for
packages created via epm - they're meant to support parallel installable
debuginfo packages which are not provided by our way of packaging

Change-Id: I30284942846bae2f7030884cc15b02507e84e778
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155614
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 32104f551c9b..0b2caf1fff37 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2045,7 +2045,7 @@ sub create_packages_without_epm
 $installer::globals::rpminfologged = 1;
 }
 
-my $systemcall = "$rpmcommand -bb --define 
\"_unpackaged_files_terminate_build  0\" $specfilename --target $target 
$buildrootstring 2\>\&1 |";
+my $systemcall = "$rpmcommand -bb --define 
\"_unpackaged_files_terminate_build  0\" --define \"_build_id_links none\" 
$specfilename --target $target $buildrootstring 2\>\&1 |";
 
 installer::logger::print_message( "... $systemcall ...\n" );

[Libreoffice-commits] core.git: solenv/bin

2023-06-19 Thread Patrick Luby (via logerrit)

 solenv/bin/macosx-codesign-app-bundle |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b31c9722d1fce88b1511f741b152bccecffee1e1
Author: Patrick Luby 
AuthorDate: Mon Jun 19 10:15:02 2023 -0400
Commit: Patrick Luby 
CommitDate: Mon Jun 19 19:15:24 2023 +0200

Fix nightly build failures on Mac Intel

When adding entitlements in a debug, non-codesigned build, the
codesign command fails on some Mac Intel machines. Since this
command is only executed in non-release builds, ignore any
failures.

Change-Id: I4d89e03bbbc00725b2902446f2abbb99f273eab7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153269
Tested-by: Jenkins
Reviewed-by: Patrick Luby 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index eceb5dd6..cdbf7ce964ae 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -53,8 +53,9 @@ if test -z "$MACOSX_CODESIGNING_IDENTITY"; then
 
 # Skip codesigning for non-release builds if there is no identity set but
 # set entitlements to allow Xcode's Instruments application to connect to
-# the application
-codesign --force --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign - 
$entitlements "$APP_BUNDLE" || exit 1
+# the application. Note: the following command fails on some Mac Intel
+# machines, and since this not a release build, ignore any failures.
+codesign --force --identifier="${MACOSX_BUNDLE_IDENTIFIER}" --sign - 
$entitlements "$APP_BUNDLE"
 exit 0
 fi

[Libreoffice-commits] core.git: solenv/bin

2023-06-08 Thread Stephan Bergmann (via logerrit)

 solenv/bin/assemble-flatpak-appdata-step2.sh |   26 --
 solenv/bin/assemble-flatpak.sh   |4 +---
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit 48d09aa85e01d881995c660f845b60bd8088e7c0
Author: Stephan Bergmann 
AuthorDate: Thu Jun 8 13:08:14 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 8 19:49:28 2023 +0200

No longer append appdata for components to flatpak's metainfo

This had originally been added with


"clean up desktop integration", see its part "append the appdata for the
separate apps (Base, Draw, etc) to the appdata XML we export for Flatpak, so
they are visible in software centers etc".  But it now started to cause 
Flathub
builds (like ) to 
fail
its "Check for right id in AppStream xml" step, and reportedly "the problem 
is
there are multiple components in the metainfo file and I'm not sure it's
allowed"

().

The solution appears to be to just remove that again

():

> I think maybe the problem was from the times that GNOME Software was also
> moonlighting as a menu editor
> that without Flatpak providing the metainfo for LibreOffice's different
> desktop launchers, they were invisible in GNOME Software, which meant you
> couldn't add/remove them to menus or the desktop
> but since then GNOME just shows all of the launchers, and menu editing /
> categories mostly died or sank to the bottom of the 1990s ocean
> so maybe this is a non-problem
[...]
> ah ok
> ah so they don't show any more 🤣

So remove the now-unused solenv/bin/assemble-flatpak-appdata-step2.sh and
consequently rename the sole remaining
solenv/bin/assemble-flatpak-appdata-step1.sh to just
solenv/bin/assemble-flatpak-appdata.sh.

Change-Id: I3d3fef502f2114274a856102b77edafdd0ecac83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152744
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/assemble-flatpak-appdata-step2.sh 
b/solenv/bin/assemble-flatpak-appdata-step2.sh
deleted file mode 100755
index 4f06e6b19148..
--- a/solenv/bin/assemble-flatpak-appdata-step2.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/bash
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# Part of solenv/bin/assemble-flatpak.sh that is shared with a downstream 
mechanism of building a
-# Flatpak from a Fedora libreoffice.spec file.
-#
-# Arguments:
-# $1  pathname, ending in a slash, of the directory containing the source 
libreoffice-*.appdata.xml
-# files
-# $2  pathname, ending in a slash, of the directory containing the target
-# org.libreoffice.LibreOffice.appdata.xml file
-
-set -e
-
-# append the appdata for the different components
-for i in "${1?}"libreoffice-*.appdata.xml
-do
-  sed "1 d; s/libreoffice-/org.libreoffice.LibreOffice./" "$i" \
->>"${2?}"org.libreoffice.LibreOffice.appdata.xml
-done
diff --git a/solenv/bin/assemble-flatpak-appdata-step1.sh 
b/solenv/bin/assemble-flatpak-appdata.sh
similarity index 100%
rename from solenv/bin/assemble-flatpak-appdata-step1.sh
rename to solenv/bin/assemble-flatpak-appdata.sh
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 9991a0d0d71c..8d45da6cc1df 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -62,9 +62,7 @@ do
 done
 
 mkdir -p /app/share/appdata
-"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1
-"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/metainfo/ \
- /app/share/appdata/
+"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata.sh /app/share/appdata/ 1
 
 ## see  for further places where build-finish would

[Libreoffice-commits] core.git: solenv/bin

2023-03-24 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f8b40487cb02287f02ec93acb42f1442c9b4590
Author: Caolán McNamara 
AuthorDate: Fri Mar 24 16:15:33 2023 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 24 20:41:52 2023 +

ofz#57376 Fuzzing build failure

Change-Id: I03624956bebc7c6ce435482bc7cc5fc8b3fc31cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149547
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b8fa3634ab23..6dc5def61b1a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -307,7 +307,7 @@ core_constructor_list = [
 ("lingucomponent_MacSpellChecker_get_implementation", "#ifdef IOS"),
 # lingucomponent/source/spellcheck/languagetool/LanguageTool.component
 ("lingucomponent_LanguageToolGrammarChecker_get_implementation", "#if 
!ENABLE_FUZZERS"),
-"lingucomponent_NumberText_get_implementation",
+("lingucomponent_NumberText_get_implementation", "#if !ENABLE_FUZZERS"),
 # lingucomponent/source/thesaurus/libnth/lnth.component
 "lingucomponent_Thesaurus_get_implementation",
 "lingucomponent_SpellChecker_get_implementation",

[Libreoffice-commits] core.git: solenv/bin vcl/source

2023-02-12 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |2 +-
 vcl/source/treelist/transfer2.cxx |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 33ec31c24053a96f167d11c734d72ec960246e04
Author: Tor Lillqvist 
AuthorDate: Thu Apr 14 14:25:31 2022 +0300
Commit: Andras Timar 
CommitDate: Sun Feb 12 18:35:44 2023 +

Avoid LOKClipboard harder on iOS

Change-Id: I2710a7537594c486878a68c630f762a24ac81c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133017
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146739
(cherry picked from commit 069aae6be68d67b45222740de01467d11f15adfb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146800
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 660c5d65fd57..4928b146df93 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -128,7 +128,7 @@ core_constructor_list = [
 "com_sun_star_comp_dba_ODatabaseSource",
 "com_sun_star_comp_dba_ORowSet_get_implementation",
 # desktop/lokclipboard.component
-"desktop_LOKClipboard_get_implementation",
+("desktop_LOKClipboard_get_implementation", "#ifndef IOS"),
 # drawinglayer/drawinglayer.component
 "drawinglayer_XPrimitive2DRenderer",
 # embeddedobj/util/embobj.component
diff --git a/vcl/source/treelist/transfer2.cxx 
b/vcl/source/treelist/transfer2.cxx
index d0a105554c0f..05183b9c0485 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -484,11 +484,16 @@ Reference GetSystemClipboard()
 Reference xClipboard;
 try
 {
+#ifdef IOS
+if (false)
+;
+#else
 if (comphelper::LibreOfficeKit::isActive())
 {
 xClipboard = css::datatransfer::clipboard::LokClipboard::create(
 comphelper::getProcessComponentContext());
 }
+#endif
 else
 {
 xClipboard = css::datatransfer::clipboard::SystemClipboard::create(

[Libreoffice-commits] core.git: solenv/bin

2023-02-10 Thread Tor Lillqvist (via logerrit)

 solenv/bin/ooinstall |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cbac6b9d8f1319fffc66b397dfa20588e35c24fb
Author: Tor Lillqvist 
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 10 08:48:39 2023 +

Pass product name and not hardcoded "LibreOffice" to make_installer.pl -p

Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
Reviewed-on: https://gerrit.libreoffice.org/79128
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136842
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146741
Tested-by: Jenkins

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d 
"$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 "perl " .
 (scalar keys(%DB::sub) ? "-d " : "") .
 "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$PRODUCTNAME_no_spaces " .
 "-u $tmp_dir " .
 "-buildid $BUILD $destdir $strip $msi " .
 "-simple $path") && die "Failed to install: $!";

[Libreoffice-commits] core.git: solenv/bin

2023-02-02 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f2a2dab47dfae5c0c0bd68132e1446d571767eb8
Author: Christian Lohmaier 
AuthorDate: Mon Jan 9 17:46:14 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 2 21:53:18 2023 +

capture output of package command and add to log on error

creating packages failed here and the logs aren't all that helpful
without the output of the command that failed.
Reason it failed was that macOS thought that a volume with the same name
was already mounted (but that didn't show up in Finder). With the output
of the command easy to solve by just rebooting to fix that bogus state,
but with only "command failed" you question what is different about that
specific language, why would packaging that single language fail, …

Change-Id: I1f46263f9ec9c9374da5afaa58f6c9939b6a1488
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145239
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 230f84da66df..dd29c4c9eb1b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -494,13 +494,14 @@ sub create_package
 if ( $makesystemcall )
 {
 print "... $systemcall ...\n";
-my $returnvalue = system($systemcall);
+my $systemcall_output = `$systemcall`;
+my $returnvalue = $? >> 8;
 my $infoline = "Systemcall: $systemcall\n";
 push( @installer::globals::logfileinfo, $infoline);
 
 if ($returnvalue)
 {
-$infoline = "ERROR: Could not execute \"$systemcall\": 
$returnvalue\n";
+$infoline = "ERROR: Could not execute \"$systemcall\" - exitcode: 
$returnvalue - output:\n$systemcall_output\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
 else

[Libreoffice-commits] core.git: solenv/bin

2022-12-20 Thread Patrick Luby (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 5c98d8e79b4b35d30f1198f8c7b4beef44e421f4
Author: Patrick Luby 
AuthorDate: Fri Dec 16 12:29:51 2022 -0500
Commit: Christian Lohmaier 
CommitDate: Tue Dec 20 14:22:01 2022 +

tdf#151341 Use lzfse compression instead of bzip2

Several users reported that copying the LibreOffice.app package
in the Finder from a .dmg file compressed with lzfse compression
copies the package several times faster than from a .dmg compressed
with bzip2 compression.

On a mid-2015 Intel MacBook Pro running macOS, copying in the Finder
was at least 5 times faster with lzfse than with bzip2. Also, the
hdiutil man page as of macOS Monterey 12.6.2 has marked bzip2 as
deprecated. lzfse is marked as supported since macOS El Capitan 10.11
so this change appears safe.

The one thing that bzip2 has is better compression so a .dmg with
bzip2 should be smaller than with lzfse. A .dmg built from a debug
build was 262M with bzip2 and 273MB for lzfse. So it appears that
lzfse creates .dmg files that are only 4% or 5% larger than bzip2.

Change-Id: I61e2a08cede19a5bb8c257d4fa4762168a3a9dc3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144342
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 9efe7e726141..230f84da66df 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -459,7 +459,22 @@ sub create_package
 }
 my $megabytes = 1500;
 $megabytes = 3000 if $ENV{'ENABLE_DEBUG'};
-$systemcall = "cd $localtempdir && hdiutil create -megabytes 
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" 
-format UDBZ";
+
+# tdf#151341 Use lzfse compression instead of bzip2
+# Several users reported that copying the LibreOffice.app package
+# in the Finder from a .dmg file compressed with lzfse compression
+# copies the package several times faster than from a .dmg compressed
+# with bzip2 compression.
+# On a mid-2015 Intel MacBook Pro running macOS, copying in the Finder
+# was at least 5 times faster with lzfse than with bzip2. Also, the
+# hdiutil man page as of macOS Monterey 12.6.2 has marked bzip2 as
+# deprecated. lzfse is marked as supported since macOS El Capitan 10.11
+# so this change appears safe.
+# The one thing that bzip2 has is better compression so a .dmg with
+# bzip2 should be smaller than with lzfse. A .dmg built from a debug
+# build was 262M with bzip2 and 273MB for lzfse. So it appears that
+# lzfse creates .dmg files that are only 4% or 5% larger than bzip2.
+$systemcall = "cd $localtempdir && hdiutil create -megabytes 
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" 
-format ULFO";
 if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep 
unflatten") == 0) {
 $systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o 
$archive && hdiutil flatten $archive &&";
 }

[Libreoffice-commits] core.git: solenv/bin solenv/gdb

2022-11-08 Thread Mike Kaganski (via logerrit)

 solenv/bin/polib.py |4 ++--
 solenv/gdb/six.py   |   12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f295af7dfe6c91e00e7fb64f82de7dbba4bb0dc1
Author: Mike Kaganski 
AuthorDate: Tue Nov 8 11:54:29 2022 +0300
Commit: Mike Kaganski 
CommitDate: Tue Nov 8 12:20:18 2022 +0100

Simplify some Python version comparisons a bit

Change-Id: Ic1b475f4bc443a9f6e79c7c5ef36496dcf602a8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142418
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/polib.py b/solenv/bin/polib.py
index 092e7dfdb8b3..e1511cdb975f 100644
--- a/solenv/bin/polib.py
+++ b/solenv/bin/polib.py
@@ -43,7 +43,7 @@ default_encoding = 'utf-8'
 # python 2/3 compatibility helpers {{{
 
 
-if sys.version_info[:2] < (3, 0):
+if sys.version_info < (3, 0):
 PY3 = False
 text_type = unicode
 
@@ -593,7 +593,7 @@ class _BaseFile(list):
 0, keystart
 
 )
-if PY3 and sys.version_info.minor > 1:  # python 3.2 or superior
+if sys.version_info >= (3, 2):
 output += array.array("i", offsets).tobytes()
 else:
 output += array.array("i", offsets).tostring()
diff --git a/solenv/gdb/six.py b/solenv/gdb/six.py
index 5fe9f8e141ee..4196957e4102 100644
--- a/solenv/gdb/six.py
+++ b/solenv/gdb/six.py
@@ -35,7 +35,7 @@ __version__ = "1.14.0"
 # Useful for very coarse version differentiation.
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
+PY34 = sys.version_info >= (3, 4)
 
 if PY3:
 string_types = str,
@@ -641,7 +641,7 @@ if PY3:
 BytesIO = io.BytesIO
 del io
 _assertCountEqual = "assertCountEqual"
-if sys.version_info[1] <= 1:
+if sys.version_info <= (3, 1):
 _assertRaisesRegex = "assertRaisesRegexp"
 _assertRegex = "assertRegexpMatches"
 _assertNotRegex = "assertNotRegexpMatches"
@@ -726,7 +726,7 @@ else:
 """)
 
 
-if sys.version_info[:2] > (3,):
+if sys.version_info > (3,):
 exec_("""def raise_from(value, from_value):
 try:
 raise value from from_value
@@ -793,7 +793,7 @@ if print_ is None:
 write(sep)
 write(arg)
 write(end)
-if sys.version_info[:2] < (3, 3):
+if sys.version_info < (3, 3):
 _print = print_
 
 def print_(*args, **kwargs):
@@ -805,7 +805,7 @@ if sys.version_info[:2] < (3, 3):
 
 _add_doc(reraise, """Reraise an exception.""")
 
-if sys.version_info[0:2] < (3, 4):
+if sys.version_info < (3, 4):
 # This does exactly the same what the :func:`py3:functools.update_wrapper`
 # function does on Python versions after 3.2. It sets the ``__wrapped__``
 # attribute on ``wrapper`` object and it doesn't raise an error if any of
@@ -845,7 +845,7 @@ def with_metaclass(meta, *bases):
 class metaclass(type):
 
 def __new__(cls, name, this_bases, d):
-if sys.version_info[:2] >= (3, 7):
+if sys.version_info >= (3, 7):
 # This version introduced PEP 560 that requires a bit
 # of extra care (we mimic what is done by __build_class__).
 resolved_bases = types.resolve_bases(bases)

[Libreoffice-commits] core.git: solenv/bin

2022-11-03 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/scriptitems.pm |   33 +++-
 1 file changed, 13 insertions(+), 20 deletions(-)

New commits:
commit 1cfa0f49922aa49597bac341393c8f38309a3bae
Author: Mike Kaganski 
AuthorDate: Thu Nov 3 09:35:07 2022 +0200
Commit: Mike Kaganski 
CommitDate: Thu Nov 3 17:23:11 2022 +0100

Do not merge filesarrayref and unixlinksarrayref when filtering out 
directories

In commit 8c6467a785037309d2a2cec56c8e38cf52da0aee, the code
filtering out the directories was creating a new array, that
was assigned to the function's inout filesarrayref argument;
and that code merged non-directories from both filesarrayref
and unixlinksarrayref.

This fixes the logic to only filter filesarrayref.

Change-Id: Ia00dcd3f645ba2a6c2d8ea0559627ccfe0eb232b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142195
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 97b76a503f6a..0c374054895d 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1679,33 +1679,28 @@ sub add_directory_with_create_flag_hash
 sub collect_directories_from_filesarray
 {
 my ($filesarrayref, $unixlinksarrayref) = @_;
-my @allfiles;
-push @allfiles, @{$filesarrayref};
-push @allfiles, @{$unixlinksarrayref};
 
 my %alldirectoryhash = ();
-my @filteredfilesarrayref = (); # without empty directories
-
-# Preparing this already as hash, although the only needed value at the 
moment is the HostName
-# But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
-
-for ( my $i = 0; $i <= $#allfiles; $i++ )
+my @filteredfilesarray = (); # without empty directories
+foreach my $onefile (@{$filesarrayref})
 {
-my $onefile = $allfiles[$i];
-my $destinationpath = $onefile->{'destination'};
-
 # The "file" can actually be an empty directory added e.g. by 
gb_Package_add_empty_directory.
 # TODO/LATER: it would be better if gb_Package_add_empty_directory 
added empty directories to
 # "directories with CREATE flag" instead of a filelist.
 if (-d $onefile->{'sourcepath'})
 {
-my $sourcepath = $onefile->{'sourcepath'};
 # Do the same as 
collect_directories_with_create_flag_from_directoryarray does
 %alldirectoryhash = 
%{add_directory_with_create_flag_hash(\%alldirectoryhash, 
$onefile->{'destination'}, $onefile->{'specificlanguage'}, $onefile->{'gid'}, 
"(CREATE)", $onefile->{'modules'})};
-
-next;
 }
-push(@filteredfilesarrayref, $onefile);
+else { push(@filteredfilesarray, $onefile); }
+}
+
+# Preparing this already as hash, although the only needed value at the 
moment is the HostName
+# But also adding: "specificlanguage" and "Dir" (for instance 
gid_Dir_Program)
+
+foreach my $onefile (@filteredfilesarray, @{$unixlinksarrayref})
+{
+my $destinationpath = $onefile->{'destination'};
 
 
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
 $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//; # 
removing ending slashes or backslashes
@@ -1746,7 +1741,7 @@ sub collect_directories_from_filesarray
 $alldirectoryhash{$destdir}->{'modules'} = 
optimize_list($alldirectoryhash{$destdir}->{'modules'});
 }
 
-@_[0] = \@filteredfilesarrayref; # out argument
+@_[0] = \@filteredfilesarray; # out argument
 return \%alldirectoryhash;
 }
 
@@ -1758,12 +1753,10 @@ sub 
collect_directories_with_create_flag_from_directoryarray
 {
 my ($directoryarrayref, $alldirectoryhash) = @_;
 
-my $alreadyincluded = 0;
 my @alldirectories = ();
 
-for ( my $i = 0; $i <= $#{$directoryarrayref}; $i++ )
+foreach my $onedir (@{$directoryarrayref})
 {
-my $onedir = ${$directoryarrayref}[$i];
 $alldirectoryhash = 
add_directory_with_create_flag_hash($alldirectoryhash, $onedir->{'HostName'}, 
$onedir->{'specificlanguage'}, $onedir->{'gid'}, $onedir->{'Styles'}, 
$onedir->{'modules'});
 }

[Libreoffice-commits] core.git: solenv/bin

2022-11-02 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/scriptitems.pm |  117 +---
 1 file changed, 74 insertions(+), 43 deletions(-)

New commits:
commit 89022d5b6dc51e592e22bb8ff94c430ec14de17c
Author: Mike Kaganski 
AuthorDate: Wed Nov 2 21:47:41 2022 +0200
Commit: Mike Kaganski 
CommitDate: Wed Nov 2 21:49:26 2022 +0100

Try to fix "ERROR: Directory with flag ISINSTALLLOCATION not set!"

This is a regression after my recent changes to Perl code in installer,
most likely commit 8c6467a785037309d2a2cec56c8e38cf52da0aee, like seen
at https://ci.libreoffice.org/job/lo_daily_tb_win/1213/consoleFull:

> ERROR: Failure in installer.pm
> ERROR: ERROR: Directory with flag ISINSTALLLOCATION not set! at 
C:/cygwin/home/tdf/jenkins/daily_workspace/tb/src_master/solenv/bin/modules/installer/windows/directory.pm
 line 334.

I can't repro this problem locally; but as Stephan Bergmann noted,
the mentioned commit changed logic so that a piece of code started
to only execute for CREATE style, where previously it run always.

This tries to re-create the logic prior to the mentioned commit.

Change-Id: I01af06d58b26222bee6220cb9be61cf71940930f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142152
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 0057d47c82e8..97b76a503f6a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1575,54 +1575,92 @@ sub optimize_list
 return join(",", sort keys %tmpHash);
 }
 
-
-# Recursively add a directory with CREATE flag
-
+###
+# Add a directory with CREATE flag; save styles for already added directories
+###
 
-sub recursive_add_directory_with_create_flag_hash
+sub add_directory_with_create_flag_hash
 {
 my ($alldirectoryhash, $directoryname, $specificlanguage, $gid, $styles, 
$modules) = @_;
-if ( ! $directoryname ) { installer::exiter::exit_program("No directory 
name (HostName) set for specified language in gid $gid", 
"recursive_add_directory_with_create_flag_hash"); }
-if ( ! $modules )   { installer::exiter::exit_program("No assigned 
modules found for directory $directoryname", 
"recursive_add_directory_with_create_flag_hash"); }
-
-if (!exists($alldirectoryhash->{$directoryname}))
+if ( ! $directoryname ) { installer::exiter::exit_program("No directory 
name (HostName) set for specified language in gid $gid", 
"add_directory_with_create_flag_hash"); }
+my $origdirectoryname = $directoryname;
+my $newdirincluded = 0;
+if ( $styles =~ /\bCREATE\b/ )
 {
-my %directoryhash = ();
-$directoryhash{'HostName'} = $directoryname;
-$directoryhash{'specificlanguage'} = $specificlanguage;
-$directoryhash{'Dir'} = $gid;
-$directoryhash{'Styles'} = $styles;
+if ( ! $modules ) { installer::exiter::exit_program("No assigned 
modules found for directory $directoryname", 
"add_directory_with_create_flag_hash"); }
+if (!(exists($alldirectoryhash->{$directoryname})))
+{
+my %directoryhash = ();
+$directoryhash{'HostName'} = $directoryname;
+$directoryhash{'specificlanguage'} = $specificlanguage;
+$directoryhash{'Dir'} = $gid;
+$directoryhash{'Styles'} = $styles;
+
+# saving also the modules
+$directoryhash{'modules'} = $modules;
+
+$alldirectoryhash->{$directoryname} = \%directoryhash;
+$newdirincluded = 1;
+
+# Problem: The $destinationpath can be 
share/registry/schema/org/openoffice
+# but not all directories contain files and will be added to this 
list.
+# Therefore the path has to be analyzed.
+
+while ( $directoryname =~ 
/(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/ )  # as long as the path 
contains slashes
+{
+$directoryname = $1;
+
+if (!(exists($alldirectoryhash->{$directoryname})))
+{
+my %directoryhash = ();
+
+$directoryhash{'HostName'} = $directoryname;
+$directoryhash{'specificlanguage'} = $specificlanguage;
+$directoryhash{'Dir'} = $gid;
+if ( ! $installer::globals::iswindowsbuild ) { 
$directoryhash{'Styles'} = "(CREATE)"; } # Exception for Windows?
 
-# saving also the modules
-$directoryhash{'modules'} = $modules;
+# saving also the modules
+$directoryhash{'modules'} = $modules;
 
-$alldirect

[Libreoffice-commits] core.git: solenv/bin

2022-10-30 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer.pm |   11 
 solenv/bin/modules/installer/control.pm |   12 
 solenv/bin/modules/installer/environment.pm |3 
 solenv/bin/modules/installer/epmfile.pm |   33 
 solenv/bin/modules/installer/filelists.pm   |3 
 solenv/bin/modules/installer/globals.pm |  473 ++--
 solenv/bin/modules/installer/languagepack.pm|5 
 solenv/bin/modules/installer/languages.pm   |3 
 solenv/bin/modules/installer/packagelist.pm |7 
 solenv/bin/modules/installer/parameter.pm   |3 
 solenv/bin/modules/installer/pathanalyzer.pm|3 
 solenv/bin/modules/installer/profiles.pm|5 
 solenv/bin/modules/installer/remover.pm |3 
 solenv/bin/modules/installer/scpzipfiles.pm |3 
 solenv/bin/modules/installer/scriptitems.pm |4 
 solenv/bin/modules/installer/setupscript.pm |5 
 solenv/bin/modules/installer/simplepackage.pm   |   11 
 solenv/bin/modules/installer/systemactions.pm   |   15 
 solenv/bin/modules/installer/windows/admin.pm   |3 
 solenv/bin/modules/installer/windows/assembly.pm|3 
 solenv/bin/modules/installer/windows/binary.pm  |3 
 solenv/bin/modules/installer/windows/component.pm   |3 
 solenv/bin/modules/installer/windows/createfolder.pm|3 
 solenv/bin/modules/installer/windows/directory.pm   |5 
 solenv/bin/modules/installer/windows/feature.pm |3 
 solenv/bin/modules/installer/windows/featurecomponent.pm|7 
 solenv/bin/modules/installer/windows/file.pm|   10 
 solenv/bin/modules/installer/windows/font.pm|3 
 solenv/bin/modules/installer/windows/icon.pm|3 
 solenv/bin/modules/installer/windows/idtglobal.pm   |   17 
 solenv/bin/modules/installer/windows/inifile.pm |5 
 solenv/bin/modules/installer/windows/language.pm|3 
 solenv/bin/modules/installer/windows/media.pm   |3 
 solenv/bin/modules/installer/windows/mergemodule.pm |   14 
 solenv/bin/modules/installer/windows/msiglobal.pm   |   17 
 solenv/bin/modules/installer/windows/msishortcutproperty.pm |3 
 solenv/bin/modules/installer/windows/property.pm|3 
 solenv/bin/modules/installer/windows/registry.pm|3 
 solenv/bin/modules/installer/windows/removefile.pm  |3 
 solenv/bin/modules/installer/windows/shortcut.pm|   14 
 solenv/bin/modules/installer/windows/strip.pm   |5 
 solenv/bin/modules/installer/windows/update.pm  |7 
 solenv/bin/modules/installer/windows/upgrade.pm |3 
 solenv/bin/modules/installer/worker.pm  |9 
 solenv/bin/modules/installer/ziplist.pm |7 
 45 files changed, 452 insertions(+), 312 deletions(-)

New commits:
commit 824b70fc473f96fca480f3d0d64f63234666db2b
Author: Mike Kaganski 
AuthorDate: Sun Oct 30 18:03:43 2022 +0300
Commit: Mike Kaganski 
CommitDate: Sun Oct 30 21:17:56 2022 +0100

'use strict' and 'use warnings' in all installer Perl

Change-Id: I6068b795a7dfac24651c8e4a100f78dbee11f98b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142044
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 071d31b13b14..a22385924b92 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -18,6 +18,9 @@
 
 package installer;
 
+use strict;
+use warnings;
+
 use base 'Exporter';
 
 use Cwd;
@@ -536,7 +539,7 @@ sub run {
 # Resolving include paths (language dependent)
 
 
-$includepatharrayref_lang = 
installer::ziplist::replace_languages_in_paths($includepatharrayref, 
\@setuplanguagesarray);
+my $includepatharrayref_lang = 
installer::ziplist::replace_languages_in_paths($includepatharrayref, 
\@setuplanguagesarray);
 
 if ( $installer::globals::refresh_includepaths ) { 
installer::worker::collect_all_files_from_includepaths($includepatharrayref_lang);
 }
 
@@ -1023,7 +1026,7 @@ sub run {
 
 if ( ! ( $#{$filesinpackage} > -1 ))
 {
-$infoline = "\n\nNo file in package: $packagename \-\> 
Skipping\n\n";
+my $infoline = "\n\nNo file in package: $packagename \-\> 
Skipping\n\n";
 push(@installer::globals::logfileinfo, $infoline);
 next;   # next package, end of loop !
 }
@@ -1379,7 +1382,7 @@ sub run {
 
installer::windows::assem

[Libreoffice-commits] core.git: solenv/bin

2022-10-30 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer.pm |2 +-
 solenv/bin/modules/installer/scriptitems.pm |   14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 347fa47507fce9758b60d9126a1beed04c45dc35
Author: Mike Kaganski 
AuthorDate: Sun Oct 30 12:39:27 2022 +0300
Commit: Mike Kaganski 
CommitDate: Sun Oct 30 12:15:33 2022 +0100

Fix errors in scriptitems.pm found by 'use strict'

Besides some stylistic changes (adding 'my' in due places), this
fixes two errors:

1. An omission from commit cb02ea85db6f38b792c17f5f971f81a28b595b4e
  Date Fri Oct 13 09:36:29 2006 +
  INTEGRATION: CWS native62 (1.28.42); FILE MERGED

not passing '$allvariableshashref' to 'replace_userdir_variable',
and so using a local empty variable instead, ignoring custom value
of LOCALUSERDIR in *.lst;

2. Use of wrong scalar variable '$alldirectoryhash' instead of hash
'%alldirectoryhash' in 'collect_directories_from_filesarray', from
commit 8c6467a785037309d2a2cec56c8e38cf52da0aee
  Date Sat Oct 29 23:38:12 2022 +0300
  MSI: fix handling empty directories

which resulted in the loss of empty directories found by that call.

Change-Id: I126575a51044186bc6c7fdf898942abf71ddb4b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142034
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 99866b2fb7f2..071d31b13b14 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -714,7 +714,7 @@ sub run {
 # ancient (not MSP) "patch" thing, I think.
 if ( $installer::globals::patch_user_dir )
 {
-
installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref);
+
installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref,
 $allvariableshashref);
 }
 
 
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($profilesinproductlanguageresolvedarrayref,
 $dirsinproductarrayref);
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index e541be45b1f0..7b552622fb9b 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -660,8 +660,8 @@ sub replace_setup_variables
 chomp;
 if (/^s*(\S+)=(\S+)$/)
 {
-$key = $1;
-$val = $2;
+my $key = $1;
+my $val = $2;
 if ($key eq "channel")
 {
 $updatechannel = $val;
@@ -700,7 +700,7 @@ sub replace_setup_variables
 
 sub replace_userdir_variable
 {
-my ($itemsarrayref) = @_;
+my ($itemsarrayref, $allvariableshashref) = @_;
 
 my $userdir = "";
 if ( $allvariableshashref->{'LOCALUSERDIR'} ) { $userdir = 
$allvariableshashref->{'LOCALUSERDIR'}; }
@@ -1659,7 +1659,7 @@ sub collect_directories_from_filesarray
 {
 my $sourcepath = $onefile->{'sourcepath'};
 # Do the same as 
collect_directories_with_create_flag_from_directoryarray does
-$alldirectoryhash = 
recursive_add_directory_with_create_flag_hash(\%alldirectoryhash, 
$onefile->{'destination'}, $onefile->{'specificlanguage'}, $onefile->{'gid'}, 
"(CREATE)", $onefile->{'modules'});
+%alldirectoryhash = 
%{recursive_add_directory_with_create_flag_hash(\%alldirectoryhash, 
$onefile->{'destination'}, $onefile->{'specificlanguage'}, $onefile->{'gid'}, 
"(CREATE)", $onefile->{'modules'})};
 
 next;
 }
@@ -1810,7 +1810,7 @@ sub get_destination_link_path_for_links
 for ( my $j = 0; $j <= $#{$linksarrayref}; $j++ )
 {
 my $destlink = ${$linksarrayref}[$j];
-$shortcutgid = $destlink->{'gid'};
+my $shortcutgid = $destlink->{'gid'};
 
 if ( $shortcutgid eq $shortcutid )
 {
@@ -2161,7 +2161,7 @@ sub collect_all_parent_feature
 if ( $found_root_module ) { 
installer::exiter::exit_program("ERROR: Only one module without ParentID or 
with empty ParentID allowed ($installer::globals::rootmodulegid, 
$onefeature->{'gid'}).", "collect_all_parent_feature"); }
 $installer::globals::rootmodulegid = $onefeature->{'gid'};
 $found_root_module = 1;
-$infoline = "Setting Root Module: 
$installer::globals::rootmodulegid\n";
+my $infoline = "Setting Root Module: 
$installer::globals::rootmodulegid\n";
 push( @installer::globals::globallogfileinfo, $infoline);
 }
 
@@ -2353,7 +2353,7 @@ sub _key_in_a_is_also_key_in_b
 if ( ! exists($hashref_b->{$key}) )
 {
 print "*\n";
-foreach $keyb ( keys %{$hash

[Libreoffice-commits] core.git: solenv/bin

2022-10-30 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer.pm |   12 -
 solenv/bin/modules/installer/scriptitems.pm |  185 +++-
 2 files changed, 79 insertions(+), 118 deletions(-)

New commits:
commit 8c6467a785037309d2a2cec56c8e38cf52da0aee
Author: Mike Kaganski 
AuthorDate: Sat Oct 29 23:38:12 2022 +0300
Commit: Mike Kaganski 
CommitDate: Sun Oct 30 09:38:04 2022 +0100

MSI: fix handling empty directories

Such empty directories are added e.g. by setup_native/Package_packinfo.mk
when using these configuration:

  ./autogen.sh --with-external-tar=/cygdrive/c/sources/lo-externalsrc 
--with-junit=/cygdrive/c/sources/junit-4.10.jar 
--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 --enable-pch 
--disable-ccache --with-visual-studio=2019 --with-jdk-home="C:\Program 
Files\Microsoft\jdk-17.0.4.101-hotspot" --with-package-format=msi 
--with-ucrt-dir=/cygdrive/c/cygwin64/opt/ucrt/

Making after that produced this error:

: *
: ERROR: Reading from filehandle failed at 
C:/sources/core/solenv/bin/modules/installer/windows/file.pm line 967.
: *

because it tried to create MD5 hash of a directory.

Change-Id: I7d2a6dc989f823fabaca1bef07a68ba964ffe34b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142026
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 17ce8f7621ce..99866b2fb7f2 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -650,8 +650,8 @@ sub run {
 # It will be possible, that in the setup script only those directories 
have to be defined,
 # that have a CREATE flag. All other directories are created, if they 
contain at least one file.
 
-my ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
+my $alldirectoryhash = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
+my $directoriesforepmarrayref = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
 
 #
 # language dependent scpactions part
@@ -802,8 +802,8 @@ sub run {
 @{$folderitemsinproductlanguageresolvedarrayref} = (); # no 
folderitems in languagepacks
 
 # Collecting the directories again, to include only the language 
specific directories
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
+$alldirectoryhash = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
+$directoriesforepmarrayref = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
 @$directoriesforepmarrayref = sort { $a->{"HostName"} cmp 
$b->{"HostName"} } @$directoriesforepmarrayref;
 
 if ( $installer::globals::iswindowsbuild )
@@ -823,8 +823,8 @@ sub run {
 @{$folderitemsinproductlanguageresolvedarrayref} = (); # no 
folderitems in helppacks
 
 # Collecting the directories again, to include only the language 
specific directories
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
+$alldirectoryhash = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
+$directoriesforepmarrayref = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresol

[Libreoffice-commits] core.git: solenv/bin

2022-10-24 Thread Andrea Gelmini (via logerrit)

 solenv/bin/macosx-codesign-app-bundle |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd237b826f096d6b84257c1b09ce140ed3f54e25
Author: Andrea Gelmini 
AuthorDate: Mon Oct 24 09:48:28 2022 +0200
Commit: Julien Nabet 
CommitDate: Mon Oct 24 18:14:32 2022 +0200

Fix typo

Change-Id: Id974647a7e08298aa6ebd19dcc674fd4f4066b52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141720
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 6894329fa406..e569aef24333 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -126,7 +126,7 @@ done
 # See also https://developer.apple.com/library/mac/technotes/tn2206/
 
 if test -n "$ENABLE_MACOSX_SANDBOX" && test -n "$application_identifier"; then
-# add back the application-identfier to the entitlements
+# add back the application-identifier to the entitlements
 # testflight/beta-testing won't work if that key is used when signing the 
other executables
 /usr/libexec/PlistBuddy -c "add com.apple.application-identifier string 
$application_identifier"  $BUILDDIR/lo.xcent
 fi

[Libreoffice-commits] core.git: solenv/bin

2022-10-06 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 658946e0353c2fad5e26bb75f851744da4b7751f
Author: Caolán McNamara 
AuthorDate: Thu Oct 6 09:04:06 2022 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 6 11:55:05 2022 +0200

Revert "android: add Grammar Checker component to native-code.py"

This reverts commit f3b73cce60a440db584b5774319bba6d00bd94c0.

lingucomponent_LanguageToolGrammarChecker_get_implementation is already
listed, so it was listed twice

Change-Id: I93eada023fa3cd9636abe5de5d6ecc9f50c8fd1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141000
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 4d085d724443..a0ccdcbb523b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -311,7 +311,6 @@ core_constructor_list = [
 "lingucomponent_SpellChecker_get_implementation",
 "lingucomponent_LangGuess_get_implementation",
 "lingucomponent_Hyphenator_get_implementation",
-"lingucomponent_LanguageToolGrammarChecker_get_implementation",
 # package/source/xstor/xstor.component
 "package_OStorageFactory_get_implementation",
 # package/util/package2.component

[Libreoffice-commits] core.git: solenv/bin

2022-08-17 Thread Stephan Bergmann (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f61ea9d2d8d61fe190aa43a57b2316def6c12b8d
Author: Stephan Bergmann 
AuthorDate: Wed Aug 17 09:07:40 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 17 10:53:40 2022 +0200

Raise hdiutil -megabytes even further for debug builds

My macOS build had started to fail with
workdir/installation/LibreOffice/dmg/logging/en-US/log_750_en-US.log stating

> Systemcall: cd 
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress_temp.14524
 && hdiutil create -megabytes 2000 -srcfolder 
LibreOffice_7.5.0.0.alpha0_MacOS_aarch64 
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress/LibreOffice_7.5.0.0.alpha0_MacOS_aarch64.dmg
 -ov -fs HFS+ -volname "LibreOffice" -format UDBZ
> ERROR: Could not execute "cd 
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress_temp.14524
 && hdiutil create -megabytes 2000 -srcfolder 
LibreOffice_7.5.0.0.alpha0_MacOS_aarch64 
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress/LibreOffice_7.5.0.0.alpha0_MacOS_aarch64.dmg
 -ov -fs HFS+ -volname "LibreOffice" -format UDBZ": 256

and which went away again with the increased $megabytes value.

Change-Id: I483a8cb06df0720eeb42e6260276e6b52ea2a423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 5ab12978362d..b1811a804aea 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -455,7 +455,7 @@ sub create_package
 }
 }
 my $megabytes = 1500;
-$megabytes = 2000 if $ENV{'ENABLE_DEBUG'};
+$megabytes = 3000 if $ENV{'ENABLE_DEBUG'};
 $systemcall = "cd $localtempdir && hdiutil create -megabytes 
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" 
-format UDBZ";
 if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep 
unflatten") == 0) {
 $systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o 
$archive && hdiutil flatten $archive &&";

[Libreoffice-commits] core.git: solenv/bin

2022-07-19 Thread Ilmari Lauhakangas (via logerrit)

 solenv/bin/desktop-translate.py |  104 +---
 1 file changed, 55 insertions(+), 49 deletions(-)

New commits:
commit 4c3a23832ca8ee88d366e16adabea05a98ffeccb
Author: Ilmari Lauhakangas 
AuthorDate: Fri Jul 15 11:58:41 2022 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Tue Jul 19 12:34:42 2022 +0200

Related: tdf#149990 solenv/bin/desktop-translate.py readability

Satisfies many pylint suggestions and includes a formatting pass with Black.

Change-Id: I33794902ab303f63b52a3412e4e4d18b492cc74b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137101
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index 639fa89af48f..edc377dab15b 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -16,15 +16,18 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-#
-# Translates multiple .desktop files at once with strings from .ulf
-# files; if you add new translatable .ulf files please add them to
-# l10ntools/source/localize.cxx
-#
+"""Translates multiple .desktop files at once with strings from .ulf
+files; if you add new translatable .ulf files please add them to
+l10ntools/source/localize.cxx in case the module is not already listed."""
 
-import os, sys, argparse, io
+import os
+import sys
+import argparse
+import io
 
-def encodeDesktopString(s):
+
+def encode_desktop_string(s_value):
+"""Function encoding strings to be used as values in .desktop files."""
 # 
 says "The escape sequences \s, \n, \t, \r, and \\ are 
supported for values of
 # type string and localestring, meaning ASCII space, newline, tab, 
carriage return, and
@@ -36,71 +39,72 @@ def encodeDesktopString(s):
 # supposed to relate, so just escape any U+000A LINE FEED as "\n" and any 
U+000D CARRIAGE RETURN
 # as "\r"; it is unclear exactly which occurrences of U+0020 SPACE and 
U+0009 CHARACTER
 # TABULATION would need to be escaped, so they are mostly left unescaped, 
for readability:
-s = s.replace('\\', '').replace('\n', '\\n').replace('\r', '\\r');
-if s.startswith(' '):
+s_value = s_value.replace("\\", "").replace("\n", "\\n").replace("\r", 
"\\r")
+if s_value.startswith(" "):
 # 
 says "Space before and after the equals sign should be 
ignored", so escape a
 # leading U+0020 SPACE as "\s" (while it is not clear whether "space" 
there means just
 # U+0020 SPACE or any kind of white space, in which case at least a 
leading U+0009 CHARACTER
 # TABULATION should similarly be escaped as "\t"; also, it is unclear 
whether such
 # characters should also be escaped at the end):
-s = '\\s' + s[1:]
-return s
+s_value = "\\s" + s_value[1:]
+return s_value
+
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-p', dest='productname', default='LibreOffice')
-parser.add_argument('-d', dest='workdir', default='.')
-parser.add_argument('--key', dest='key')
-parser.add_argument('--prefix', dest='prefix', default='')
-parser.add_argument('--ext', dest='ext')
-parser.add_argument('--template-dir', dest='template_dir', default=None)
-parser.add_argument('ifile')
+parser.add_argument("-p", dest="productname", default="LibreOffice")
+parser.add_argument("-d", dest="workdir", default=".")
+parser.add_argument("--key", dest="key")
+parser.add_argument("--prefix", dest="prefix", default="")
+parser.add_argument("--ext", dest="ext")
+parser.add_argument("--template-dir", dest="template_dir", default=None)
+parser.add_argument("ifile")
 
 o = parser.parse_args()
 
 if o.template_dir is None:
-template_dir = '{}/{}'.format(o.workdir, o.prefix)
+template_dir = f"{o.workdir}/{o.prefix}"
 else:
 template_dir = o.template_dir
 
 # hack for unity section
 if o.key == "UnityQuickList":
-outkey = "Name"
+OUTKEY = "Name"
 else:
-outkey = o.key
+OUTKEY = o.key
 
 
 templates = {}
 
 # open input file
-source = io.open(o.ifile, encoding='utf-8')
+source = io.open(o.ifile, encoding="utf-8")
 
 template = None
 
 # read ulf file
 for line in source:
-if line.strip() == '':
+if line.strip() == "":
 continue
 if line[0] == "[":
-template = line.split(']', 1)[0][1:]
+template = line.split("]", 1)[0][1:]
 entry = {}
 # For every section in the specified ulf file there should exist
 # a template file in $workdir ..
-entry['outfile'] = "{}{}.{}".format(template_dir, template, o.ext)
-entry['translations'] = {}
+entry["outfile"] = f"{template_dir}{template}.{o.ext}"
+entry["translations"] = {}
 templates[template] = entry

[Libreoffice-commits] core.git: solenv/bin

2022-06-16 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2ef1dc48597d85d02576d6b722d1dd784eabf39
Author: Christian Lohmaier 
AuthorDate: Wed Jun 15 22:06:05 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 16 16:35:49 2022 +0200

drop special case for win 64bit download name, use x86-64 consistently

"x64" was introduced in 2013 for the 64bit windows packages in
efdad0b126abd3c151b545740d0530a0a832d482 for no apparent reason.

Change-Id: Ifae4faaeb99b4e8950cc64bb993d29c0a3ff24dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135923
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index f46dae735864..ad5f94560751 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -377,7 +377,7 @@ sub get_download_architecture
 }
 elsif ( $installer::globals::cpuname eq 'X86_64' )
 {
-$arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
+$arch = 'x86-64';
 }
 elsif ( $installer::globals::cpuname eq 'AARCH64' )
 {

[Libreoffice-commits] core.git: solenv/bin

2022-06-16 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm  |   13 +
 solenv/bin/modules/installer/globals.pm   |1 -
 solenv/bin/modules/installer/parameter.pm |   11 +--
 3 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit c7f971c23b908335ab5cfb3117bb4d6fe544a664
Author: Christian Lohmaier 
AuthorDate: Wed Jun 15 22:04:14 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 16 12:47:27 2022 +0200

fix download-filename for Windows aarch64 builds

was incorrectly using x64

Change-Id: Ieb7c90c6b1ed3abd73315a15c59490ea639954c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135922
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index ca270fe563a9..f46dae735864 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -363,17 +363,6 @@ sub get_download_architecture
 {
 $arch = "x86";
 }
-elsif ( $installer::globals::iswindowsbuild )
-{
-if ( $installer::globals::iswin64build )
-{
-$arch = "x64";
-}
-else
-{
-$arch = "x86";
-}
-}
 elsif ( $installer::globals::cpuname eq 'INTEL' )
 {
 $arch = "x86";
@@ -388,7 +377,7 @@ sub get_download_architecture
 }
 elsif ( $installer::globals::cpuname eq 'X86_64' )
 {
-$arch = "x86-64";
+$arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
 }
 elsif ( $installer::globals::cpuname eq 'AARCH64' )
 {
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 11442ef202a8..5bbaef309145 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -46,7 +46,6 @@ BEGIN
 $languages_defined_in_productlist = 0;
 $setupscript_defined_in_productlist = 0;
 $iswindowsbuild = 0;
-$iswin64build = 0;
 $islinuxbuild = 0;
 $isrpmbuild = 0;
 $isdebbuild = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 8f259c3e9a32..befed72024a0 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -241,16 +241,7 @@ sub setglobalvariables
 
 if ( $installer::globals::os eq 'WNT' )
 {
-if ( $installer::globals::cpuname eq 'INTEL')
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 0;
-}
-else
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 1;
-}
+$installer::globals::iswindowsbuild = 1;
 }
 
 if ( $installer::globals::os eq 'SOLARIS')

[Libreoffice-commits] core.git: solenv/bin

2022-06-15 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1f42313e51f10d586d94297335da77a16cfab32
Author: Caolán McNamara 
AuthorDate: Wed Jun 15 09:16:42 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 15 10:23:54 2022 +0200

fix oss-fuzz build

Change-Id: Id9eeea1c57a4461e0d178492c6472174ff78065a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135867
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b5918618554f..517df4ac7b45 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -305,7 +305,7 @@ core_constructor_list = [
 # linguistic/source/spellcheck/MacOSXSpellMacOSXSpell.component
 ("lingucomponent_MacSpellChecker_get_implementation", "#ifdef IOS"),
 # lingucomponent/source/spellcheck/languagetool/LanguageTool.component
-"lingucomponent_LanguageToolGrammarChecker_get_implementation",
+("lingucomponent_LanguageToolGrammarChecker_get_implementation", "#if 
!ENABLE_FUZZERS"),
 # lingucomponent/source/thesaurus/libnth/lnth.component
 "lingucomponent_Thesaurus_get_implementation",
 "lingucomponent_SpellChecker_get_implementation",

[Libreoffice-commits] core.git: solenv/bin

2022-06-13 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4c8537589f2a73d1fbecaf4c1e9c64627b79e542
Author: Michael Weghorn 
AuthorDate: Mon Jun 13 16:23:20 2022 +0200
Commit: Michael Weghorn 
CommitDate: Tue Jun 14 06:39:34 2022 +0200

liblo-native-code: Add LanguageToolGrammarChecker

Fixes Android Viewer crashing after

commit d952df361a5e190246d7a0738ae5347b82cd57b5
AuthorDate: Tue May 10 13:06:06 2022 +0300
CommitDate: Fri Jun 10 13:52:17 2022 +0200

LanguageTool Grammar Checker implementation

when opening any file, with this in ADB log:

06-13 16:14:07.274 20696 20736 W cppuhelper: 
1:cppuhelper/source/shlib.cxx:299: unknown constructor name 
"lingucomponent_LanguageToolGrammarChecker_get_implementation"
06-13 16:14:07.274 20696 20736 W linguistic: 
1:linguistic/source/lngsvcmgr.cxx:1028: createInstance failed
06-13 16:14:07.274 20696 20736 E LibreOffice/androidinst: SalAbort: 
'Unspecified application error'

Change-Id: Ib4316b576636d35a383d5c11c36c92a8c67a302a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135730
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6b9ebdbb4601..b5918618554f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -304,6 +304,8 @@ core_constructor_list = [
 "linguistic_GrammarCheckingIterator_get_implementation",
 # linguistic/source/spellcheck/MacOSXSpellMacOSXSpell.component
 ("lingucomponent_MacSpellChecker_get_implementation", "#ifdef IOS"),
+# lingucomponent/source/spellcheck/languagetool/LanguageTool.component
+"lingucomponent_LanguageToolGrammarChecker_get_implementation",
 # lingucomponent/source/thesaurus/libnth/lnth.component
 "lingucomponent_Thesaurus_get_implementation",
 "lingucomponent_SpellChecker_get_implementation",

[Libreoffice-commits] core.git: solenv/bin

2022-04-13 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 827d97887a8284e09fdeb2aa2918f60f09fd1a4a
Author: Michael Weghorn 
AuthorDate: Wed Apr 13 10:16:00 2022 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 13 18:22:29 2022 +0200

tdf#148553 liblo-native-code: Add services for numeric controls

Change-Id: I67727b8ced6c501f0e220fa2024976640ca7028a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132950
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 88d53d320602..6b9ebdbb4601 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -190,6 +190,7 @@ core_constructor_list = [
 ("com_sun_star_form_OListBoxControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
 ("com_sun_star_form_OListBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
 ("com_sun_star_form_ONumericModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_form_ONumericControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
 ("com_sun_star_form_ORadioButtonControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
 ("com_sun_star_form_ORadioButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
 ("com_sun_star_form_XForms_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
@@ -419,6 +420,7 @@ core_constructor_list = [
 "stardiv_Toolkit_UnoDateFieldControl_get_implementation",
 "stardiv_Toolkit_UnoGroupBoxControl_get_implementation",
 "stardiv_Toolkit_UnoListBoxControl_get_implementation",
+"stardiv_Toolkit_UnoNumericFieldControl_get_implementation",
 "stardiv_Toolkit_UnoRadioButtonControl_get_implementation",
 "stardiv_Toolkit_UnoSpinButtonModel_get_implementation",
 "stardiv_Toolkit_VCLXPointer_get_implementation",

[Libreoffice-commits] core.git: solenv/bin sysui/desktop

2022-01-23 Thread Andras Timar (via logerrit)

 solenv/bin/modules/installer/epmfile.pm  |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a244beeed618fc4507a65934932a1a6607c62804
Author: Andras Timar 
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Sun Jan 23 15:13:03 2022 +0100

change rpm compression algorithm to multi threaded xz

Our baseline is CentOS 7, it's safe to switch to xz that is supported there.
Here is my measurement on rpm package build time and package size on a
48 core machine, however 48 cores were never used (8-10 max). Compared to
reference w9.gzdio which was used before the patch.

Compression   Build Package
methodtime %size %
w9.gzdio  100%  100%
w7T.xzdio  69%   66%
w6T.xzdio  62%   67%
w5T.xzdio  55%   67%
w4T.xzdio  41%   70%
w3T.xzdio  31%   73%
w2T.xzdio  26%   75%
w1T.xzdio  24%   77%

Conclusion: we'd like to optimize rather for the build time, therefore
w1T.xzdio was picked. The package size was still smaller than the reference
size, and the build time was 4x faster (in this measurement 18m16 -> 4m26).
That makes a difference.

Change-Id: Iabb532628d38a2d5091fa41fd08bfee69007d0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128800
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index ecddeb395712..495366823604 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1193,7 +1193,7 @@ sub set_autoprovreq_in_specfile
 close (FINDREQUIRES);
 }
 
-$autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define 
_binary_payload w9.gzdio\n";
+$autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define 
_binary_payload w1T.xzdio\n";
 
 for ( my $i = 0; $i <= $#{$changefile}; $i++ )
 {
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index d4858842b8e9..fe79397b3d2d 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -32,7 +32,7 @@ Conflicts: %pkgprefix-mandriva-menus
 BuildArch: noarch
 AutoReqProv: no
 %define _binary_filedigest_algorithm 1
-%define _binary_payload w9.gzdio
+%define _binary_payload w1T.xzdio
 
 %define gnome_dir /usr

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild svx/Library_svx.mk svx/util sw/Library_sw.mk sw/util

2021-12-20 Thread Jan-Marek Glogowski (via logerrit)

 solenv/bin/createcomponent.xslt   |   10 ++---
 solenv/bin/optionalimplementations.xslt   |   21 +++
 solenv/gbuild/ComponentTarget.mk  |   47 ++
 solenv/gbuild/Library.mk  |   14 +++
 solenv/gbuild/extensions/post_GbuildToJson.mk |1 
 svx/Library_svx.mk|2 +
 svx/util/svx.component|4 +-
 svx/util/svx.component.crashreport|7 +++
 sw/Library_sw.mk  |2 +
 sw/util/sw.component  |8 ++--
 sw/util/sw.component.mailmerge|8 
 11 files changed, 107 insertions(+), 17 deletions(-)

New commits:
commit 379b685730ca7adb3b8d1905c73a2c3df1d31799
Author: Jan-Marek Glogowski 
AuthorDate: Wed Dec 15 15:37:58 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Dec 21 00:20:07 2021 +0100

Filter optional component implementations by name

Instead of trying to make up BUILD_TYPE items to match complex
build conditions and then patch the component file with it, filter
the component files based on the unique implementation name and
an  tag. Currently these optional implementations are
grouped in external files with an identifier.
Originally the optional implementations were automatically iden-
tified by adding them to any external file, but this behavior is
too easy to get wrong. Even better: if need arrises, one can now
easily implement a feature to add implementation names directly
using gbuild calls, instead of grouped files.

The basic mechanism is to collect all optional implementations,
remove the needed ones from that list and then filter-out all
implementations not needed (AKA the rest of the list).
It's no problem to have the same optional implementations
selected in multiple files. This is especially used by the
vcl.common component in a later patch.

For gbuild this adds gb_Library_add_componentimpl. The component
parameter for the call is explicitly omitted, so you must call
gb_Library_set_componentfile before selecting any optional
implementations. The strict naming is also enforced by appending
the identifier to the component file name.

This replaces commit 65c0887bca2909b2046eb5aa4aaace0cc320c3f2
("Allow for conditional parts of component files").

Change-Id: I0261cadce8bdfebb6b3ec96669ec378a5c1d9699
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126891
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt
index d33641cc62fa..ee60221dfcdd 100644
--- a/solenv/bin/createcomponent.xslt
+++ b/solenv/bin/createcomponent.xslt
@@ -23,7 +23,7 @@
 xmlns:uc="http://openoffice.org/2010/uno-components";>
   
   
-  
+  
   
   
 
@@ -36,15 +36,16 @@
   
 
   
-  
-
-
+  
+
   
 
+
 
   
 
   
+  
   
 
   
@@ -60,7 +61,6 @@
   
 
   
-  
   
 
   
diff --git a/solenv/bin/optionalimplementations.xslt 
b/solenv/bin/optionalimplementations.xslt
new file mode 100644
index ..fa8ca5b1c7ff
--- /dev/null
+++ b/solenv/bin/optionalimplementations.xslt
@@ -0,0 +1,21 @@
+
+
+http://www.w3.org/1999/XSL/Transform";
+xmlns="http://openoffice.org/2010/uno-components";
+xmlns:uc="http://openoffice.org/2010/uno-components";>
+
+  
+
+  
+
+  
+
+
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 774dd1a7f2e9..9a33f1aa46b7 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -19,9 +19,19 @@
 
 gb_ComponentTarget__ALLCOMPONENTS :=
 
-gb_ComponentTarget_XSLTCOMMANDFILE := $(SRCDIR)/solenv/bin/createcomponent.xslt
+gb_ComponentTarget_XSLT_CREATE_COMPONENT := 
$(SRCDIR)/solenv/bin/createcomponent.xslt
+gb_ComponentTarget_XSLT_DUMP_OPTIONALS := 
$(SRCDIR)/solenv/bin/optionalimplementations.xslt
 gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
 
+# Some comment on the prerequisite handling for gb_ComponentTarget__command:
+# The whole setup feels - once again - much more complicated then it should 
be; for an IMHO simple task.
+# We can't just add all the $(call gb_ComponentTarget_get_target,%).* target 
commands to gb_ComponentTarget__command,
+# because $(shell cat $(1).filtered) is then evaluated too early, cat'ing a 
non-existing file.
+# Same happens if you add them to a gb_ComponentTarget__pre_command, run 
before the gb_ComponentTarget__command.
+# The various other "macros" add new rules to "expand" the pattern rules with 
normal rules and prerequisites.
+# As a result, the files from the pattern rules aren't cleaned up 
automagically, which I consider a plus point.
+# So the intermediate files must be explicitly added to $(call 
gb_ComponentTarget_get_clean_target,%).
+
 # In the DI

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild svx/Library_svx.mk svx/util sw/Library_sw.mk sw/util

2021-12-13 Thread Stephan Bergmann (via logerrit)

 solenv/bin/createcomponent.xslt  |   11 +++
 solenv/gbuild/ComponentTarget.mk |3 ++-
 solenv/gbuild/Library.mk |6 --
 svx/Library_svx.mk   |5 +
 svx/util/crashreport.component   |   26 --
 svx/util/svx.component   |5 +
 sw/Library_sw.mk |5 +
 sw/util/sw.component |   10 ++
 sw/util/sw_mm.component  |   29 -
 9 files changed, 30 insertions(+), 70 deletions(-)

New commits:
commit 65c0887bca2909b2046eb5aa4aaace0cc320c3f2
Author: Stephan Bergmann 
AuthorDate: Wed Dec 8 22:53:44 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 14 07:38:05 2021 +0100

Allow for conditional parts of component files

1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from 
built
components" had moved parts of svx/util/svx.component and 
sw/util/sw.component
into additional, conditionally included component files (and which this 
commit
moves back into the original component files).  But that lead to multiple
 elements for a single library in service rdb files, which was
unfortunate for several reasons:  For one, while the code in
cppuhelper/source/servicemanager.cxx happened to support that, it was not
guaranteed to support it, so this relied on an implementation detail of that
code.  And for another, for that to work, all the component files for a
library had to provide identical environment, loader, and prefix (if any)
attributes, but which was not verified and thus was brittle.

Instead, introduce a CONDITION attribute for the  elements 
in
the source component files, which decides whether or not such 

elements are passed through (after dropping the CONDITION attribute) into 
the
processed component files (in workdir/ComponentTarget/).  (The attribute
is spelled all-uppercase to make it more obvious that it is special syntax 
that
is not simply passed through to the output component file.)  For now, such a
CONDITION attribute must have a value that matches BUILD_TYPE:x for some
feature x in $(BUILD_TYPE), but the syntax can be extended if the need 
arises.

(gb_Library_set_componentfiles is thus no longer needed and has been removed
again.)

Change-Id: I360cf4cc0f3a2a738113d430891500715a8fe3a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126560
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt
index 4e20a2db1901..d33641cc62fa 100644
--- a/solenv/bin/createcomponent.xslt
+++ b/solenv/bin/createcomponent.xslt
@@ -23,6 +23,7 @@
 xmlns:uc="http://openoffice.org/2010/uno-components";>
   
   
+  
   
   
 
@@ -35,6 +36,15 @@
   
 
   
+  
+
+
+  
+
+
+  
+
+  
   
 
   
@@ -50,6 +60,7 @@
   
 
   
+  
   
 
   
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 8aef599dc59a..8c4ef55bbad1 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -32,7 +32,8 @@ $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME 
set at component targ
mkdir -p $(dir $(1)) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
--stringparam uri '$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' \
-   --stringparam cppu_env $(CPPU_ENV) -o $(1) \
+   --stringparam cppu_env $(CPPU_ENV) \
+   --stringparam features '$(patsubst 
%,(BUILD_TYPE:%),$(BUILD_TYPE))' -o $(1) \
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(COMPONENTSOURCE)
 endef
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index df42c047f846..19d77bcd29ff 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -148,12 +148,6 @@ $(call 
gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 
 endef
 
-# call gb_Library_set_componentfiles,library,componentfiles,rdb
-define gb_Library_set_componentfiles
-$(foreach comp,$(2),$(call gb_Library_set_componentfile,$(1),$(comp),$(3)))
-
-endef
-
 gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1))
 
 gb_Library__get_componentprefix = \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index c11aac85071c..efb5a6e1b031 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -19,10 +19,7 @@
 
 $(eval $(call gb_Library_Library,svx))
 
-$(eval $(call gb_Library_set_componentfiles,svx, \
-$(call gb_Helper_optional,BREAKPAD,svx/util/crashreport) \
-svx/util/svx \
-,services))
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx,services))
 
 $(eval $(call gb_Library_set_include,svx,\
 -I$(SRCDIR)/svx/inc \
diff --git a/svx/util/crashreport.component b/svx/util/crashreport.component
deleted file m

[Libreoffice-commits] core.git: solenv/bin

2021-12-06 Thread Jan-Marek Glogowski (via logerrit)

 solenv/bin/concat-deps.c |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 4415d2410cae282da8f8970c393561ec67fc5171
Author: Jan-Marek Glogowski 
AuthorDate: Sat Dec 4 07:16:58 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 6 11:24:06 2021 +0100

concat-deps: ignore /./ segments in input paths

concat-deps detects relative path segments (AKA /../) and
removes these in cancel_relative(...) to save space (by removing
the preceding path segment from the output path). But that logic
doesn't account for preceding /./ segments, resulting in paths
to non-existing files. This then resulted in mysterious, unneeded
compiling of seemingly unchanged files for my incremental
cross-toolset builds.

I actually assumed some error in my complex gbuild static changes,
which are already driving me crazy...

"make -d" showed these wrong paths, but inspecting the ".d" for
the actual files (from gcc output), they were ok; took me a while
to realize the problem were LO's concat-dep files for libraries.

But instead of complicating cancel_relative(), this just jumps
over /./ segments in the input path. cancel_relative() works on
the &cursor_out copy anyway.

Change-Id: I2a8ecd04fdfa790859668d690a102cfb156aa649
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126345
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a9e433ebe88e..fd128f6e3e4c 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -944,6 +944,14 @@ static int process(struct hash* dep_hash, char* fn)
 }
 else if(*cursor == '/')
 {
+if(cursor + 2 < end)
+{
+if(!memcmp(cursor, "/./", 3))
+{
+cursor += 2;
+continue;
+}
+}
 if(cursor + 3 < end)
 {
 if(!memcmp(cursor, "/../", 4))
@@ -1008,6 +1016,7 @@ static int process(struct hash* dep_hash, char* fn)
 *cursor_out++ = *cursor++;
 }
 }
+
 /* just in case the file did not end with a \n, there may be a pending 
rule */
 if(base < cursor_out)
 {

[Libreoffice-commits] core.git: solenv/bin

2021-12-03 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee5ed29991bf9dea8313d7c22560b26a56af
Author: Caolán McNamara 
AuthorDate: Fri Dec 3 19:43:03 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 3 21:33:07 2021 +0100

ofz#41602 fix more build failure

[LNK] Executable/fodsfuzzer

workdir/LinkTarget/StaticLibrary/libfuzzer_calc.a(native-calc.o):native-calc.cxx:lo_get_constructor_map::map:
 error: undefined reference to 
'com_sun_star_comp_framework_SoundHandler_get_implementation'
clang-14: error: linker command failed with exit code 1 (use -v to see 
invocation)

Change-Id: Id22e52491bf95eff7b72ac1fc9e2c63f3dfb30b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126332
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 63d8d33a2066..d1d36140f0ab 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -613,7 +613,7 @@ calc_factory_list = [
 
 calc_constructor_list = [
 # avmedia/util/avmedia.component
-"com_sun_star_comp_framework_SoundHandler_get_implementation",
+("com_sun_star_comp_framework_SoundHandler_get_implementation", "#if 
HAVE_FEATURE_AVMEDIA"),
 # sc/util/sc.component
 "ScPanelFactory_get_implementation",
 "Calc_SpreadsheetDocument_get_implementation",

[Libreoffice-commits] core.git: solenv/bin

2021-11-16 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/pathanalyzer.pm |4 ++--
 solenv/bin/modules/pre2par/pathanalyzer.pm   |5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f007f32958a7c875db6cb2e79c09ab0965477a2a
Author: Mike Kaganski 
AuthorDate: Wed Nov 17 01:17:17 2021 +0300
Commit: Mike Kaganski 
CommitDate: Wed Nov 17 06:15:17 2021 +0100

tdf#145711: filename may be 1-character, and must not contain path separator

Surfaced after 6ea7ca45782a7e1b46e18e994534ec0a7c71951b

Change-Id: I4975f51a7a0ca73eccfd17338abc122254b57113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125338
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/pathanalyzer.pm 
b/solenv/bin/modules/installer/pathanalyzer.pm
index 7f3f68a4edb2..312042acb1a0 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -47,7 +47,7 @@ sub make_absolute_filename_to_relative_filename
 
 if ( $installer::globals::isunix )
 {
-if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ )
+if ( $$longfilenameref =~ /^.*\/(?=\S)([^\/]+)(?<=\S)/ )
 {
 $$longfilenameref = $1;
 }
@@ -56,7 +56,7 @@ sub make_absolute_filename_to_relative_filename
 if ( $installer::globals::iswin )
 {
 # Either '/' or '\'. It would be possible to use 
$installer::globals::separator.
-if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ )
+if ( $$longfilenameref =~ /^.*[\/\\](?=\S)([^\/\\]+)(?<=\S)/ )
 {
 $$longfilenameref = $1;
 }
diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm 
b/solenv/bin/modules/pre2par/pathanalyzer.pm
index 0aefcd1b43c8..4d2eb31ae073 100644
--- a/solenv/bin/modules/pre2par/pathanalyzer.pm
+++ b/solenv/bin/modules/pre2par/pathanalyzer.pm
@@ -48,7 +48,7 @@ sub make_absolute_filename_to_relative_filename
 
 if ( $pre2par::globals::isunix )
 {
-if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ )
+if ( $$longfilenameref =~ /^.*\/(?=\S)([^\/]+)(?<=\S)/ )
 {
 $$longfilenameref = $1;
 }
@@ -56,7 +56,8 @@ sub make_absolute_filename_to_relative_filename
 
 if ( $pre2par::globals::iswin )
 {
-if ( $$longfilenameref =~ /^.*\\(\S.+\S?)/ )
+# Either '/' or '\'.
+if ( $$longfilenameref =~ /^.*[\/\\](?=\S)([^\/\\]+)(?<=\S)/ )
 {
 $$longfilenameref = $1;
 }

[Libreoffice-commits] core.git: solenv/bin

2021-11-08 Thread Andras Timar (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fb9bf718121d92b5e1d14218267d4d4bb5b4cb6
Author: Andras Timar 
AuthorDate: Fri Oct 22 21:47:31 2021 +0200
Commit: Andras Timar 
CommitDate: Mon Nov 8 10:42:15 2021 +0100

hdiutil flatten/unflatten was removed in macOS 11

Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124825
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e134eb4185ad..b1d3acdf67ac 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -457,7 +457,7 @@ sub create_package
 my $megabytes = 1500;
 $megabytes = 2000 if $ENV{'ENABLE_DEBUG'};
 $systemcall = "cd $localtempdir && hdiutil create -megabytes 
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" 
-format UDBZ";
-if (( $ref ne "" ) && ( $$ref ne "" )) {
+if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep 
unflatten") == 0) {
 $systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o 
$archive && hdiutil flatten $archive &&";
 }
 }

[Libreoffice-commits] core.git: solenv/bin

2021-11-04 Thread Hossein (via logerrit)

 solenv/bin/mkdocs.sh|2 +-
 solenv/bin/mkdocs_portal.sh |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1edae86c729b66813aa81b531e196f493b766571
Author: Hossein 
AuthorDate: Thu Nov 4 09:06:18 2021 +0100
Commit: Ilmari Lauhakangas 
CommitDate: Thu Nov 4 10:11:20 2021 +0100

Change git.freedesktop.org -> git.libreoffice.org

Replace git.freedesktop.org with git.libreoffice.org in the docs
gernerating scripts. The output will be visible at the
https://docs.libreoffice.org or the local docs folder.
This completes the "Use LO repo for mkdocs git link" patch
e62c4241093409583c913165ddc1e4c300c6218c

Change-Id: Id38d86821cd1c4edb16edd760087c8361e221de3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124674
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index b339acbc3cff..b61d53a29c06 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -75,7 +75,7 @@ function proc_text {
   # Headings: == bleh ==
   # Paragraphs: \n\n
   sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
+  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
   | sed -re ' s/\[([^]]+)\]/\1<\/a>/g' \
   | sed -re ' s/([^=]+)/\1<\/h4>/g' \
   | sed -re ' s/===([^=]+)===/\1<\/h3>/g' \
diff --git a/solenv/bin/mkdocs_portal.sh b/solenv/bin/mkdocs_portal.sh
index 6c3dc8ae3a9c..8fa120a77286 100755
--- a/solenv/bin/mkdocs_portal.sh
+++ b/solenv/bin/mkdocs_portal.sh
@@ -80,7 +80,7 @@ function proc_text
 # Headings: == bleh ==
 # Paragraphs: \n\n
 sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-| sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
+| sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
 | sed -re ' s/\[([^]]+)\]/\1<\/a>/g' \
 | sed -re ' s/([^=]+)/\1<\/h4>/g' \
 | sed -re ' s/===([^=]+)===/\1<\/h3>/g' \
@@ -90,7 +90,7 @@ function proc_text
 }
 
 function proc_text_markdown {
-  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 }
 
 # generate entry page

[Libreoffice-commits] core.git: solenv/bin

2021-10-26 Thread Hossein (via logerrit)

 solenv/bin/mkdocs.sh|8 
 solenv/bin/mkdocs_portal.sh |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit e62c4241093409583c913165ddc1e4c300c6218c
Author: Hossein 
AuthorDate: Tue Oct 26 12:40:50 2021 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Tue Oct 26 15:09:33 2021 +0200

Use LO repo for mkdocs git links

* Use git.libreoffice.org instead of cgit.freedesktop.org for the git
  links generated by mkdocs scripts

Change-Id: Iac6e9ea1b73dcd0155786798c0ec162865299ada
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124186
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 4b70787787e8..b339acbc3cff 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -54,7 +54,7 @@ function footer {
 
 
   
-Generated by Libreoffice https://cgit.freedesktop.org/libreoffice/core/plain/solenv/bin/mkdocs.sh";>Module
 Description Tool
+Generated by Libreoffice https://git.libreoffice.org/core/+/refs/heads/master/solenv/bin/mkdocs.sh";>Module
 Description Tool
 Last updated:
 EOF
 LANG= date >> $output
@@ -75,7 +75,7 @@ function proc_text {
   # Headings: == bleh ==
   # Paragraphs: \n\n
   sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g' \
+  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
   | sed -re ' s/\[([^]]+)\]/\1<\/a>/g' \
   | sed -re ' s/([^=]+)/\1<\/h4>/g' \
   | sed -re ' s/===([^=]+)===/\1<\/h3>/g' \
@@ -243,7 +243,7 @@ for module_name in *; do
   # write detailed module content
   header "$module_name" "LibreOffice » 
${module_name}" "$BASE_OUTPUT/${module_name}.html"
   text="View module in:"
-  text="${text}   https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>cgit"
+  text="${text}   https://git.libreoffice.org/core/+/refs/heads/master/${module_name}\";>git"
   if $(echo $INPUT_PROJECTS | grep -q $module_name); then
 text="${text}   Doxygen"
   fi
@@ -271,7 +271,7 @@ if [ ${#empty_modules[*]} -gt 10 ]; then
 if [[ "$module_name" =~ 
^(autom4te.cache|dictionaries|docs|helpcompiler|helpcontent2|include|instdir|lo|translations|workdir)$
 ]]; then
   continue
 fi
-echo -e "https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
+echo -e "https://git.libreoffice.org/core/+/refs/heads/master/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
   done
   echo -e "\n" >> "$BASE_OUTPUT/index.html"
 fi
diff --git a/solenv/bin/mkdocs_portal.sh b/solenv/bin/mkdocs_portal.sh
index 867198fa8c59..6c3dc8ae3a9c 100755
--- a/solenv/bin/mkdocs_portal.sh
+++ b/solenv/bin/mkdocs_portal.sh
@@ -80,7 +80,7 @@ function proc_text
 # Headings: == bleh ==
 # Paragraphs: \n\n
 sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-| sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g' \
+| sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 \
 | sed -re ' s/\[([^]]+)\]/\1<\/a>/g' \
 | sed -re ' s/([^=]+)/\1<\/h4>/g' \
 | sed -re ' s/===([^=]+)===/\1<\/h3>/g' \
@@ -90,7 +90,7 @@ function proc_text
 }
 
 function proc_text_markdown {
-  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 }
 
 # generate entry page
@@ -117,7 +117,7 @@ for module_name in *; do
 # write detailed module content
 header "$module_name" "LibreOffice 
» ${module_name}" "$BASE_OUTPUT/${module_name}.html"
 text="View module in:"
-text="${text}   https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>cgit"
+text="${text}   https://git.libreoffice.org/core/+/refs/heads/master/${module_name}\";>git"
 if $(echo $INPUT_PROJECTS | grep -q $module_name); then
 text="${text}   Doxygen"
 fi
@@ -145,7 +145,7 @@ if [ ${#empty_modules[*]} -gt 10 ]; then
 then
 continue
 fi
-echo -e "https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
+echo -e "https://git.libreoffice.org/core/+/refs/heads/master/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
 done
 echo -e "\n" >> "$BASE_OUTPUT/index.html"
 fi

[Libreoffice-commits] core.git: solenv/bin

2021-10-04 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 717dd57000212dda5f4ff5b167d3f3b0f498a98e
Author: Tor Lillqvist 
AuthorDate: Mon Oct 4 14:45:10 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 4 17:31:01 2021 +0200

We need com_sun_star_animations_AnimatePhysics_get_implementation

Fix crash in iOS app reported at
https://github.com/CollaboraOnline/online/issues/3321 .

Change-Id: I1b5fedb0d5db84cc3f6a75b52c29a39ebe7a6ed9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123046
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123047
Tested-by: Jenkins

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e9f2ebd3fab1..63d8d33a2066 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,8 @@ core_factory_list = [
 ]
 
 core_constructor_list = [
+# animations/source/animcore/animcore.component
+"com_sun_star_animations_AnimatePhysics_get_implementation",
 # basic/util/sb.component
 ("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if 
HAVE_FEATURE_SCRIPTING"),
 ("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild

2021-10-03 Thread Caolán McNamara (via logerrit)

 solenv/bin/dummy.po  |   18 --
 solenv/gbuild/AllLangMoTarget.mk |8 +---
 2 files changed, 1 insertion(+), 25 deletions(-)

New commits:
commit cb517e21f6e3728199e3ecbaf9a31fdf5316bd46
Author: Caolán McNamara 
AuthorDate: Sat Oct 2 21:42:08 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 3 15:36:15 2021 +0200

TODO: remove missing .po support when writerfilter .po files exist

Change-Id: I8f20845fcb1fbd598cf1c1c8c8ff20b3e9c37bfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123012
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/dummy.po b/solenv/bin/dummy.po
deleted file mode 100644
index a05e526b8b98..
--- a/solenv/bin/dummy.po
+++ /dev/null
@@ -1,18 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 15:54+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index e1fbdc732f7c..f48bbca85364 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -32,7 +32,6 @@ $(call gb_MoTarget_get_clean_target,%) :
$(call gb_MoTarget_get_target,$*) \
$(call gb_MoTarget_get_install_target,$*))
 
-#to-do, remove missing .po support when writerfilter .po files exist
 $(call gb_MoTarget_get_target,%) : \
$(gb_Helper_MISCDUMMY) \
$(call gb_ExternalExecutable_get_dependencies,python)
@@ -40,12 +39,7 @@ $(call gb_MoTarget_get_target,%) : \
$(call gb_Trace_StartRange,$*,MO )
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   if test -e 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po; then \
-   $(MSGUNIQ) --force-po 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
-   else \
-   echo missing 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po && \
-   $(MSGUNIQ) --force-po $(SRCDIR)/solenv/bin/dummy.po | 
$(MSGFMT) - -o $@; \
-   fi)
+   $(MSGUNIQ) --force-po 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@; \
$(call gb_Trace_EndRange,$*,MO )
 
 #$(info $(call gb_MoTarget_get_target,$(1)))

[Libreoffice-commits] core.git: solenv/bin

2021-09-28 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit eed05aae4a308224ffde7e00d347830f80bbefef
Author: Caolán McNamara 
AuthorDate: Tue Sep 28 12:15:24 2021 +0100
Commit: Tor Lillqvist 
CommitDate: Tue Sep 28 13:48:49 2021 +0200

com_sun_star_comp_svx_CharacterSpacingToolBoxControl is duplicated

com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation
is already listed under svx/util/svx.component

Change-Id: I55fd0e2aff051b62b33d5b257ced8e934c9053d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122770
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9e035ddc1b87..e9f2ebd3fab1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -385,7 +385,6 @@ core_constructor_list = [
 # svx/util/svxcore.component
 "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
 "com_sun_star_comp_Draw_GraphicExporter_get_implementation",
-"com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation",
 "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
 "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
 "com_sun_star_comp_svx_FrameToolBoxControl_get_implementation",

[Libreoffice-commits] core.git: solenv/bin

2021-09-24 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |   56 +++---
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 628f0756f1b8945cfb4d5f848125c269a2233ba1
Author: Caolán McNamara 
AuthorDate: Fri Sep 24 13:45:35 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 24 17:59:37 2021 +0200

disable these for fuzzing as well as !HAVE_FEATURE_DBCONNECTIVITY

Change-Id: I90d9680590c9f9e36fdafaca9c98955a03654da7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122589
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 4d68d5fa5e16..8efa9c19936c 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -162,34 +162,34 @@ core_constructor_list = [
 # filter/source/storagefilterdetect/storagefd.component
 "filter_StorageFilterDetect_get_implementation",
 # forms/util/frm.component
-("com_sun_star_comp_forms_FormOperations_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-
("com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation",
 "#if HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_comp_form_ORichTextControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_comp_forms_ORichTextModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_comp_forms_OScrollBarModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_comp_forms_OSpinButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_Model_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OButtonControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OCheckBoxControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OCheckBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OComboBoxControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OComboBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_ODateControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_ODateModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OEditControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OEditModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OFixedTextModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OFormsCollection_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OGridControlModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OGroupBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OListBoxControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_OListBoxModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_ONumericModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_ORadioButtonControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_ORadioButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
-("com_sun_star_form_XForms_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY"),
+("com_sun_star_comp_forms_FormOperations_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+
("com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementation",
 "#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_comp_form_ORichTextControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_comp_forms_ORichTextModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_comp_forms_OScrollBarModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_comp_forms_OSpinButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_form_Model_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_form_OButtonControl_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com_sun_star_form_OButtonModel_get_implementation", "#if 
HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS"),
+("com

[Libreoffice-commits] core.git: solenv/bin

2021-08-07 Thread Eike Rathke (via logerrit)

 solenv/bin/modules/installer/worker.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51406e88a93008458cf4a7d4f84aa0b169cb7d0b
Author: Eike Rathke 
AuthorDate: Sat Aug 7 18:16:59 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat Aug 7 19:43:14 2021 +0200

Create destination directory also for non-empty sourcepath directory

Do not attempt to copy anything. This can happen with
instdir/share/extensions being populated from some build (e.g. by
dictionaries) but no extension to be installed.

The result was
ERROR: Can't copy file: /build/core/instdir/share/extensions -> 
/build/usr/opt/core/lib/libreoffice/share/extensions
Is a directory at /build/core/solenv/bin/modules/installer/worker.pm line 
350.

and the copy() created the destination as 0-length file instead.

The recent changes not copying extensions/packages.txt anymore and
related may have triggered this:

6c487d2d7e8aa5cdef55cbd7bc78058184671d82 Fix and simplify "any bundled 
extensions installed" check
626050e86b7d5ca0c3bfc265cc33ce8e9d1bf195 gb_Package_Package must specify a 
directory
f267340d300da6318435ed1b2ae48b9f4275e2c4 Remove unused 
$(LIBO_SHARE_FOLDER)/extensions/package.txt

Change-Id: I93c1b0867bf234255fdef9d31c447b9b20011e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120164
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/solenv/bin/modules/installer/worker.pm 
b/solenv/bin/modules/installer/worker.pm
index dcdfdce7d28e..8da6b14ba7fe 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -343,7 +343,7 @@ sub install_simple ($$)
 if ( -l "$sourcepath" ) {
 symlink (readlink ("$sourcepath"), "$destdir$destination") || die 
"Can't symlink $destdir$destination -> " . readlink ("$sourcepath") . "$!";
 }
-elsif ( -d $sourcepath && 
installer::systemactions::is_empty_dir($sourcepath) ) {
+elsif ( -d $sourcepath ) {
 `mkdir -p "$destdir$destination"`;
 }
 else {

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild

2021-07-26 Thread Luboš Luňák (via logerrit)

 solenv/bin/concat-deps.c |   10 ++
 solenv/gbuild/Executable.mk  |2 
 solenv/gbuild/Library.mk |2 
 solenv/gbuild/LinkTarget.mk  |  136 ++-
 solenv/gbuild/StaticLibrary.mk   |2 
 solenv/gbuild/TargetLocations.mk |6 +
 6 files changed, 155 insertions(+), 3 deletions(-)

New commits:
commit 2fb06e18ae6fcf4813d98aa3fda0bcd1c9b9a7d0
Author: Luboš Luňák 
AuthorDate: Fri Jul 16 18:39:17 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Jul 26 13:32:16 2021 +0200

add gbuild support for ObjC/C++ sources from tarballs

Change-Id: I49632bf9dedf9603449fb5bc9e6a819586258b05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119355
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 155328bf9360..9cd6b63c4374 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1076,6 +1076,16 @@ static int process(struct hash* dep_hash, char* fn)
 created_line = generate_phony_line(src_relative, "o");
 rc = generate_phony_file(fn, created_line);
 }
+else if(strncmp(src_relative, "GenObjCxxObject/", 16) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
+else if(strncmp(src_relative, "GenObjCObject/", 14) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
 else if(strncmp(src_relative, "CxxClrObject/", 13) == 0)
 {
 created_line = generate_phony_line(src_relative, "o");
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 70879bb9eb8c..ef393cb33949 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -111,6 +111,8 @@ gb_Executable_add_scanners = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(
 gb_Executable_add_exception_objects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_generated_cobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_generated_exception_objects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Executable_add_generated_objcobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Executable_add_generated_objcxxobjects = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_cflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_cxxflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Executable_add_objcflags = $(call 
gb_Executable__forward_to_Linktarget,$(0),$(1),$(2),$(3))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index f8a08f915d35..a4f1fe7b376a 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -199,6 +199,8 @@ gb_Library_add_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0)
 gb_Library_add_x64_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_cobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_generated_exception_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Library_add_generated_objcobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
+gb_Library_add_generated_objcxxobjects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_use_library_objects = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_grammar = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
 gb_Library_add_grammars = $(call 
gb_Library__forward_to_Linktarget,$(0),$(1),$(2),$(3))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d9d6d07a1349..60be7cfb68cc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -166,9 +166,9 @@ endef
 # Overview of dependencies and tasks of LinkTarget
 #
 # target  task depends on
-# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject 
GenCxxClrObject
+# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject GenObjCObject 
GenObjCxxObject CxxClrObject GenCxxClrObject
 #  LinkTarget/headers
-# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep CxxC

[Libreoffice-commits] core.git: solenv/bin

2021-06-10 Thread Caolán McNamara (via logerrit)

 solenv/bin/add-modelines |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 76e2c20876319cbeea24d40104fac1ba7d6b5278
Author: Caolán McNamara 
AuthorDate: Thu Jun 10 09:14:21 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 10 11:46:14 2021 +0200

update add-modelines to the TEMPLATE.SOURCECODE.HEADER pattern

to match

commit f75cd22118a58c8a8827723c890885a500562465
Date:   Tue Nov 8 14:51:20 2016 +0200

Add fill-column: 100 to the Emacs mode line

and

commit 6a0081642633eb406059295b90fd0c9b0cd1130f
Date:   Wed May 18 20:00:00 2016 +0200

add Vim C-indent options to C/C++ template modeline

changes to TEMPLATE.SOURCECODE.HEADER

Change-Id: Ic323cd7dcce9ece23325a23160b0936819bb634b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116962
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
index 09c8d88b16e8..3fa358cc2909 100755
--- a/solenv/bin/add-modelines
+++ b/solenv/bin/add-modelines
@@ -32,8 +32,8 @@ set -f
 set -o posix
 
 # Change these to taste
-FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; 
c-basic-offset: 4 -*- */'
-LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
+FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; 
c-basic-offset: 4; fill-column: 100 -*- */'
+LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */'
 SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.m *.mm *.idl *.src *.hrc'
 
 # Set defaults (don't change these)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-06-03 Thread merttumer (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 437facda5898b476f6b4a6baaf4c3e22c5eb1e35
Author: merttumer 
AuthorDate: Thu Apr 29 06:20:19 2021 +
Commit: Mert Tumer 
CommitDate: Fri Jun 4 07:47:08 2021 +0200

Add missing FilterOptionsDialog constructor for android

Change-Id: I8bdd44e1b2f45a6d62e6b7220762da62787e04fa
Signed-off-by: merttumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114830
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116295

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0cbb5cc9cc8d..4316bb233fbe 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -565,6 +565,7 @@ edit_constructor_list = [
 "Calc_XMLOasisMetaExporter_get_implementation",
 "Calc_XMLOasisSettingsExporter_get_implementation",
 "Calc_XMLOasisStylesExporter_get_implementation",
+"Calc_FilterOptionsDialog_get_implementation",
 # starmath/util/sm.component
 "Math_XMLContentExporter_get_implementation",
 "Math_XMLOasisMetaExporter_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-05-27 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/remover.pm|8 -
 solenv/bin/modules/par2script/converter.pm |   64 -
 solenv/bin/modules/par2script/parameter.pm |1 
 solenv/bin/modules/par2script/remover.pm   |   24 ---
 solenv/bin/modules/par2script/systemactions.pm |  170 -
 solenv/bin/modules/pre2par/files.pm|   10 -
 solenv/bin/modules/pre2par/parameter.pm|   14 +-
 solenv/bin/modules/pre2par/remover.pm  |   24 ---
 solenv/bin/modules/pre2par/systemactions.pm|  111 
 solenv/bin/modules/pre2par/work.pm |   39 -
 solenv/bin/pre2par.pl  |6 
 11 files changed, 11 insertions(+), 460 deletions(-)

New commits:
commit a04bb13513ea64fef867365d6eb0264970d58182
Author: Christian Lohmaier 
AuthorDate: Thu May 27 15:40:41 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 27 19:10:19 2021 +0200

installer-code: remove some unused or pointless subs

of course just the very tip of the iceberg, but you gotta start
somewhere…

Change-Id: I24ef6a51ec70c70418368da54595637283055d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116255
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/remover.pm 
b/solenv/bin/modules/installer/remover.pm
index 1e088a63e0a1..426056eef37f 100644
--- a/solenv/bin/modules/installer/remover.pm
+++ b/solenv/bin/modules/installer/remover.pm
@@ -40,14 +40,6 @@ sub remove_leading_and_ending_quotationmarks
 $$stringref =~ s/\"\s*$//;
 }
 
-sub remove_leading_and_ending_slashes
-{
-my ( $stringref ) = @_;
-
-$$stringref =~ s/^\s*\///g;
-$$stringref =~ s/\/\s*$//g;
-}
-
 sub remove_ending_pathseparator
 {
 my ( $stringref ) = @_;
diff --git a/solenv/bin/modules/par2script/converter.pm 
b/solenv/bin/modules/par2script/converter.pm
index d8323f40dc37..43c3a751f14a 100644
--- a/solenv/bin/modules/par2script/converter.pm
+++ b/solenv/bin/modules/par2script/converter.pm
@@ -25,29 +25,6 @@ use par2script::remover;
 # Converter
 #
 
-sub convert_array_to_hash
-{
-my ($arrayref) = @_;
-
-my ($line, $key, $value);
-
-my %newhash = ();
-
-for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-{
-$line = ${$arrayref}[$i];
-
-if ( $line =~ /^\s*(\w+?)\s+(.*?)\s*$/ )
-{
-$key = $1;
-$value = $2;
-$newhash{$key} = $value;
-}
-}
-
-return \%newhash;
-}
-
 sub convert_stringlist_into_array_2
 {
 my ( $input, $separator ) = @_;
@@ -72,45 +49,4 @@ sub convert_stringlist_into_array_2
 return \@newarray;
 }
 
-sub convert_stringlist_into_array
-{
-my ( $includestringref, $separator ) = @_;
-
-my @newarray = ();
-my ($first, $last);
-
-$last = ${$includestringref};
-
-while ( $last =~ /^\s*(.+?)\s*\Q$separator\E\s*(.+)\s*$/)   # "$" for 
minimal matching
-{
-$first = $1;
-$last = $2;
-par2script::remover::remove_leading_and_ending_whitespaces(\$first);
-push(@newarray, $first);
-}
-
-par2script::remover::remove_leading_and_ending_whitespaces(\$last);
-push(@newarray, $last);
-
-return \@newarray;
-}
-
-#
-# The file name contains for some files "/". If this programs runs on
-# a windows platform, this has to be converted to "\".
-#
-
-sub convert_slash_to_backslash
-{
-my ($filesarrayref) = @_;
-
-my ($onefile, $filename);
-
-for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-{
-$onefile = ${$filesarrayref}[$i];
-$onefile->{'Name'} =~ s/\//\\/g;
-}
-}
-
 1;
diff --git a/solenv/bin/modules/par2script/parameter.pm 
b/solenv/bin/modules/par2script/parameter.pm
index 645b28255686..86416cd9e265 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -22,7 +22,6 @@ package par2script::parameter;
 use Cwd;
 use par2script::files;
 use par2script::globals;
-use par2script::systemactions;
 
 
 # Parameter Operations
diff --git a/solenv/bin/modules/par2script/remover.pm 
b/solenv/bin/modules/par2script/remover.pm
index 4625bf0b0405..8b40a8ff46f7 100644
--- a/solenv/bin/modules/par2script/remover.pm
+++ b/solenv/bin/modules/par2script/remover.pm
@@ -39,28 +39,4 @@ sub remove_leading_and_ending_comma
 $$stringref =~ s/\,\s*$//g;
 }
 
-sub remove_leading_and_ending_quotationmarks
-{
-my ( $stringref ) = @_;
-
-$$stringref =~ s/^\s*\"//g;
-$$stringref =~ s/\"\s*$//g;
-}
-
-sub remove_leading_and_ending_slashes
-{
-my ( $stringref ) = @_;
-
-$$stringref =~ s/^\s*\///g;
-$$stringref =~ s/\/\s*$//g;
-}
-
-sub remove_leading_and_ending_backslashes
-{
-my ( $stringref ) = @_;
-
-$$st

[Libreoffice-commits] core.git: solenv/bin

2021-05-19 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3f72d4d68817210ef6852e83d6d4bbdb540cea18
Author: Christian Lohmaier 
AuthorDate: Wed May 19 15:34:54 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed May 19 19:17:10 2021 +0200

mac packaging: don't throw away codesign output for langpacks

The change to use backticks to capture the output was already done for
the main package in 6c4cb4e7e0afce2989c9fe596fd74a35eece6206, this
change now also fixes it for the langpacks

Change-Id: I26dcfb56342b9c3fc7b9c93f7d586c5c899b7232
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115808
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 13dc81c0060a..e134eb4185ad 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -392,11 +392,12 @@ sub create_package
 chdir $localfrom;
 
 if ( $ENV{'MACOSX_CODESIGNING_IDENTITY'} ) {
-my @lp_sign = ('codesign', '--verbose', '--sign', 
$ENV{'MACOSX_CODESIGNING_IDENTITY'}, '--deep', $appfolder);
-if (system(@lp_sign) == 0) {
-$infoline = "Success: \"@lp_sign\" executed 
successfully!\n";
+my $lp_sign = "codesign --verbose --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --deep '$appfolder'" ;
+my $output = `$lp_sign 2>&1`;
+unless ($?) {
+$infoline = "Success: \"$lp_sign\" executed 
successfully!\n";
 } else {
-$infoline = "ERROR: Could not codesign the languagepack 
using \"@lp_sign\"!\n";
+$infoline = "ERROR: Could not codesign the languagepack 
using \"$lp_sign\"!\n$output\n";
 }
 push( @installer::globals::logfileinfo, $infoline);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-04-30 Thread Tomaž Vajngerl (via logerrit)

 solenv/bin/native-code.py |   41 ++---
 1 file changed, 38 insertions(+), 3 deletions(-)

New commits:
commit a52590d76b89dc75be2aa87f4287624c89f1e82f
Author: Tomaž Vajngerl 
AuthorDate: Fri Apr 30 22:01:24 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat May 1 03:03:16 2021 +0200

update native-code.py with services for vba scripts in Calc

Change-Id: I54eb60d3be2717c17daa6b7634ccee3e099cbb7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114932
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7238055883dd..0cbb5cc9cc8d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,9 @@ core_factory_list = [
 ]
 
 core_constructor_list = [
+# basic/util/sb.component
+("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if 
HAVE_FEATURE_SCRIPTING"),
+("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
 # UnoControls/util/ctl.component
 "stardiv_UnoControls_FrameControl_get_implementation",
 "stardiv_UnoControls_ProgressBar_get_implementation",
@@ -272,6 +275,19 @@ core_constructor_list = [
 ("i18npool_NumToTextUpper_zh_TW_get_implementation", "#if WITH_LOCALE_ALL 
|| WITH_LOCALE_zh"),
 # i18nsearch/sourceh/search/i18nsearch.component
 "i18npool_TextSearch_get_implementation",
+# io/source/io.component
+"io_Pump_get_implementation",
+"io_ODataInputStream_get_implementation",
+"io_ODataOutputStream_get_implementation",
+"io_OMarkableInputStream_get_implementation",
+"io_OMarkableOutputStream_get_implementation",
+"io_OObjectInputStream_get_implementation",
+"io_OObjectOutputStream_get_implementation",
+"io_OPipeImpl_get_implementation",
+"io_OAcceptor_get_implementation",
+"io_OConnector_get_implementation",
+"io_OTextInputStream_get_implementation",
+"io_OTextOutputStream_get_implementation",
 # linguistic/source/lng.component
 "linguistic_ConvDicList_get_implementation",
 "linguistic_DicList_get_implementation",
@@ -296,6 +312,13 @@ core_constructor_list = [
 "com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
 "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
 "com_sun_star_extensions_xml_sax_Writer_get_implementation",
+# scripting/util/scriptframe.component
+("scripting_BrowseNodeFactoryImpl_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
+("scripting_MasterScriptProvider_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
+("scripting_MasterScriptProviderFactory_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
+("scripting_ScriptingFrameworkURIHelper_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
+# scripting/source/basprov/basprov.component
+("scripting_BasicProviderImpl_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
 # sfx2/util/sfx.component
 "SfxDocumentMetaData_get_implementation",
 "com_sun_star_comp_office_FrameLoader_get_implementation",
@@ -406,6 +429,8 @@ core_constructor_list = [
 # ucb/source/ucp/ucphier1.component
 "ucb_HierarchyContentProvider_get_implementation",
 "ucb_HierarchyDataSource_get_implementation",
+# ucb/source/ucp/package/ucppkg1
+"ucb_package_ContentProvider_get_implementation",
 # unotools/util/utl.component
 "unotools_ServiceDocument_get_implementation",
 "unotools_OTempFileService_get_implementation",
@@ -590,6 +615,16 @@ calc_constructor_list = [
 # sc/util/scfilt.component
 "com_sun_star_comp_oox_xls_ExcelFilter_get_implementation",
 "com_sun_star_comp_oox_xls_FormulaParser_get_implementation",
+# sc/util/vbaobj.component
+("Calc_ScVbaApplication_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaEventsHelper_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaGlobals_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaHyperlink_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaTextFrame_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWindow_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWorkbook_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWorksheet_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaRange_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
 # scaddins/source/analysis/analysis.component
 "scaddins_AnalysisAddIn_get_implementation",
 # scaddins/source/datefunc/date.component
@@ -601,6 +636,9 @@ calc_constructor_list = [
 # svl/util/svl.component
 
"com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation",
 
"com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation",
+# scripting/source/vbaevents/vbaevents.component
+("ooo_vba_VBAToOOEventDesc_get_implementation", "#if 
HAVE_FEATURE_SCRIPTING"),
+("

[Libreoffice-commits] core.git: solenv/bin

2021-04-23 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 95b6907d8e49729b4c47cf637049cc91b45c838e
Author: Michael Weghorn 
AuthorDate: Fri Apr 23 09:59:36 2021 +0200
Commit: Michael Weghorn 
CommitDate: Fri Apr 23 14:59:33 2021 +0200

native-code: Only include pdfimport ctors if PDF import enabled

commit 3dba2e4a325fa0fdfbbedb0ffc1fcf678bfcbc94
Date:   Thu Mar 25 12:23:43 2021 +0200

Include the pdfimport library constructor in the mobile apps if 
enabled

had unconditionally included the constructors, so e.g. a
'--disable-pdfimport' Android build would fail due to
missing symbols.

Change-Id: Icbf92dd226ef9a3104c37610ee56416c8205b7a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114533
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b15e6f27189b..7238055883dd 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -665,11 +665,11 @@ draw_constructor_list = [
 # writerperfect/source/draw/wpftdraw.component
 "com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
 # sdext/source/pdfimport/pdfimport.component
-"sdext_PDFIHybridAdaptor_get_implementation",
-"sdext_PDFIRawAdaptor_Writer_get_implementation",
-"sdext_PDFIRawAdaptor_Draw_get_implementation",
-"sdext_PDFIRawAdaptor_Impress_get_implementation",
-"sdext_PDFDetector_get_implementation",
+("sdext_PDFIHybridAdaptor_get_implementation", "#if 
HAVE_FEATURE_PDFIMPORT"),
+("sdext_PDFIRawAdaptor_Writer_get_implementation", "#if 
HAVE_FEATURE_PDFIMPORT"),
+("sdext_PDFIRawAdaptor_Draw_get_implementation", "#if 
HAVE_FEATURE_PDFIMPORT"),
+("sdext_PDFIRawAdaptor_Impress_get_implementation", "#if 
HAVE_FEATURE_PDFIMPORT"),
+("sdext_PDFDetector_get_implementation", "#if HAVE_FEATURE_PDFIMPORT"),
 ]
 
 writer_factory_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-04-14 Thread Hossein (via logerrit)

 solenv/bin/mkdocs.sh|   19 +++
 solenv/bin/mkdocs_portal.sh |   44 +++-
 2 files changed, 42 insertions(+), 21 deletions(-)

New commits:
commit 80fbc9c49fd23fcf1900fe12ebdc6f43f8db7b7f
Author: Hossein 
AuthorDate: Wed Apr 7 23:47:21 2021 +0430
Commit: Thorsten Behrens 
CommitDate: Wed Apr 14 23:56:09 2021 +0200

Fix problems with LibreOffice document generation (local and portal)

* Fixed problems with LibreOffice local document generation script
  (mkdocs.sh) by interpreting backslash escapes when generating module
  links using "echo -e" and using double quotes around Markdown
  generated text. The result is placed at docs/ folder.
* Fixed problems with LibreOffice portal document generation script
  (mkdocs_portal.sh and mkonedoc.sh) by doing above fixes and also
  adding code from the local document generation script. The result is
  placed at https://docs.libreoffice.org/
* Only the README.md files are processed, and not README* or readme.txt*
* Fixed redmine #3515 "Remove non-necessary subfolders from
  docs.libreoffice.org" by excluding these 10 folders:
  "autom4te.cache dictionaries docs helpcompiler helpcontent2 include
  instdir lo translations workdir"

Change-Id: Id230872b8583a575bfeb6fc77cc9f96d5982908f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113773
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 0f92ff87e532..4b70787787e8 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -85,8 +85,7 @@ function proc_text {
 }
 
 function proc_text_markdown {
-  sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 }
 
 function check_cmd {
@@ -226,10 +225,10 @@ echo "generating index page"
 header "LibreOffice Modules" " " "$BASE_OUTPUT/index.html"
 for module_name in *; do
   if [ -d $module_name ]; then
-cur_file=$(echo $module_name/README* $module_name/readme.txt*)
+cur_file=$(echo $module_name/README.md)
 if [ -f "$cur_file" ]; then
   # write index.html entry
-  text="${module_name}\n"
+  text=$(echo -e "${module_name}\n")
 
   if [ ${cur_file: -3} == ".md" ]; then
 # This is a markdown file.
@@ -239,7 +238,7 @@ for module_name in *; do
   else
 text="${text}$(head -n1 $cur_file | proc_text)"
   fi
-  echo -e $text >> "$BASE_OUTPUT/index.html"
+  echo -e "$text" >> "$BASE_OUTPUT/index.html"
 
   # write detailed module content
   header "$module_name" "LibreOffice » 
${module_name}" "$BASE_OUTPUT/${module_name}.html"
@@ -249,12 +248,12 @@ for module_name in *; do
 text="${text}   Doxygen"
   fi
   text="${text}  "
-  echo -e $text >> "$BASE_OUTPUT/${module_name}.html"
+  echo -e "$text" >> "$BASE_OUTPUT/${module_name}.html"
 
   if [ ${cur_file: -3} == ".md" ]; then
 # This is a markdown file.
 text="$(${markdown} $cur_file | proc_text_markdown)"
-echo $text >> "$BASE_OUTPUT/${module_name}.html"
+echo -e "$text" >> "$BASE_OUTPUT/${module_name}.html"
   else
 proc_text < $cur_file >> "$BASE_OUTPUT/${module_name}.html"
   fi
@@ -265,9 +264,13 @@ for module_name in *; do
   fi
 done
 
-if [ ${#empty_modules[*]} -gt 0 ]; then
+if [ ${#empty_modules[*]} -gt 10 ]; then
   echo -e " READMEs were not available for these 
modules:\n" >> "$BASE_OUTPUT/index.html"
   for module_name in "${empty_modules[@]}"; do
+# Do not process these directories
+if [[ "$module_name" =~ 
^(autom4te.cache|dictionaries|docs|helpcompiler|helpcontent2|include|instdir|lo|translations|workdir)$
 ]]; then
+  continue
+fi
 echo -e "https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
   done
   echo -e "\n" >> "$BASE_OUTPUT/index.html"
diff --git a/solenv/bin/mkdocs_portal.sh b/solenv/bin/mkdocs_portal.sh
index 852e3448179d..284af9e741f5 100755
--- a/solenv/bin/mkdocs_portal.sh
+++ b/solenv/bin/mkdocs_portal.sh
@@ -4,6 +4,7 @@ if [ -n "$debug" ] ; then
 set -x
 fi
 
+markdown="markdown"
 SRCDIR="$1"
 BASE_OUTPUT="$2"
 
@@ -88,6 +89,10 @@ function proc_text
 | awk 'BEGIN { print "" } { print } END { print "" }'
 }
 
+function proc_text_markdown {
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+}
+
 # generate entry page
 
 echo "generating index page"
@@ -95,28 +100,37 @@ header "LibreOffice Modules" " " "$BASE_OUTPUT/index.html"
 
 for module_name in *; do
 if [ -d $module_name ]; then
-cur_file=
-if [ -f $module_name/readme.txt ] ; then
-cur_file="$module_name/readme.txt"
-elif [ -f $module_name/README ] ; then
-cur_file="$module_name/README"
-fi
-if [ -n "$cur_file" ]; then
+cur_file=$(echo $module_name/R

[Libreoffice-commits] core.git: solenv/bin

2021-04-07 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d3c5087b1f3edaf40fdd62311a3e9895a1fb7916
Author: Michael Weghorn 
AuthorDate: Wed Apr 7 10:02:01 2021 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 7 11:42:13 2021 +0200

tdf#141531 liblo-native-code: Add ODatabaseContext_get_implementation

Add 'com_sun_star_comp_dba_ODatabaseContext_get_implementation' to
liblo-native-code, needed to open mail merge files
with data source since

commit e64dc07ca8300a997d6d3eebfc3e198ae55d290d
Date:   Mon Mar 29 11:52:05 2021 +0300

tdf#139906 Show warning message when data source is not avaible.

Change-Id: I6fdd500f9c3b9cc54310e78df694eba7103ff0b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113717
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6c46c1b6a6b9..b15e6f27189b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -114,6 +114,7 @@ core_constructor_list = [
 "com_sun_star_comp_dba_DataAccessDescriptorFactory",
 "com_sun_star_comp_dba_OCommandDefinition",
 "com_sun_star_comp_dba_OComponentDefinition",
+"com_sun_star_comp_dba_ODatabaseContext_get_implementation",
 "com_sun_star_comp_dba_ODatabaseDocument",
 "com_sun_star_comp_dba_ODatabaseSource",
 "com_sun_star_comp_dba_ORowSet_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-03-30 Thread Christian Lohmaier (via logerrit)

 solenv/bin/hrcex|   13 +++--
 solenv/bin/polib.py |2 +-
 solenv/bin/uiex |   10 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 9dfd55dffc4cca6617b4ee67be9a8bfe96601c00
Author: Christian Lohmaier 
AuthorDate: Mon Mar 29 15:55:45 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Mar 31 00:52:05 2021 +0200

python3-ify hrcex & uiex (creation of pot files)

Change-Id: I824c9ed536a1e852d6bd157fbd7d4766327b7bcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113319
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex
index 54cef2626a19..0645f79fcb37 100755
--- a/solenv/bin/hrcex
+++ b/solenv/bin/hrcex
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import polib
 import binascii
@@ -22,17 +22,18 @@ for o, a in myopts:
 ofile = a
 
 with open(ofile, "a") as output:
-xgettext = Popen(["xgettext", "-C", "--add-comments", 
"--keyword=NC_:1c,2", "--keyword=NNC_:1c,2,3", "--from-code=UTF-8", 
"--no-wrap", ifile, "-o", "-"], stdout=PIPE)
+xgettext = Popen(["xgettext", "-C", "--add-comments", 
"--keyword=NC_:1c,2", "--keyword=NNC_:1c,2,3", "--from-code=UTF-8", 
"--no-wrap", ifile, "-o", "-"], stdout=PIPE, encoding="UTF-8")
 # while overall format is c++, all of the strings use custom placeholders 
and don't follow c-format
 # esp. plain percent sign never is escaped explicitly
-input = check_output(['sed', '-e', '/^#, c-format$/d'], 
stdin=xgettext.stdout)
+input = check_output(['sed', '-e', '/^#, c-format$/d'], 
stdin=xgettext.stdout, encoding="UTF-8")
 xgettext.wait()
+xgettext.stdout.close()
 po = polib.pofile(input)
 if len(po) != 0:
-print >> output, ""
+print("", file=output)
 for entry in po:
 keyid = entry.msgctxt + '|' + entry.msgid
-print >> output, '#. ' + polib.genKeyId(keyid)
+print('#. ' + polib.genKeyId(keyid), file=output)
 for i, occurrence in enumerate(entry.occurrences):
 entry.occurrences[i] = os.path.relpath(occurrence[0], 
os.environ['SRCDIR']), occurrence[1]
-print >> output, entry
+print(entry, file=output)
diff --git a/solenv/bin/polib.py b/solenv/bin/polib.py
index 5ab421365376..092e7dfdb8b3 100644
--- a/solenv/bin/polib.py
+++ b/solenv/bin/polib.py
@@ -1858,7 +1858,7 @@ def wrap(text, width=70, **kwargs):
 # }}}
 
 def genKeyId(inkey):
-crc = binascii.crc32(bytes(inkey)) & 0x
+crc = binascii.crc32(bytes(inkey, encoding="UTF-8")) & 0x
 # Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing 
IDs
 symbols = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";
 outkey = ""
diff --git a/solenv/bin/uiex b/solenv/bin/uiex
index ba47d8e2f9a8..b9344c429543 100755
--- a/solenv/bin/uiex
+++ b/solenv/bin/uiex
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import polib
 import binascii
@@ -22,17 +22,17 @@ for o, a in myopts:
 ofile = a
 
 with open(ofile, "a") as output:
-input = check_output(["xgettext", "--add-comments", "--no-wrap", ifile, 
"-o", "-"])
+input = check_output(["xgettext", "--add-comments", "--no-wrap", ifile, 
"-o", "-"], encoding="UTF-8")
 po = polib.pofile(input)
 if len(po) != 0:
-print >> output, ""
+print("", file=output)
 for entry in po:
 # skip 'stock' entries like "cancel", "help", "ok", etc
 # l10ntools/source/localize.cxx will insert one entry for each 
stock per .po
 if entry.msgctxt == "stock":
 continue
 keyid = entry.msgctxt + '|' + entry.msgid
-print >> output, '#. ' + polib.genKeyId(keyid)
+print('#. ' + polib.genKeyId(keyid), file=output)
 for i, occurrence in enumerate(entry.occurrences):
 entry.occurrences[i] = os.path.relpath(occurrence[0], 
os.environ['SRCDIR']), occurrence[1]
-print >> output, entry
+print(entry, file=output)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-03-25 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 3dba2e4a325fa0fdfbbedb0ffc1fcf678bfcbc94
Author: Tor Lillqvist 
AuthorDate: Thu Mar 25 12:23:43 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Mar 25 14:27:34 2021 +0100

Include the pdfimport library constructor in the mobile apps if enabled

This is part of implementing
https://github.com/CollaboraOnline/online/issues/1824 .

Change-Id: I68dacc2de0dc1f09da03fa213d5cff56a2343c77
Signed-off-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113079
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113095

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 404aaf42f9f4..6c46c1b6a6b9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -663,6 +663,12 @@ draw_constructor_list = [
 "css_comp_Impress_oox_PowerPointExport",
 # writerperfect/source/draw/wpftdraw.component
 "com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
+# sdext/source/pdfimport/pdfimport.component
+"sdext_PDFIHybridAdaptor_get_implementation",
+"sdext_PDFIRawAdaptor_Writer_get_implementation",
+"sdext_PDFIRawAdaptor_Draw_get_implementation",
+"sdext_PDFIRawAdaptor_Impress_get_implementation",
+"sdext_PDFDetector_get_implementation",
 ]
 
 writer_factory_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin solenv/clang-format svtools/Library_svt.mk svtools/source svtools/util toolkit/Library_tk.mk toolkit/source toolkit/util

2021-03-12 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py |3 +--
 solenv/clang-format/excludelist   |   12 ++--
 svtools/Library_svt.mk|4 
 svtools/util/svt.component|5 -
 toolkit/Library_tk.mk |4 
 toolkit/source/hatchwindow/hatchwindow.cxx|2 +-
 toolkit/source/hatchwindow/hatchwindowfactory.cxx |2 +-
 toolkit/source/hatchwindow/ipwin.cxx  |2 +-
 toolkit/util/tk.component |5 +
 9 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 837f6e6f341758bacc70f40c0f7deecca5de0087
Author: Caolán McNamara 
AuthorDate: Thu Mar 11 14:22:27 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Mar 12 10:06:56 2021 +0100

move hatchwindow to toolkit

because it wants to use toolkit headers

Change-Id: If92b174bd4971b88f288f93c1beaed6f2103a83c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112348
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2cfccbfa705b..9832da71bd0a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -334,8 +334,6 @@ core_constructor_list = [
 "com_sun_star_comp_Math_MathTypeFilter_get_implementation",
 # svl/source/fsstor/fsstorage.component
 "svl_FSStorageFactory_get_implementation",
-# svtools/util/svt.component
-"com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
 # vcl/vcl.android.component
 "com_sun_star_graphic_GraphicObject_get_implementation",
 "com_sun_star_comp_graphic_GraphicMapper_get_implementation",
@@ -361,6 +359,7 @@ core_constructor_list = [
 "com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
 "com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation",
 # toolkit/util/tk.component
+"com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
 "stardiv_Toolkit_StdTabController_get_implementation",
 "stardiv_Toolkit_UnoButtonControl_get_implementation",
 "stardiv_Toolkit_UnoCheckBoxControl_get_implementation",
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 6ef8f3ad2039..bd07aeebc58f 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11323,12 +11323,6 @@ svtools/source/filter/SvFilterOptionsDialog.cxx
 svtools/source/filter/exportdialog.cxx
 svtools/source/filter/exportdialog.hxx
 svtools/source/graphic/renderer.cxx
-svtools/source/hatchwindow/documentcloser.cxx
-svtools/source/hatchwindow/hatchwindow.cxx
-svtools/source/hatchwindow/hatchwindowfactory.cxx
-svtools/source/hatchwindow/ipwin.cxx
-svtools/source/hatchwindow/ipwin.hxx
-svtools/source/inc/hatchwindow.hxx
 svtools/source/java/javacontext.cxx
 svtools/source/java/javainteractionhandler.cxx
 svtools/source/misc/acceleratorexecute.cxx
@@ -13776,6 +13770,12 @@ toolkit/source/controls/unocontrolcontainer.cxx
 toolkit/source/controls/unocontrolcontainermodel.cxx
 toolkit/source/controls/unocontrolmodel.cxx
 toolkit/source/controls/unocontrols.cxx
+toolkit/source/hatchwindow/documentcloser.cxx
+toolkit/source/hatchwindow/hatchwindow.cxx
+toolkit/source/hatchwindow/hatchwindow.hxx
+toolkit/source/hatchwindow/hatchwindowfactory.cxx
+toolkit/source/hatchwindow/ipwin.cxx
+toolkit/source/hatchwindow/ipwin.hxx
 toolkit/source/helper/accessibilityclient.cxx
 toolkit/source/helper/btndlg.cxx
 toolkit/source/helper/formpdfexport.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index adaa6b1bc99d..ee4361331125 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -113,10 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/filter/DocumentToGraphicRenderer \
 svtools/source/filter/exportdialog \
 svtools/source/graphic/renderer \
-svtools/source/hatchwindow/documentcloser \
-svtools/source/hatchwindow/hatchwindow \
-svtools/source/hatchwindow/hatchwindowfactory \
-svtools/source/hatchwindow/ipwin \
 $(if $(ENABLE_JAVA), \
 svtools/source/java/javacontext \
 svtools/source/java/javainteractionhandler) \
diff --git a/svtools/util/svt.component b/svtools/util/svt.component
index f840548d9d3e..fabe9e6c7c87 100644
--- a/svtools/util/svt.component
+++ b/svtools/util/svt.component
@@ -45,9 +45,4 @@
   constructor="com_sun_star_comp_embed_DocumentCloser_get_implementation">
 
   
-  
-
-
-  
 
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 88013385ccbe..b6186e66c962 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -112,6 +112,10 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
 toolkit/source/controls/unocontrolcontainermodel \
 toolkit/source/controls/unocontrolmodel \
 toolkit/source/controls/unocontrols \
+toolkit/source/hatchwindow/documentcloser \
+toolkit/source/hatchwi

[Libreoffice-commits] core.git: solenv/bin

2021-01-28 Thread Maxim Monastirsky (via logerrit)

 solenv/bin/uiimagelist.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed28902e2d2b8929617c92226be985e322147569
Author: Maxim Monastirsky 
AuthorDate: Thu Jan 28 11:06:35 2021 +0200
Commit: Maxim Monastirsky 
CommitDate: Thu Jan 28 12:04:34 2021 +0100

tdf#139781 Handle also "icon-name" property name

Change-Id: Iaf2c8521588bdf58daa3166b1efa27979eca2e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110048
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/solenv/bin/uiimagelist.xsl b/solenv/bin/uiimagelist.xsl
index 3d14f8d31dc4..659d3b943ae1 100644
--- a/solenv/bin/uiimagelist.xsl
+++ b/solenv/bin/uiimagelist.xsl
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-01-25 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm  |6 +-
 solenv/bin/modules/installer/parameter.pm |2 +-
 solenv/bin/modules/installer/simplepackage.pm |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit cc46ce1b78fe71eb66fc0a09e44f01428a9e4069
Author: Christian Lohmaier 
AuthorDate: Fri Jan 22 13:59:39 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Jan 25 12:51:39 2021 +0100

fix packaging of mac builds targeting apple silicone

the scpactions are what assemble the dmg (add the license & readme
folders, the background image and the .DS_Store for alignment/the
layout).
Adding the AARCH64 statement is necessary to add the architecture to the
filename.

Change-Id: I0095b8d631cdaa7ce4333fde15dd17d4faf44e8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109818
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 63103816e89f..466bb4433205 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -390,6 +390,10 @@ sub get_download_architecture
 {
 $arch = "x86-64";
 }
+elsif ( $installer::globals::cpuname eq 'AARCH64' )
+{
+$arch = "aarch64";
+}
 
 return $arch;
 }
@@ -565,7 +569,7 @@ sub resolve_variables_in_downloadname
 elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; }
 elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
 elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
-elsif ( $installer::globals::platformid eq 'macosx_x86_64' ) { $os = 
"macosxx"; }
+elsif ( $installer::globals::ismacbuild ) { $os = "macosxx"; }
 else { $os = ""; }
 $downloadname =~ s/\{os\}/$os/;
 
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index f16259bd9023..8c63a341d34d 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -269,7 +269,7 @@ sub setglobalvariables
 }
 }
 
-if ( $installer::globals::platformid eq 'macosx_x86_64')
+if ( $installer::globals::os eq 'MACOSX' )
 {
 $installer::globals::ismacbuild = 1;
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index f449d1c81044..c5b8dd24c44e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -700,7 +700,7 @@ sub create_simple_package
 my $extensionfolder = get_extensions_dir($subfolderdir);
 installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
-if ( $installer::globals::platformid eq 'macosx_x86_64' )
+if ( $installer::globals::ismacbuild )
 {
 
installer::worker::put_scpactions_into_installset("$installdir/$packagename");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-01-25 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/simplepackage.pm |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 6c4cb4e7e0afce2989c9fe596fd74a35eece6206
Author: Christian Lohmaier 
AuthorDate: Fri Jan 22 13:51:52 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Mon Jan 25 12:51:16 2021 +0100

mac packaging: capture output of signing call

by replacing system() call with backticks operator, since now the
macosx-codesign-app-bundle script doesn't redirect the output to
temp-files anymore (see e2fcbac50549ca96b092d64bd14a37cee6b12e0a)
That way the output can be added to the log in case of failure.

Change-Id: I954cbb2ed28cfe0f7e1e8ebc8f21aeb1711a4d9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109816
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 01a594a5e72c..f449d1c81044 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -409,13 +409,12 @@ sub create_package
 {
 $systemcall = 
"$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle 
$localtempdir/$folder/$volume_name_classic_app.app";
 print "... $systemcall ...\n";
-my $returnvalue = system($systemcall);
 $infoline = "Systemcall: $systemcall\n";
 push( @installer::globals::logfileinfo, $infoline);
-
-if ($returnvalue)
+my $output = `$systemcall 2>&1`;
+if ($?)
 {
-$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+$infoline = "ERROR: Could not execute 
\"$systemcall\"!\n$output\n";
 push( @installer::globals::logfileinfo, $infoline);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2021-01-20 Thread Tor Lillqvist (via logerrit)

 solenv/bin/macosx-codesign-app-bundle |   51 ++
 1 file changed, 9 insertions(+), 42 deletions(-)

New commits:
commit e2fcbac50549ca96b092d64bd14a37cee6b12e0a
Author: Tor Lillqvist 
AuthorDate: Wed Jan 20 12:16:09 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 20 17:28:32 2021 +0100

Simplify error handling

There were a couple of weird things in this script. Firstly, the
script redirected stdout and stderr from each invocation of codesign
separately into a log file. (Several differently named log files.) But
those log files were never displayed.

Secondly, the script did "set -e" at the start. Thus, if a codesign
invocation returned non-zero (error) exit status, any code to check
the exit status and possibly display the log file would not be
executed anyway.

Simplify thusly:

Don't pass --verbose to codesign. Then if nothing goes wrong, it is
silent. That is The Unix Philosophy, right?

Don't redirect codesign stdout and stderr to a log file (that would be
removed if codesign didn't fail). Just let any error message of
warning from codesign go to the script's stderr or stdout.

If codesign fails, just exit. Error messages will have been written to
stderr already. No log files to display or remove.

Don't use set -e. Instead if a codesign invocation fails, just exit.

The intent is that in the normal case, this script will be totally
silent.

Change-Id: Ic6081c418e4c564be768e30bf52b8196ee59f061
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109696
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 8aa725745327..f4df4d4e6639 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Exit on errors
-set -e
 # Use of unset variable is an error
 set -u
 # If any part of a pipeline of commands fails, the whole pipeline fails
@@ -47,11 +45,7 @@ fi
 find -d "$APP_BUNDLE" \( -name '*.jnilib' \) ! -type l |
 while read file; do
 id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --verbose --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" "$file" > "/tmp/codesign_$(basename 
"$file").log" 2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_$(basename "$file").log"
+codesign --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
 done
 
 # Sign dylibs
@@ -66,11 +60,7 @@ find "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.dylib.*' 
-or -name '*.so' \
 $other_files \) ! -type l |
 while read file; do
 id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
-codesign --verbose --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id 
--sign "$MACOSX_CODESIGNING_IDENTITY" "$file" > "/tmp/codesign_$(basename 
"$file").log" 2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_$(basename "$file").log"
+codesign --force --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
 done
 
 # Sign included bundles. First .app ones (i.e. the Python.app inside
@@ -78,23 +68,15 @@ done
 
 find "$APP_BUNDLE"/Contents -name '*.app' -type d |
 while read app; do
-fn=`basename "$app"`
-fn=${fn%.*}
 # Assume the app has a XML (and not binary) Info.plist
 id=`grep -A 1 'CFBundleIdentifier' $app/Contents/Info.plist | 
tail -1 | sed -e 's,.*,,' -e 's,.*,,'`
-codesign --verbose --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$app" > "/tmp/codesign_${fn}.log" 
2>&1
-if [ "$?" != "0" ] ; then
-   exit 1
-fi
-rm "/tmp/codesign_${fn}.log"
+codesign --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$app" || exit 1
 done
 
 # Then .framework ones. Again, be generic just for kicks.
 
 find "$APP_BUNDLE" -name '*.framework' -type d |
 while read framework; do
-fn=`basename "$framework"`
-fn=${fn%.*}
 for version in "$framework"/Versions/*; do
 if test ! -L "$version" -a -d "$version"; then
# Assume the framework has a XML (and not binary) Info.plist
@@ -102,14 +84,10 @@ while read framework; do
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
+   codesign --options=runtime --force --identifier=$id --sign 
"$MACOSX_CODESIGNING_IDENTITY" "$scriptorexecutable"

[Libreoffice-commits] core.git: solenv/bin sysui/desktop

2020-12-23 Thread Chris Mayo (via logerrit)

 solenv/bin/assemble-flatpak-appdata-step1.sh |2 +-
 solenv/bin/assemble-flatpak.sh   |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 sysui/desktop/share/create_tree.sh   |6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4cd4726e9d97e9785140c809d2154357d5d15837
Author: Chris Mayo 
AuthorDate: Tue Nov 17 19:24:44 2020 +
Commit: Michael Stahl 
CommitDate: Wed Dec 23 16:21:31 2020 +0100

tdf#135504: Install application metadata in /usr/share/metainfo

Current path /usr/share/appdata is deprecated [1].

[1] 
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/bin/assemble-flatpak-appdata-step1.sh 
b/solenv/bin/assemble-flatpak-appdata-step1.sh
index 4658dd45d018..4896cf3f20bc 100755
--- a/solenv/bin/assemble-flatpak-appdata-step1.sh
+++ b/solenv/bin/assemble-flatpak-appdata-step1.sh
@@ -19,7 +19,7 @@
 set -e
 
 ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
-## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
+## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME 
Software
 ## doesn't show more than five screenshots anyway, so restrict to one each from
 ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
 cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 8ca5bcf08c41..9991a0d0d71c 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -63,7 +63,7 @@ done
 
 mkdir -p /app/share/appdata
 "${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1
-"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/appdata/ \
+"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh 
"${PREFIXDIR?}"/share/metainfo/ \
  /app/share/appdata/
 
 ## see

[Libreoffice-commits] core.git: solenv/bin

2020-12-15 Thread Andras Timar (via logerrit)

 solenv/bin/modules/installer/epmfile.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc8e19c73714c199fd2efdc0fefe3e750e8c14a8
Author: Andras Timar 
AuthorDate: Sun Nov 8 20:33:19 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 15 12:22:18 2020 +0100

remove extra space in version number in rpm/deb package info

e.g. Instead of "Base module for LibreOffice 7.0 .3.1" we will get
"Base module for LibreOffice 7.0.3.1".

Change-Id: I9ce56b33f835a9527f777cfb9c0e466232e6f24f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105449
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 6da8ea0a4b00..7a1f5fd94c52 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -276,7 +276,7 @@ sub create_epm_header
 
 my $productnamestring = $onepackage->{'description'};
 installer::packagelist::resolve_packagevariables(\$productnamestring, 
$variableshashref, 0);
-if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = 
$productnamestring . " " . $variableshashref->{'PRODUCTEXTENSION'}; }
+if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = 
$productnamestring . $variableshashref->{'PRODUCTEXTENSION'}; }
 
 $line = "%product" . " " . $productnamestring . "\n";
 push(@epmheader, $line);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin solenv/clang-format svtools/Library_svt.mk svtools/source vcl/inc vcl/Library_vcl.mk vcl/source

2020-12-04 Thread Caolán McNamara (via logerrit)

 solenv/bin/native-code.py|1 -
 solenv/clang-format/excludelist  |2 +-
 svtools/Library_svt.mk   |1 -
 vcl/Library_vcl.mk   |1 +
 vcl/inc/managedmenubutton.hxx|   30 ++
 vcl/source/control/managedmenubutton.cxx |   28 +++-
 vcl/source/window/builder.cxx|   11 +++
 7 files changed, 46 insertions(+), 28 deletions(-)

New commits:
commit fcb7fe3a082c200f69f10c1d3951761a7e41d6e0
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 15:39:45 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 17:48:56 2020 +0100

move ManagedMenuButton to vcl

Change-Id: Ie2dd1635a5f5f677d286011a14b734af7435612a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107231
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 13a7e720be08..6eefce978bb9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -716,7 +716,6 @@ constructor_map = {
 custom_widgets = [
 'ContextVBox',
 'DropdownBox',
-'ManagedMenuButton',
 'NotebookbarTabControl',
 'NotebookbarToolBox',
 'PriorityHBox',
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index fddf4b2955f8..b7105c4d962d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11421,7 +11421,6 @@ svtools/source/control/ctrlbox.cxx
 svtools/source/control/ctrltool.cxx
 svtools/source/control/indexentryres.cxx
 svtools/source/control/inettbc.cxx
-svtools/source/control/managedmenubutton.cxx
 svtools/source/control/ruler.cxx
 svtools/source/control/scriptedtext.cxx
 svtools/source/control/tabbar.cxx
@@ -14995,6 +14994,7 @@ vcl/source/control/imp_listbox.cxx
 vcl/source/control/ivctrl.cxx
 vcl/source/control/listbox.cxx
 vcl/source/control/longcurr.cxx
+vcl/source/control/managedmenubutton.cxx
 vcl/source/control/menubtn.cxx
 vcl/source/control/notebookbar.cxx
 vcl/source/control/prgsbar.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index be89ea4c2b56..adaa6b1bc99d 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/control/ctrltool \
 svtools/source/control/indexentryres \
 svtools/source/control/inettbc \
-svtools/source/control/managedmenubutton \
 svtools/source/control/ruler \
 svtools/source/control/scriptedtext \
 svtools/source/control/tabbar \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bc6b8f8f9af7..8f9608d2ca2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -199,6 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/control/longcurr \
 vcl/source/control/imp_listbox \
 vcl/source/control/listbox \
+   vcl/source/control/managedmenubutton \
 vcl/source/control/menubtn \
 vcl/source/control/notebookbar \
 vcl/source/control/WeldedTabbedNotebookbar \
diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx
new file mode 100644
index ..d80655288215
--- /dev/null
+++ b/vcl/inc/managedmenubutton.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+class ManagedMenuButton : public MenuButton
+{
+public:
+ManagedMenuButton(vcl::Window* pParent, WinBits nStyle);
+~ManagedMenuButton() override;
+
+void Activate() override;
+void dispose() override;
+
+private:
+css::uno::Reference m_xPopupMenu;
+css::uno::Reference m_xPopupController;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/svtools/source/control/managedmenubutton.cxx 
b/vcl/source/control/managedmenubutton.cxx
similarity index 84%
rename from svtools/source/control/managedmenubutton.cxx
rename to vcl/source/control/managedmenubutton.cxx
index 4db9d2a1858b..880730721ce2 100644
--- a/svtools/source/control/managedmenubutton.cxx
+++ b/vcl/source/control/managedmenubutton.cxx
@@ -9,31 +9,13 @@
 
 #include 
 #include 
-#include 
+
+#include 
 #include 
-#include 
 
-#include 
-#include 
 #include 
+#include 
 #include 
-#include 
-
-namespace {
-
-class ManagedMenuButton : public MenuButton
-{
-public:
-ManagedMenuButton(vcl::Window* pParent, WinBits nStyle);
-~ManagedMenuButton() override;
-
-void Activate() override;
-void dispose() override;
-
-private:
-css::uno::Reference m_xPopupMenu;
-css::uno::Reference m_xPopupController;
-};
 
 Mana

[Libreoffice-commits] core.git: solenv/bin

2020-11-21 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0519f167acc6e3cf50b2935dae30efd8a1f3
Author: Tor Lillqvist 
AuthorDate: Tue Oct 20 15:52:14 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sat Nov 21 16:01:23 2020 +0100

Add NotebookbarTabControl

Change-Id: Ibdcadc1b1bc1a2ada4863a64de91c9df88856a01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104562
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106255
Tested-by: Jenkins

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 5d20d738ef58..13a7e720be08 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -717,6 +717,7 @@ custom_widgets = [
 'ContextVBox',
 'DropdownBox',
 'ManagedMenuButton',
+'NotebookbarTabControl',
 'NotebookbarToolBox',
 'PriorityHBox',
 'PriorityMergedHBox',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-10-08 Thread Tomaž Vajngerl (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9b6fb8bf3d8e622bd2d013744a591ff32287d3de
Author: Tomaž Vajngerl 
AuthorDate: Thu Oct 8 17:00:23 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu Oct 8 18:31:39 2020 +0200

add GraphicMapper to native-code.py

Change-Id: I9622d80f4b7a8bdd7ce235bd01e7893ff821a565
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104094
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7bf89d9dda22..e3735ac2e667 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -338,6 +338,7 @@ core_constructor_list = [
 "com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
 # vcl/vcl.android.component
 "com_sun_star_graphic_GraphicObject_get_implementation",
+"com_sun_star_comp_graphic_GraphicMapper_get_implementation",
 "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 "com_sun_star_frame_VCLSessionManagerClient_get_implementation",
 "vcl_FontIdentificator_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-29 Thread Stephan Bergmann (via logerrit)

 solenv/bin/gdb-core-bt.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0311006ec9cdf76f6863c203658cebf88e135a6c
Author: Stephan Bergmann 
AuthorDate: Tue Sep 29 21:13:07 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 30 08:21:12 2020 +0200

Run gdb in gdb-core-bt.sh with PYTHONWARNINGS=default, too

...same as fb06d5b1784cb8b91ea6d286b3f2baa38fed0b4c "Run gdb with
PYTHONWARNINGS=default"

Change-Id: If6523e4222f7ef9b9ce72df4a1ab3e039e63154b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103637
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index b48a5a4405cc..8557825804ab 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -29,8 +29,8 @@ then
 GDBCOMMANDFILE=$(mktemp)
 printf "info registers\nthread apply all backtrace full\n" \
 >"$GDBCOMMANDFILE"
-gdb -iex "add-auto-load-safe-path ${INSTDIR?}" -x 
"$GDBCOMMANDFILE" --batch "$guess" \
-"$COREFILE" && found=x
+PYTHONWARNINGS=default gdb -iex "add-auto-load-safe-path 
${INSTDIR?}" \
+-x "$GDBCOMMANDFILE" --batch "$guess" "$COREFILE" && found=x
 rm "$GDBCOMMANDFILE"
 echo
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-24 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d98ac4d2c584313c1e51630c6fbab8f8a092012c
Author: Mike Kaganski 
AuthorDate: Thu Sep 24 10:48:57 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Sep 24 11:20:17 2020 +0200

Only read msi database for msi package format

Change-Id: I31f1b1aae3b89a58c33f58a76e32bf171f344012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103293
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 7e610406a2d063ba5efacb0e186524c2a4ed77a9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103203
Tested-by: Jenkins

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 7f18a572cbcb..0beb2ab4bd26 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -500,7 +500,7 @@ sub run {
 my $allupdatelastsequences = "";
 my $allupdatediskids = "";
 
-if ( $installer::globals::iswindowsbuild || 
$installer::globals::packageformat eq 'msi' )
+if ( $installer::globals::packageformat eq 'msi' )
 {
 if ( $allvariableshashref->{'UPDATE_DATABASE'} )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-15 Thread Mike Kaganski (via logerrit)

 solenv/bin/image-sort.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c4d9e922eefd08382e7a4f9fb1926f82a3f8fc4d
Author: Mike Kaganski 
AuthorDate: Tue Sep 15 10:42:16 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 15 12:30:09 2020 +0200

Don't use argparse to open control_file

Use idiomatic 'with' instead
This avoids the warnings:

  Exception ignored in: <_io.FileIO 
name='C:/lo/src/core/postprocess/packimages/image-sort.lst' mode='rb' 
closefd=True>
  ResourceWarning: unclosed file <_io.TextIOWrapper 
name='C:/lo/src/core/postprocess/packimages/image-sort.lst' mode='r' 
encoding='cp1251'>

Change-Id: I1cf8248cdab8dd9fd585545c64de2aebcbfe5365
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102647
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/image-sort.py b/solenv/bin/image-sort.py
index d45037e25c7f..75b5da6ce0e7 100644
--- a/solenv/bin/image-sort.py
+++ b/solenv/bin/image-sort.py
@@ -120,7 +120,7 @@ def chew_controlfile(ifile):
 
 parser = argparse.ArgumentParser()
 # where the control file lives
-parser.add_argument('control_file', metavar='image-sort.lst', type=open,
+parser.add_argument('control_file', metavar='image-sort.lst',
 help='the sort control file')
 # where the uiconfigs live
 parser.add_argument('base_path', metavar='directory',
@@ -138,7 +138,8 @@ else:
 args.output = sys.stdout
 close_output = False
 
-chew_controlfile(args.control_file)
+with open(args.control_file) as cf:
+chew_controlfile(cf)
 
 for icon in global_list:
 if not icon.startswith('sc_'):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-04 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/windows/feature.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb64b19e3e8942e610db2d3596d859f7c7864811
Author: Mike Kaganski 
AuthorDate: Fri Sep 4 19:04:43 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sat Sep 5 07:01:12 2020 +0200

Avoid warnings about use of uninitialized value

Like these:

Use of uninitialized value $feature{"Description"} in substitution 
(s///) at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm line 
362.
Use of uninitialized value $feature{"Title"} in concatenation (.) or 
string at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm line 
370.
Use of uninitialized value $feature{"Description"} in concatenation (.) 
or string at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm 
line 370.

gm_o_OGLTrans has no Title nor Description

Change-Id: Ica247e071f252023e4cdec6f8ff15f0e0d3cedd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102059
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/windows/feature.pm 
b/solenv/bin/modules/installer/windows/feature.pm
index c97be4a9c98e..356220829893 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -357,8 +357,8 @@ sub create_feature_table
 
 $feature{'feature'} = get_feature_gid($onefeature);
 $feature{'feature_parent'} = get_feature_parent($onefeature);
-$feature{'Title'} = $onefeature->{'Name'};
-$feature{'Description'} = $onefeature->{'Description'};
+$feature{'Title'} = $onefeature->{'Name'} // "";
+$feature{'Description'} = $onefeature->{'Description'} // "";
 $feature{'Description'} =~ s/\\\"/\"/g;  # no more masquerading of 
'"'
 $feature{'Display'} = get_feature_display($onefeature);
 $feature{'Level'} = get_feature_level($onefeature);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-04 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/windows/file.pm |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 30f344d73a26adb543acf66979fd963d8e38fe65
Author: Mike Kaganski 
AuthorDate: Fri Sep 4 18:23:38 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Sep 4 19:37:00 2020 +0200

Avoid warnings about use of uninitialized value

Use of uninitialized value $microversion in int at 
C:/lo/src/core/solenv/bin/modules/installer/windows/file.pm line 568.
Use of uninitialized value $vervariant in int at 
C:/lo/src/core/solenv/bin/modules/installer/windows/file.pm line 568.

Change-Id: I916861a34d39a796d2941f9a8d972e7a082e3b22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102058
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/windows/file.pm 
b/solenv/bin/modules/installer/windows/file.pm
index 61116e923b6d..12f5ad37 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -565,6 +565,9 @@ sub get_fileversion
 if ($ttfdata =~ /(Version )?([0-9]+(\.[0-9]+)*)/i)
 {
 my ($version, $subversion, $microversion, $vervariant) = 
split(/\./,$2);
+$subversion = 0 if not defined $subversion;
+$microversion = 0 if not defined $microversion;
+$vervariant = 0 if not defined $vervariant;
 $fileversion = int($version) . "." . int($subversion) . "." . 
int($microversion) . "." . int($vervariant);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-04 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/scriptitems.pm |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9b8a8dc74dd352820141d2b7e5320bcda39a7814
Author: Mike Kaganski 
AuthorDate: Fri Sep 4 17:19:38 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Sep 4 19:32:52 2020 +0200

Avoid warnings about use of uninitialized value

Like these:

Use of uninitialized value in exists at 
C:/lo/src/core/solenv/bin/modules/installer/scriptitems.pm line 402.

Debugging the failing values, these are:

element 113
Dir => gid_Dir_Autotext_Language
HostName => LibreOfficeDev 7/share/autotext/qtz
modules => gid_Module_Langpack_Basis_qtz
specificlanguage => qtz
Styles => (CREATE)

element 512
Dir => gid_Brand_Dir_Share_Uno_Packages
HostName => LibreOfficeDev 7/share/uno_packages
modules => gid_Module_Root,gid_Module_Root_Brand
specificlanguage =>
Styles => (CREATE)

element 513
Dir => gid_Brand_Dir_Share_Uno_Packages_Cache
HostName => LibreOfficeDev 7/share/uno_packages/cache
modules => gid_Module_Root,gid_Module_Root_Brand
specificlanguage =>
Styles => (CREATE)

element 514
Dir => gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
HostName => LibreOfficeDev 7/share/uno_packages/cache/uno_packages
modules => gid_Module_Root
specificlanguage =>
Styles => (CREATE)

Change-Id: I9c91e2fa9bbaab4c15e96dbbdc710141e500c482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102053
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 81f0271dfe7f..54247d01d329 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -399,7 +399,8 @@ sub remove_not_required_spellcheckerlanguage_files
 for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
 {
 my $onefile = ${$filesarrayref}[$i];
-if ( 
exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
+# FIXME: some items don't have 'gid'
+if ( (defined $onefile->{'gid'}) && 
exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
 {
 $infoline = "Spellchecker selection: Removing file 
$onefile->{'gid'}\n";
 push( @installer::globals::logfileinfo, $infoline);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-09-04 Thread Mike Kaganski (via logerrit)

 solenv/bin/modules/installer/systemactions.pm |   32 --
 1 file changed, 32 deletions(-)

New commits:
commit c44c21a01321650f930d9e16b4d0763d5674eac1
Author: Mike Kaganski 
AuthorDate: Fri Sep 4 15:51:08 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Sep 4 16:19:08 2020 +0200

Drop duplicating is_empty_dir

This version was introduced in b173b425a1c1478ab3c4b43e58e09b751e3e3387,
then in cabadfc288e5e7324723c62f36b918a80db90323, another copy was added
so that now install.phony.log had this line:

Subroutine is_empty_dir redefined at 
C:/lo/src/core/solenv/bin/modules/installer/systemactions.pm line 475.

Let's keep the newer version, that is at line 280.

Change-Id: I50f3668e47d4ea8f9c309abde8abe233cff12af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102046
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/solenv/bin/modules/installer/systemactions.pm 
b/solenv/bin/modules/installer/systemactions.pm
index 4f7a18bba5e6..a33c5a957b06 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -466,38 +466,6 @@ sub copy_directory
 }
 }
 
-##
-# Copying all files from one directory
-# to another directory
-##
-
-sub is_empty_dir
-{
-my ($dir) = @_;
-
-my $directory_is_empty = 1;
-my @sourcefiles = ();
-
-opendir(DIR, $dir);
-@sourcefiles = readdir(DIR);
-closedir(DIR);
-
-my $onefile;
-my @realcontent = ();
-
-foreach $onefile (@sourcefiles)
-{
-if ((!($onefile eq ".")) && (!($onefile eq "..")))
-{
-push(@realcontent, $onefile);
-}
-}
-
-if ( $#realcontent > -1 ) { $directory_is_empty = 0; }
-
-return $directory_is_empty;
-}
-
 #
 # Creating hard links to a complete directory with sub directories.
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-08-18 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b1b1b8f8c1afc35589c3fc7a713def39f71ede97
Author: Michael Weghorn 
AuthorDate: Tue Aug 18 13:47:28 2020 +0200
Commit: Michael Weghorn 
CommitDate: Tue Aug 18 14:58:31 2020 +0200

tdf#135432 native-code: Add missing include for locales

While commit ed8bce1909f658d8e3d950f374931242f91ba811
("fix i18n constructors and android scripts", 2020-08-12)
had added the missing constructors to the native-code.py
script after commit 155c056b1d4674d5ff73bbb5e1ad1dcd1e6aae36
("i18npool: create instances with uno constructors",
2020-07-29), the include for the header containing the
corresponding 'WITH_LOCALE_*' defines was missing,
so expressions like

#if WITH_LOCALE_ALL || WITH_LOCALE_ja

always evaluated to 0, effectively always keeping the
constructors from actually being included.

Therefore, add the missing 'config_locales.h' include.

Change-Id: Icb00e058cc67a6aedac825c122c151c222f40b43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100915
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d0ebd3147d42..b3a7828460d0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -809,6 +809,7 @@ print ("""/*
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin ucb/Library_ucb1.mk ucb/source

2020-08-09 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |8 ++
 ucb/Library_ucb1.mk|1 
 ucb/source/core/FileAccess.cxx |   20 ++-
 ucb/source/core/FileAccess.hxx |   43 ---
 ucb/source/core/cmdenv.cxx |   61 --
 ucb/source/core/cmdenv.hxx |   20 +++
 ucb/source/core/provprox.cxx   |   53 +++
 ucb/source/core/provprox.hxx   |   33 +---
 ucb/source/core/ucb.cxx|   44 
 ucb/source/core/ucb.hxx|   10 ---
 ucb/source/core/ucb1.component |   30 ---
 ucb/source/core/ucbprops.cxx   |   51 +++---
 ucb/source/core/ucbprops.hxx   |   24 +++-
 ucb/source/core/ucbserv.cxx|  111 -
 ucb/source/core/ucbstore.cxx   |   55 +++-
 ucb/source/core/ucbstore.hxx   |   28 --
 16 files changed, 220 insertions(+), 372 deletions(-)

New commits:
commit 3d44c6a49b20415616dab7a2de2820da5efab309
Author: Noel Grandin 
AuthorDate: Wed Jul 15 09:28:31 2020 +0200
Commit: Noel Grandin 
CommitDate: Sun Aug 9 12:03:30 2020 +0200

ucb/core: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ieabf6d417a482ea7cc17e78a78954687e8894cb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98801
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 198768b9c28a..28066c1f42d3 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -21,7 +21,6 @@ import xml.etree.ElementTree as ET
 
 core_factory_list = [
 ("libi18npoollo.a", "i18npool_component_getFactory"),
-("libucb1.a", "ucb_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
 ("libsvtlo.a", "svt_component_getFactory"),
 ]
@@ -345,6 +344,13 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# ucb/source/core/ucb1.component
+"ucb_UcbCommandEnvironment_get_implementation",
+"ucb_UcbContentProviderProxyFactory_get_implementation",
+"ucb_UcbPropertiesManager_get_implementation",
+"ucb_UcbStore_get_implementation",
+"ucb_UniversalContentBroker_get_implementation",
+"ucb_OFileAccess_get_implementation",
 # ucb/source/ucp/file/ucpfile1.component
 "ucb_file_FileProvider_get_implementation",
 # ucb/source/ucp/expand/ucpexpand1.component
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index ce7144f8fe13..6dbb347c1043 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_add_exception_objects,ucb1,\
ucb/source/core/ucb \
ucb/source/core/ucbcmds \
ucb/source/core/ucbprops \
-   ucb/source/core/ucbserv \
ucb/source/core/ucbstore \
ucb/source/core/FileAccess \
ucb/source/regexp/regexp \
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 218bcad33a81..4a816618471e 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -53,8 +53,6 @@
 
 #include 
 
-#include "FileAccess.hxx"
-
 #define SERVICE_NAME "com.sun.star.ucb.SimpleFileAccess"
 
 using namespace ::com::sun::star::uno;
@@ -117,13 +115,13 @@ public:
 virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden 
) override;
 
 OUString SAL_CALL getImplementationName() override
-{ return IMPLEMENTATION_NAME; }
+{ return "com.sun.star.comp.ucb.SimpleFileAccess"; }
 
 sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
 { return cppu::supportsService(this, ServiceName); }
 
 css::uno::Sequence SAL_CALL getSupportedServiceNames() override
-{ return FileAccess_getSupportedServiceNames(); }
+{ return { SERVICE_NAME }; }
 };
 
 // Implementation XActiveDataSink
@@ -694,17 +692,15 @@ void OFileAccess::setHidden( const OUString& FileURL, 
sal_Bool bHidden )
 aCnt.setPropertyValue("IsHidden", Any(bHidden) );
 }
 
-}; // namespace end
 
-Reference< XInterface > FileAccess_CreateInstance( const Reference< 
XMultiServiceFactory > & xSMgr )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+ucb_OFileAccess_get_implementation(
+css::uno::XComponentContext* context , css::uno::Sequence 
const&)
 {
-return Reference < XInterface >( static_cast(new 
OFileAccess( comphelper::getComponentContext(xSMgr) )) );
+return cppu::acquire(new OFileAccess(context));
 }
 
-Sequence< OUString > FileAccess_getSupportedServiceNames()
-{
-Sequence< OUString > seqNames { SERVICE_NAME };
-return seqNames;
-}
+}; // namespace end
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx
deleted file mode 100644
index 7b7b8a037103..
--- a/ucb/source/core/FileAccess.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/

[Libreoffice-commits] core.git: solenv/bin

2020-08-07 Thread Caolán McNamara (via logerrit)

 solenv/bin/hrcex |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d628075b1af0c152e7f50b93b99f3b9744cdc5e7
Author: Caolán McNamara 
AuthorDate: Fri Aug 7 12:42:47 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 7 16:45:03 2020 +0200

hrcex operates on .hrc files

Change-Id: I0841c2d99a00b6b18e3dc4baca2b4bb48ab5b97d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100308
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex
index 1c371a1ed48e..54cef2626a19 100755
--- a/solenv/bin/hrcex
+++ b/solenv/bin/hrcex
@@ -11,7 +11,7 @@ try:
 myopts, args = getopt.getopt(sys.argv[1:], "i:o:")
 except getopt.GetoptError as e:
 print(" Syntax: hrcex -i FileIn -o FileOut")
-print(" FileIn:   Source files (*.ui)")
+print(" FileIn:   Source files (*.hrc)")
 print(" FileOut:  Destination file (*.*)")
 sys.exit(2)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin svtools/inc

2020-08-02 Thread Caolán McNamara (via logerrit)

 solenv/bin/pack_images.py |6 ++
 svtools/inc/bitmaps.hlst  |1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit f716fd1580bcc6042afaab9beba24ca6cbcb1c73
Author: Caolán McNamara 
AuthorDate: Sun Aug 2 18:01:28 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Aug 2 22:07:00 2020 +0200

tdf#135369 on removing an image link, ensure the linked to image is in the 
list

If we removed something that is a link to a real file from our list of 
images
to pack, but that real image is not in the list of images to pack, add it in
instead so the real image does get packed

Change-Id: I71bcbdf872a59194a1d94f287dda8fc27e4a6464
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99961
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py
index 5d368658961f..5ccc194e6307 100644
--- a/solenv/bin/pack_images.py
+++ b/solenv/bin/pack_images.py
@@ -342,7 +342,13 @@ def remove_links_from_zip_list(zip_list, links):
 
 for link in links.keys():
 if link in zip_list:
+module = zip_list[link]
 del zip_list[link]
+# tdf#135369 if we removed something that is a link to a real file
+# from our list of images to pack, but that real image is not in
+# the list of images to pack, add it in instead now
+if links[link] not in zip_list:
+zip_list[links[link]] = module
 
 LOGGER.debug("Cleaned zip list:\n%s", "\n".join(zip_list))
 
diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index cb6a813eac61..35332e05ede0 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -123,5 +123,4 @@
 
 #define BMP_TAB_LOCK "cmd/sc_lock.png"
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin sw/Library_sw.mk sw/source sw/util

2020-07-26 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py|2 
 sw/Library_sw.mk |1 
 sw/source/core/inc/unofreg.hxx   |   38 
 sw/source/uibase/uno/unodoc.cxx  |   47 
 sw/source/uibase/uno/unofreg.cxx |   89 ---
 sw/util/sw.component |5 +-
 6 files changed, 33 insertions(+), 149 deletions(-)

New commits:
commit 3812706bea44b0d1b58a9093845ec3614be7c316
Author: Noel Grandin 
AuthorDate: Sun Jul 26 16:27:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 26 18:42:52 2020 +0200

sw: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ibd5c19d78c1440b489d850fdacbaa74d0c3d1654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99458
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c524d04f5046..c7e664c8c270 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -622,7 +622,6 @@ draw_constructor_list = [
 ]
 
 writer_factory_list = [
-("libswlo.a", "sw_component_getFactory"),
 ]
 
 writer_constructor_list = [
@@ -632,6 +631,7 @@ writer_constructor_list = [
 # filter/source/textfilterdetect/textfd.component
 "com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
 # sw/util/sw.component
+"Writer_SwTextDocument_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation",
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 0707fb93e9c4..5f7c204f0e6a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -740,7 +740,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/uibase/uno/unodefaults \
 sw/source/uibase/uno/unodispatch \
 sw/source/uibase/uno/unodoc \
-sw/source/uibase/uno/unofreg \
 sw/source/uibase/uno/unomailmerge \
 sw/source/uibase/uno/unomod \
 sw/source/uibase/uno/unomodule \
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
deleted file mode 100644
index afb8e6dcdff5..
--- a/sw/source/core/inc/unofreg.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFREG_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFREG_HXX
-
-#include 
-#include 
-
-#include 
-
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
-// writer documents
-css::uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() 
throw();
-OUString SwTextDocument_getImplementationName() throw();
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SwTextDocument_createInstance( 
const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, 
SfxModelFlags _nCreationFlags );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index a61b23778165..d9a6928e2e46 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -18,40 +18,35 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
 // com.sun.star.comp.Writer.TextDocument
 
-uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw()
-{
-// return only top level services here! All others must be
-// resolved by rtti!
-uno::Sequence< OUString > aRet { "com.sun.star.text.TextDocument" };
-return aRet;
-}
-
-OUString SwTextDocument_getImplementationName() throw()
-{
-return "com.sun.star.comp.Writer.TextDocument";
-}
-
-uno::Reference< uno::XInterface > SwTextDocument_createInstance(
-const uno::Reference< lang::XMultiServiceFactory >&, SfxModelFlags 
_nCreationFlags )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+Writer_SwTextDocument_get_implementation(
+css::uno::XComponentContext* , css::

[Libreoffice-commits] core.git: solenv/bin

2020-07-24 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3bb40b608d524b7795aa0e61be97feceac0f1840
Author: Noel Grandin 
AuthorDate: Fri Jul 24 11:49:45 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 24 11:49:45 2020 +0200

fix android build

after
commit 00c7afecc319061b70b77a709ca2ae9583df4145
embeddedobj/util: create instances with uno constructors

Change-Id: If3c1daf0221b7044e8f4128342b362e73a139de1

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 748f84dc4256..b7c95f6885ba 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -20,7 +20,6 @@ import xml.etree.ElementTree as ET
 # referenced in lo_get_constructor_map().
 
 core_factory_list = [
-("libembobj.a", "embobj_component_getFactory"),
 ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
 ("libi18npoollo.a", "i18npool_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
@@ -127,6 +126,10 @@ core_constructor_list = [
 "drawinglayer_XPrimitive2DRenderer",
 # dtrans/util/mcnttype.component
 "dtrans_CMimeContentTypeFactory_get_implementation",
+# embeddedobj/util/embobj.component
+"embeddedobj_UNOEmbeddedObjectCreator_get_implementation",
+"embeddedobj_OOoEmbeddedObjectFactory_get_implementation",
+"embeddedobj_OOoSpecialEmbeddedObjectFactory_get_implementation",
 # emfio/emfio.component
 "emfio_emfreader_XEmfParser_get_implementation",
 # eventattacher/source/evtatt.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-07-23 Thread Stephan Bergmann (via logerrit)

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9e4974e113394e0940b2e03ffb718345f5a65c2
Author: Stephan Bergmann 
AuthorDate: Fri Jul 24 07:50:29 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 24 08:33:06 2020 +0200

Blind fix for Android

...after c049d5336c110196886480330dba9238faee0e39 "scaddins: create 
instances
with uno constructors",

> /tmp/native-code-87dfa4.o:native-code.cxx:lo_get_factory_map::map: error: 
undefined reference to 'embobj_component_getFactory'
> /tmp/native-code-87dfa4.o:native-code.cxx:lo_get_constructor_map::map: 
error: undefined reference to 
'scaddins_ScaDateAddIn_get_implementationscaddins_ScaPricingAddIn_get_implementation'
> clang++: error: linker command failed with exit code 1 (use -v to see 
invocation)
> make[2]: *** [../Bootstrap/Makefile.shared:63: 
/tinderbox/buildslave/build/android/obj/local/armeabi-v7a/liblo-native-code.so] 
Error 1

()

Change-Id: Ib9f18a8aff0f4e32e78d5d9bb2d7b9de85b3f23f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99344
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e53d3adf83eb..c7c3f952446f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -527,7 +527,7 @@ calc_constructor_list = [
 # scaddins/source/analysis/analysis.component
 "scaddins_AnalysisAddIn_get_implementation",
 # scaddins/source/datefunc/date.component
-"scaddins_ScaDateAddIn_get_implementation"
+"scaddins_ScaDateAddIn_get_implementation",
 # scaddins/source/pricing/pricing.component
 "scaddins_ScaPricingAddIn_get_implementation",
 # scripting/source/vbaevents/vbaevents.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-07-23 Thread Stephan Bergmann (via logerrit)

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c614305e306c2f380b85ce9bb518d2732b5542c3
Author: Stephan Bergmann 
AuthorDate: Thu Jul 23 18:55:51 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jul 23 20:16:34 2020 +0200

Blind fix for Android

...after b625194763b43ed09872947165bf3ad4431eb355 "ucb/expand: create
instances with uno constructors",

> native-code.cxx:532:63: error: expected ';' after top level declarator
> void * ucb_expand_ExpandContentProviderImpl_get_implementation.a( void *, 
void * );
>   ^
>   ;
> native-code.cxx:1154:127: error: member reference base type 'void *' is 
not a structure or union
> { "ucb_expand_ExpandContentProviderImpl_get_implementation.a", 
ucb_expand_ExpandContentProviderImpl_get_implementation.a },
>
~~~^~
> 2 errors generated.
> make[2]: *** [../Bootstrap/Makefile.shared:63: 
/tinderbox/buildslave/build/android/obj/local/armeabi-v7a/liblo-native-code.so] 
Error 1

()

Change-Id: Ic9542a13a34c989c8e1e54be18680d6a93d10631
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99332
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ace981f71a28..e53d3adf83eb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -332,7 +332,7 @@ core_constructor_list = [
 # ucb/source/ucp/file/ucpfile1.component
 "ucb_file_FileProvider_get_implementation",
 # ucb/source/ucp/expand/ucpexpand1.component
-("ucb_expand_ExpandContentProviderImpl_get_implementation.a", "#ifdef 
ANDROID"),
+("ucb_expand_ExpandContentProviderImpl_get_implementation", "#ifdef 
ANDROID"),
 # ucb/source/sorter/srtrs1.component
 "ucb_SortedDynamicResultSetFactory_get_implementation",
 # ucb/source/tdoc/ucptdoc1.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin ucb/source

2020-07-22 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |3 +
 ucb/source/ucp/file/filtask.cxx|   13 ---
 ucb/source/ucp/file/filtask.hxx|4 --
 ucb/source/ucp/file/prov.cxx   |   59 -
 ucb/source/ucp/file/prov.hxx   |8 
 ucb/source/ucp/file/ucpfile1.component |5 +-
 6 files changed, 13 insertions(+), 79 deletions(-)

New commits:
commit 47c05f54ca3e74f0fe308ba559aa5929532d095e
Author: Noel Grandin 
AuthorDate: Wed Jul 22 13:47:57 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 22 16:05:06 2020 +0200

ucb/file: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I1650f042a87d7351a126c0701cce8b2e12829461
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99221
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 343c0d44c30a..6007ca156aa6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -25,7 +25,6 @@ core_factory_list = [
 ("libi18npoollo.a", "i18npool_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
 ("libucb1.a", "ucb_component_getFactory"),
-("libucpfile1.a", "ucpfile_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
@@ -330,6 +329,8 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# ucb/source/ucp/file/ucpfile1.component
+"ucb_file_FileProvider_get_implementation",
 # ucb/source/ucp/expand/ucpexpand1.component
 ("ucb_expand_ExpandContentProviderImpl_get_implementation.a", "#ifdef 
ANDROID"),
 # ucb/source/sorter/srtrs1.component
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index b03f758ab038..658b47e2a9ed 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2943,17 +2943,4 @@ TaskManager::getScheme( OUString& Scheme )
   Scheme = "file";
 }
 
-OUString
-TaskManager::getImplementationName_static()
-{
-  return "com.sun.star.comp.ucb.FileProvider";
-}
-
-
-uno::Sequence< OUString >
-TaskManager::getSupportedServiceNames_static()
-{
-  return { "com.sun.star.ucb.FileContentProvider" };
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index f0c20a74e2a5..65bf19ae3e5d 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -642,10 +642,6 @@ namespace fileaccess
 // Methods for "writeComponentInfo" and "createComponentFactory"
 
 static void getScheme( OUString& Scheme );
-
-static OUString getImplementationName_static();
-
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_static();
 };
 
 } // end namespace TaskHandling
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 182713f76704..6cf0ace2daf2 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -48,35 +48,6 @@ using namespace com::sun::star::container;
 #endif
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * ucpfile_component_getFactory(
-const char * pImplName, void * pServiceManager, void * )
-{
-void * pRet = nullptr;
-
-Reference< XMultiServiceFactory > xSMgr(
-static_cast< XMultiServiceFactory * >( pServiceManager ) );
-Reference< XSingleServiceFactory > xFactory;
-
-
-// File Content Provider.
-
-
-if ( fileaccess::TaskManager::getImplementationName_static().
-equalsAscii( pImplName ) )
-{
-xFactory = FileProvider::createServiceFactory( xSMgr );
-}
-
-
-if ( xFactory.is() )
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-
-return pRet;
-}
-
 //
 /*  */
 /*  */
@@ -121,7 +92,7 @@ FileProvider::initialize(
 OUString SAL_CALL
 FileProvider::getImplementationName()
 {
-return fileaccess::TaskManager::getImplementationName_static();
+return "com.sun.star.comp.ucb.FileProvider";
 }
 
 sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName )
@@ -132,29 +103,9 @@ sal_Bool SAL_CALL FileProvider::supportsService(const 
OUString& ServiceName )
 Sequence< OUString > SAL_CALL
 FileProvider::getSupportedServiceNames()
 {
-return fileaccess::TaskManager::getSupportedServiceNames_static();
-}
-
-Reference< XSingleServiceFactory >
-FileProvider::createServiceFactory(
-   const Reference< XMultiServiceFactory >& rxServiceMgr )
-{
-return cppu::createSingleFactor

[Libreoffice-commits] core.git: solenv/bin ucb/source

2020-07-21 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |3 +
 ucb/source/ucp/expand/ucpexpand.cxx|   55 -
 ucb/source/ucp/expand/ucpexpand1.component |5 +-
 3 files changed, 14 insertions(+), 49 deletions(-)

New commits:
commit b625194763b43ed09872947165bf3ad4431eb355
Author: Noel Grandin 
AuthorDate: Tue Jul 21 21:22:56 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 22 08:30:21 2020 +0200

ucb/expand: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I83f75a1d107a74c1c9707243caf323b630f0b33f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99178
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ef80e4886ed3..343c0d44c30a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -25,7 +25,6 @@ core_factory_list = [
 ("libi18npoollo.a", "i18npool_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
 ("libucb1.a", "ucb_component_getFactory"),
-("libucpexpand1lo.a", "ucpexpand1_component_getFactory", "#ifdef ANDROID"),
 ("libucpfile1.a", "ucpfile_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
@@ -331,6 +330,8 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# ucb/source/ucp/expand/ucpexpand1.component
+("ucb_expand_ExpandContentProviderImpl_get_implementation.a", "#ifdef 
ANDROID"),
 # ucb/source/sorter/srtrs1.component
 "ucb_SortedDynamicResultSetFactory_get_implementation",
 # ucb/source/tdoc/ucptdoc1.component
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx 
b/ucb/source/ucp/expand/ucpexpand.cxx
index 8cd7818d6037..aa2f7a87dd2e 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -102,41 +102,22 @@ void ExpandContentProviderImpl::disposing()
 }
 
 
-uno::Reference< uno::XInterface > create(
-uno::Reference< uno::XComponentContext > const & xComponentContext )
-{
-return static_cast< ::cppu::OWeakObject * >(
-new ExpandContentProviderImpl( xComponentContext ) );
-}
-
-
-OUString implName()
-{
-return "com.sun.star.comp.ucb.ExpandContentProvider";
-}
-
-
-uno::Sequence< OUString > supportedServices()
-{
-return uno::Sequence< OUString > {
-OUString("com.sun.star.ucb.ExpandContentProvider"),
-OUString("com.sun.star.ucb.ContentProvider")
-};
-}
-
 // XServiceInfo
 
 OUString ExpandContentProviderImpl::getImplementationName()
 {
 check();
-return implName();
+return "com.sun.star.comp.ucb.ExpandContentProvider";
 }
 
 
 uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames()
 {
 check();
-return supportedServices();
+return {
+"com.sun.star.ucb.ExpandContentProvider",
+"com.sun.star.ucb.ContentProvider"
+};
 }
 
 sal_Bool ExpandContentProviderImpl::supportsService(OUString const & 
serviceName )
@@ -204,32 +185,14 @@ sal_Int32 ExpandContentProviderImpl::compareContentIds(
 }
 }
 
-const ::cppu::ImplementationEntry s_entries [] =
-{
-{
-create,
-implName,
-supportedServices,
-::cppu::createSingleComponentFactory,
-nullptr, 0
-},
-{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-};
 
 }
 
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void * ucpexpand1_component_getFactory(
-const char * pImplName,
-void * pServiceManager,
-void * pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+ucb_expand_ExpandContentProviderImpl_get_implementation(
+css::uno::XComponentContext* context, css::uno::Sequence 
const&)
 {
-return ::cppu::component_getFactoryHelper(
-pImplName, pServiceManager, pRegistryKey, s_entries );
-}
-
+return cppu::acquire(new ExpandContentProviderImpl(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/expand/ucpexpand1.component 
b/ucb/source/ucp/expand/ucpexpand1.component
index ba7c7e90e005..480974a4d313 100644
--- a/ucb/source/ucp/expand/ucpexpand1.component
+++ b/ucb/source/ucp/expand/ucpexpand1.component
@@ -18,8 +18,9 @@
  -->
 
 http://openoffice.org/2010/uno-components";>
-  
+xmlns="http://openoffice.org/2010/uno-components";>
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin ucb/Library_ucphier1.mk ucb/source

2020-07-16 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py|4 +
 ucb/Library_ucphier1.mk  |1 
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |   33 ---
 ucb/source/ucp/hierarchy/hierarchydatasource.hxx |6 --
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx   |   36 
 ucb/source/ucp/hierarchy/hierarchyprovider.hxx   |7 --
 ucb/source/ucp/hierarchy/hierarchyservices.cxx   |   69 ---
 ucb/source/ucp/hierarchy/ucphier1.component  |8 +-
 8 files changed, 36 insertions(+), 128 deletions(-)

New commits:
commit a48ab89fe259d385f20a14f62c9cd9bc7b5b36e9
Author: Noel Grandin 
AuthorDate: Thu Jul 16 10:10:03 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 16 13:15:25 2020 +0200

ucb/hierarchy: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I6c57cf814af386bfb2c2c035d32175c4ff9ef7a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98874
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 931435367b5d..8153cebb6596 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -29,7 +29,6 @@ core_factory_list = [
 ("libucb1.a", "ucb_component_getFactory"),
 ("libucpexpand1lo.a", "ucpexpand1_component_getFactory", "#ifdef ANDROID"),
 ("libucpfile1.a", "ucpfile_component_getFactory"),
-("libucphier1.a", "ucphier1_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
@@ -331,6 +330,9 @@ core_constructor_list = [
 # ucb/source/tdoc/ucptdoc1.component
 "ucb_tdoc_ContentProvider_get_implementation",
 "ucb_tdoc_DocumentContentFactory_get_implementation",
+# ucb/source/ucp/ucphier1.component
+"ucb_HierarchyContentProvider_get_implementation",
+"ucb_HierarchyDataSource_get_implementation",
 # unotools/util/utl.component
 "unotools_ServiceDocument_get_implementation",
 "unotools_OTempFileService_get_implementation",
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index 5e4c6d68c52b..27406f7a9b3c 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_exception_objects,ucphier1,\
ucb/source/ucp/hierarchy/hierarchydatasource \
ucb/source/ucp/hierarchy/hierarchydatasupplier \
ucb/source/ucp/hierarchy/hierarchyprovider \
-   ucb/source/ucp/hierarchy/hierarchyservices \
ucb/source/ucp/hierarchy/hierarchyuri \
 ))
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index c3e9340b57ac..e082994b0105 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace hierarchy_ucp;
@@ -195,35 +196,29 @@ HierarchyDataSource::~HierarchyDataSource()
 }
 
 // XServiceInfo methods.
-
-XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource,
-  "com.sun.star.comp.ucb.HierarchyDataSource" )
-/// @throws css::uno::Exception
-static css::uno::Reference< css::uno::XInterface >
-HierarchyDataSource_CreateInstance( const css::uno::Reference< 
css::lang::XMultiServiceFactory> & rSMgr )
+OUString SAL_CALL HierarchyDataSource::getImplementationName() 
  \
 {
-css::lang::XServiceInfo* pX = new HierarchyDataSource( 
ucbhelper::getComponentContext(rSMgr) );
-return css::uno::Reference< css::uno::XInterface >::query( pX );
+return "com.sun.star.comp.ucb.HierarchyDataSource";
 }
-
-css::uno::Sequence< OUString >
-HierarchyDataSource::getSupportedServiceNames_Static()
+sal_Bool SAL_CALL HierarchyDataSource::supportsService( const OUString& 
ServiceName )
+{
+return cppu::supportsService( this, ServiceName );
+}
+css::uno::Sequence< OUString > HierarchyDataSource::getSupportedServiceNames()
 {
 return { "com.sun.star.ucb.DefaultHierarchyDataSource", 
"com.sun.star.ucb.HierarchyDataSource" };
 }
 
-css::uno::Reference< css::lang::XSingleServiceFactory >
-HierarchyDataSource::createServiceFactory( const css::uno::Reference< 
css::lang::XMultiServiceFactory >& rxServiceMgr )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+ucb_HierarchyDataSource_get_implementation(
+css::uno::XComponentContext* context , css::uno::Sequence 
const&)
 {
-return cppu::createOneInstanceFactory(
-rxServiceMgr,
-HierarchyDataSource::getImplementationName_Static(),
-HierarchyDataSource_CreateInstance,
-HierarchyDataSource::getSupportedServiceNames_Static() );
+static rtl::Reference g_Instance(new 
HierarchyDataSource(context));
+g_Instance->acquire();
+return static_cast(g_Instance.get());
 }
 
 
-
 // XC

[Libreoffice-commits] core.git: solenv/bin stoc/source

2020-07-15 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py|3 +
 stoc/source/proxy_factory/proxyfac.component |5 +-
 stoc/source/proxy_factory/proxyfac.cxx   |   46 ---
 3 files changed, 13 insertions(+), 41 deletions(-)

New commits:
commit 0c688d3491c6f53ed06fbc5946e043e3b7509c63
Author: Noel Grandin 
AuthorDate: Mon Jul 13 22:07:23 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 15 10:05:23 2020 +0200

stoc/proxy: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ic55e4779af26378a41cf31465d4cafd429085596
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98696
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 6ca8e8d2d1da..11952f14333d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -35,7 +35,6 @@ core_factory_list = [
 ("libvcllo.a", "vcl_component_getFactory"),
 ("libsvtlo.a", "svt_component_getFactory"),
 ("libMacOSXSpelllo.a", "MacOSXSpell_component_getFactory", "#ifdef IOS"),
-("libproxyfaclo.a", "proxyfac_component_getFactory"),
 ("libbiblo.a", "bib_component_getFactory"),
 ]
 
@@ -265,6 +264,8 @@ core_constructor_list = [
 "stoc_invocation_adapter_get_implementation",
 # stoc/source/corereflection/reflection.component
 "com_sun_star_comp_stoc_CoreReflection_get_implementation",
+# stoc/source/proxy_factory/proxyfac.component
+"stoc_FactoryImpl_get_implementation",
 # stoc/util/stocservices.component
 "com_sun_star_comp_stoc_OServiceManagerWrapper_get_implementation",
 "com_sun_star_comp_stoc_TypeConverter_get_implementation",
diff --git a/stoc/source/proxy_factory/proxyfac.component 
b/stoc/source/proxy_factory/proxyfac.component
index 69e573f5e761..eee87014ca98 100644
--- a/stoc/source/proxy_factory/proxyfac.component
+++ b/stoc/source/proxy_factory/proxyfac.component
@@ -18,8 +18,9 @@
  -->
 
 http://openoffice.org/2010/uno-components";>
-  
+xmlns="http://openoffice.org/2010/uno-components";>
+  
 
   
 
diff --git a/stoc/source/proxy_factory/proxyfac.cxx 
b/stoc/source/proxy_factory/proxyfac.cxx
index 9c3afd927d03..cecb6d917b39 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -30,16 +30,12 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-
-#define SERVICE_NAME "com.sun.star.reflection.ProxyFactory"
-#define IMPL_NAME "com.sun.star.comp.reflection.ProxyFactory"
+#include 
 
 
 using namespace ::com::sun::star;
@@ -49,17 +45,6 @@ using namespace css::uno;
 namespace
 {
 
-OUString proxyfac_getImplementationName()
-{
-return IMPL_NAME;
-}
-
-Sequence< OUString > proxyfac_getSupportedServiceNames()
-{
-return { SERVICE_NAME };
-}
-
-
 struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo,
  reflection::XProxyFactory 
>
 {
@@ -399,7 +384,7 @@ Reference< XAggregation > FactoryImpl::createProxy(
 
 OUString FactoryImpl::getImplementationName()
 {
-return proxyfac_getImplementationName();
+return "com.sun.star.comp.reflection.ProxyFactory";
 }
 
 sal_Bool FactoryImpl::supportsService( const OUString & rServiceName )
@@ -409,12 +394,12 @@ sal_Bool FactoryImpl::supportsService( const OUString & 
rServiceName )
 
 Sequence< OUString > FactoryImpl::getSupportedServiceNames()
 {
-return proxyfac_getSupportedServiceNames();
+return { "com.sun.star.reflection.ProxyFactory" };
 }
 
-/// @throws Exception
-Reference< XInterface > proxyfac_create(
-SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+stoc_FactoryImpl_get_implementation(
+css::uno::XComponentContext* , css::uno::Sequence const&)
 {
 Reference< XInterface > xRet;
 static osl::Mutex s_mutex;
@@ -429,26 +414,11 @@ Reference< XInterface > proxyfac_create(
 xRet = static_cast< ::cppu::OWeakObject * >(new FactoryImpl);
 rwInstance = xRet;
 }
-return xRet;
+xRet->acquire();
+return xRet.get();
 }
 
-const ::cppu::ImplementationEntry g_entries [] =
-{
-{
-proxyfac_create, proxyfac_getImplementationName,
-proxyfac_getSupportedServiceNames, 
::cppu::createSingleComponentFactory,
-nullptr, 0
-},
-{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-};
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * proxyfac_component_getFactory(
-const char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-return ::cppu::component_getFactoryHelper(
-pImplName, pServiceManager, pRegistryKey, g_entries );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin stoc/source

2020-07-14 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |3 
 stoc/source/invocation_adapterfactory/iafactory.cxx|   49 ++---
 stoc/source/invocation_adapterfactory/invocadapt.component |5 -
 3 files changed, 16 insertions(+), 41 deletions(-)

New commits:
commit 96ada688eaf7454791a5d8f8e0abe68e2c417e26
Author: Noel Grandin 
AuthorDate: Mon Jul 13 22:21:38 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 15 08:48:13 2020 +0200

stoc/invocadapt: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: Ie1c953c58688a0dfbbc8a40385e400b8d0314f3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98699
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2d0b810058c4..6ca8e8d2d1da 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -23,7 +23,6 @@ core_factory_list = [
 ("libembobj.a", "embobj_component_getFactory"),
 ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
 ("libi18npoollo.a", "i18npool_component_getFactory"),
-("libinvocadaptlo.a", "invocadapt_component_getFactory"),
 ("libpackage2.a", "package2_component_getFactory"),
 ("libsmlo.a", "sm_component_getFactory"),
 ("libsrtrs1.a", "srtrs1_component_getFactory"),
@@ -262,6 +261,8 @@ core_constructor_list = [
 "com_sun_star_comp_embed_OLESimpleStorage",
 # stoc/source/inspect/introspection.component
 "com_sun_star_comp_stoc_Introspection_get_implementation",
+# stoc/source/invocation_adapter/invocadapt.component
+"stoc_invocation_adapter_get_implementation",
 # stoc/source/corereflection/reflection.component
 "com_sun_star_comp_stoc_CoreReflection_get_implementation",
 # stoc/util/stocservices.component
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx 
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index cfa05e15e585..65322c3a6234 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -30,9 +31,7 @@
 #include 
 #include 
 
-#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -48,8 +47,6 @@
 #include 
 #include 
 
-#define IMPLNAME"com.sun.star.comp.stoc.InvocationAdapterFactory"
-
 using namespace ::std;
 using namespace ::osl;
 using namespace ::com::sun::star;
@@ -58,16 +55,6 @@ using namespace css::uno;
 namespace stoc_invadp
 {
 
-static Sequence< OUString > invadp_getSupportedServiceNames()
-{
-Sequence< OUString > seqNames { 
"com.sun.star.script.InvocationAdapterFactory" };
-return seqNames;
-}
-
-static OUString invadp_getImplementationName()
-{
-return IMPLNAME;
-}
 
 namespace {
 
@@ -869,7 +856,7 @@ Reference< XInterface > FactoryImpl::createAdapter(
 
 OUString FactoryImpl::getImplementationName()
 {
-return invadp_getImplementationName();
+return "com.sun.star.comp.stoc.InvocationAdapterFactory";
 }
 
 sal_Bool FactoryImpl::supportsService( const OUString & rServiceName )
@@ -879,36 +866,22 @@ sal_Bool FactoryImpl::supportsService( const OUString & 
rServiceName )
 
 Sequence< OUString > FactoryImpl::getSupportedServiceNames()
 {
-return invadp_getSupportedServiceNames();
-}
-
-/// @throws Exception
-static Reference< XInterface > FactoryImpl_create(
-const Reference< XComponentContext > & xContext )
-{
-return static_cast(new FactoryImpl( xContext ));
+return { "com.sun.star.script.InvocationAdapterFactory" };
 }
 
 }
 
 
-const struct ::cppu::ImplementationEntry g_entries[] =
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+stoc_invocation_adapter_get_implementation(
+css::uno::XComponentContext* context, css::uno::Sequence 
const&)
 {
-{
-::stoc_invadp::FactoryImpl_create,
-::stoc_invadp::invadp_getImplementationName,
-::stoc_invadp::invadp_getSupportedServiceNames,
-::cppu::createOneInstanceComponentFactory,
-nullptr, 0
-},
-{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-};
+static rtl::Reference g_Instance(new 
stoc_invadp::FactoryImpl(context));
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * invocadapt_component_getFactory(
-const char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-return ::cppu::component_getFactoryHelper(
-pImplName, pServiceManager, pRegistryKey , g_entries );
+g_Instance->acquire();
+return static_cast(g_Instance.get());
 }
 
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component 
b/stoc/source/invocation_adapterfactory/invocadapt.component
index 85f29833808f..9dbf20e48bad 100644
--- a/stoc/source/invocation_adapterfactory/invocadapt.component
+++ b/stoc/source/invocation_adapterfactory/invocadapt.component
@@ -18,8 +18,9 @@
  -->
 
 http://openoffice.org/2010/uno-components";

[Libreoffice-commits] core.git: solenv/bin svl/source

2020-07-14 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py |3 +
 svl/source/fsstor/fsfactory.cxx   |   56 ++
 svl/source/fsstor/fsstorage.component |5 +--
 svl/source/inc/fsfactory.hxx  |   10 --
 4 files changed, 15 insertions(+), 59 deletions(-)

New commits:
commit 3e50a3023535d4e9e365db046442df1a758e70c4
Author: Noel Grandin 
AuthorDate: Mon Jul 13 22:39:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 15 08:45:06 2020 +0200

svl/fsstorage: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: If5eec92f2c7707bd0c44b80d352d78a84962ff74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98702
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e219a11b8355..dc90b9bc4a6e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -22,7 +22,6 @@ import xml.etree.ElementTree as ET
 core_factory_list = [
 ("libembobj.a", "embobj_component_getFactory"),
 ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
-("libfsstoragelo.a", "fsstorage_component_getFactory"),
 ("libi18npoollo.a", "i18npool_component_getFactory"),
 ("libinvocadaptlo.a", "invocadapt_component_getFactory"),
 ("liblocalebe1lo.a", "localebe1_component_getFactory"),
@@ -271,6 +270,8 @@ core_constructor_list = [
 "com_sun_star_comp_uri_UriReferenceFactory_get_implementation",
 
"com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation",
 
"com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation",
+# svl/source/fsstor/fsstorage.component
+"svl_FSStorageFactory_get_implementation",
 # svtools/util/svt.component
 "com_sun_star_comp_embed_HatchWindowFactory_get_implementation",
 # vcl/vcl.android.component
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 0fec0cefefd6..2b596f1a7cc4 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -35,24 +35,6 @@
 
 using namespace ::com::sun::star;
 
-uno::Sequence< OUString > 
FSStorageFactory::impl_staticGetSupportedServiceNames()
-{
-uno::Sequence< OUString > aRet(2);
-aRet[0] = "com.sun.star.embed.FileSystemStorageFactory";
-aRet[1] = "com.sun.star.comp.embed.FileSystemStorageFactory";
-return aRet;
-}
-
-OUString FSStorageFactory::impl_staticGetImplementationName()
-{
-return "com.sun.star.comp.embed.FileSystemStorageFactory";
-}
-
-uno::Reference< uno::XInterface > SAL_CALL 
FSStorageFactory::impl_staticCreateSelfInstance(
-const uno::Reference< lang::XMultiServiceFactory >& 
xServiceManager )
-{
-return uno::Reference< uno::XInterface >( *new FSStorageFactory( 
comphelper::getComponentContext(xServiceManager) ) );
-}
 
 uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
 {
@@ -153,7 +135,7 @@ uno::Reference< uno::XInterface > SAL_CALL 
FSStorageFactory::createInstanceWithA
 
 OUString SAL_CALL FSStorageFactory::getImplementationName()
 {
-return impl_staticGetImplementationName();
+return "com.sun.star.comp.embed.FileSystemStorageFactory";
 }
 
 sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& 
ServiceName )
@@ -163,37 +145,19 @@ sal_Bool SAL_CALL FSStorageFactory::supportsService( 
const OUString& ServiceName
 
 uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames()
 {
-return impl_staticGetSupportedServiceNames();
+return { "com.sun.star.embed.FileSystemStorageFactory",
+"com.sun.star.comp.embed.FileSystemStorageFactory" };
 }
 
 
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * fsstorage_component_getFactory (
-const char * pImplementationName, void * pServiceManager,
-SAL_UNUSED_PARAMETER void * /* pRegistryKey */)
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+svl_FSStorageFactory_get_implementation(
+css::uno::XComponentContext* context, css::uno::Sequence 
const&)
 {
-void * pResult = nullptr;
-if (pServiceManager)
-{
-uno::Reference< lang::XSingleServiceFactory > xFactory;
-if 
(FSStorageFactory::impl_staticGetImplementationName().equalsAscii(pImplementationName))
-{
-xFactory = cppu::createOneInstanceFactory (
-static_cast< lang::XMultiServiceFactory* >(pServiceManager),
-FSStorageFactory::impl_staticGetImplementationName(),
-FSStorageFactory::impl_staticCreateSelfInstance,
-FSStorageFactory::impl_staticGetSupportedServiceNames() );
-}
-if (xFactory.is())
-{
-xFactory->acquire();
-pResult = xFactory.get();
-}
-}
-return pResult;
+static rtl::Reference g_Instance(new 
FSStorageFactory(context));
+g_Instance->acquire();
+return static_cast(g_Instance.get());
 }
 
-} // extern "C"
-
 /* vim:set shi

[Libreoffice-commits] core.git: solenv/bin ucb/Library_ucptdoc1.mk ucb/source

2020-07-13 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py   |4 -
 ucb/Library_ucptdoc1.mk |1 
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx |   52 +++---
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx |   15 
 ucb/source/ucp/tdoc/tdoc_provider.cxx   |   28 ---
 ucb/source/ucp/tdoc/tdoc_provider.hxx   |7 -
 ucb/source/ucp/tdoc/tdoc_services.cxx   |   71 
 ucb/source/ucp/tdoc/ucptdoc1.component  |8 +-
 8 files changed, 39 insertions(+), 147 deletions(-)

New commits:
commit 0544ea4ef08272543856d69927d0d666f61679b3
Author: Noel Grandin 
AuthorDate: Mon Jul 13 15:05:20 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 13 18:32:46 2020 +0200

ucb/tdoc: create instances with uno constructors

See tdf#74608 for motivation.

Change-Id: I669e3b35dd692b974c040b5d076d18f710d5cc28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98663
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b28e05c408d7..63cd7413942a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -37,7 +37,6 @@ core_factory_list = [
 ("libucpexpand1lo.a", "ucpexpand1_component_getFactory", "#ifdef ANDROID"),
 ("libucpfile1.a", "ucpfile_component_getFactory"),
 ("libucphier1.a", "ucphier1_component_getFactory"),
-("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
@@ -317,6 +316,9 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# ucb/source/tdoc/ucptdoc1.component
+"ucb_tdoc_ContentProvider_get_implementation",
+"ucb_tdoc_DocumentContentFactory_get_implementation",
 # unotools/util/utl.component
 "unotools_ServiceDocument_get_implementation",
 "unotools_OTempFileService_get_implementation",
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index 54ff1fee2fcb..5dc25f3d0229 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_add_exception_objects,ucptdoc1,\
ucb/source/ucp/tdoc/tdoc_passwordrequest \
ucb/source/ucp/tdoc/tdoc_provider \
ucb/source/ucp/tdoc/tdoc_resultset \
-   ucb/source/ucp/tdoc/tdoc_services \
ucb/source/ucp/tdoc/tdoc_stgelems \
ucb/source/ucp/tdoc/tdoc_storage \
ucb/source/ucp/tdoc/tdoc_uri \
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx 
b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index eadd8fcd681f..c069fed082e0 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -24,8 +24,10 @@
 
  */
 
+#include 
 #include 
 #include 
+#include 
 
 #include "tdoc_documentcontentfactory.hxx"
 
@@ -37,8 +39,8 @@ using namespace tdoc_ucp;
 
 
 DocumentContentFactory::DocumentContentFactory(
-const uno::Reference< lang::XMultiServiceFactory >& xSMgr )
-: m_xSMgr( xSMgr )
+const uno::Reference< uno::XComponentContext >& rxContext )
+: m_xContext( rxContext )
 {
 }
 
@@ -55,7 +57,7 @@ DocumentContentFactory::~DocumentContentFactory()
 // virtual
 OUString SAL_CALL DocumentContentFactory::getImplementationName()
 {
-return getImplementationName_Static();
+return "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory";
 }
 
 // virtual
@@ -69,24 +71,7 @@ DocumentContentFactory::supportsService( const OUString& 
ServiceName )
 uno::Sequence< OUString > SAL_CALL
 DocumentContentFactory::getSupportedServiceNames()
 {
-return getSupportedServiceNames_Static();
-}
-
-
-// static
-OUString DocumentContentFactory::getImplementationName_Static()
-{
-return
-"com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory";
-}
-
-
-// static
-uno::Sequence< OUString >
-DocumentContentFactory::getSupportedServiceNames_Static()
-{
-uno::Sequence< OUString > aSNS { 
"com.sun.star.frame.TransientDocumentsDocumentContentFactory" };
-return aSNS;
+return { "com.sun.star.frame.TransientDocumentsDocumentContentFactory" };
 }
 
 
@@ -101,7 +86,7 @@ DocumentContentFactory::createDocumentContent(
 uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac;
 try
 {
-xDocFac.set( 
m_xSMgr->createInstance("com.sun.star.ucb.TransientDocumentsContentProvider"),
+xDocFac.set( 
m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.ucb.TransientDocumentsContentProvider",
 m_xContext),
  uno::UNO_QUERY );
 }
 catch ( uno::Exception

[Libreoffice-commits] core.git: solenv/bin

2020-07-13 Thread Samuel Mehrbrodt (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 92e816e08a983334d78ebb4bd49a39a782e8a053
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jul 13 12:10:20 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 13 12:41:34 2020 +0200

Fix android build

After d4ff75676920b6d1c6decdfc9906a3efdf68cf69

Change-Id: If0549633fbc35b2cc6a42458b7671103f2939379
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98624
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e489d23aed13..4105d0691565 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -39,7 +39,6 @@ core_factory_list = [
 ("libucphier1.a", "ucphier1_component_getFactory"),
 ("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
-("libxmlfalo.a", "xmlfa_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
 ("libspelllo.a", "spell_component_getFactory", "#ifndef IOS"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-07-09 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f2cb874d6de86dfffe13fe6f051b1ea84d8e628a
Author: Noel Grandin 
AuthorDate: Fri Jul 10 08:56:44 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 10 08:56:44 2020 +0200

fix android build

after commit c6aa0d055ec6a102c269a4e1cd0fa98fd7c99d66
Date:   Thu Jul 9 14:07:25 2020 +0200
eventattacher: create instances with uno constructors

Change-Id: Iae1bab85e7d2f32931cec27daa2fc30b6c4a0994

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d67cf7209766..06dd076a8eff 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -21,7 +21,6 @@ import xml.etree.ElementTree as ET
 
 core_factory_list = [
 ("libembobj.a", "embobj_component_getFactory"),
-("libevtattlo.a", "evtatt_component_getFactory"),
 ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
 ("libfsstoragelo.a", "fsstorage_component_getFactory"),
 ("libhyphenlo.a", "hyphen_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin unotools/inc unotools/IwyuFilter_unotools.yaml unotools/Library_utl.mk unotools/source unotools/util

2020-07-09 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |4 +-
 unotools/IwyuFilter_unotools.yaml  |3 -
 unotools/Library_utl.mk|1 
 unotools/inc/pch/precompiled_utl.hxx   |1 
 unotools/inc/unotoolsservices.hxx  |   22 
 unotools/source/misc/ServiceDocumenter.cxx |   51 -
 unotools/source/misc/ServiceDocumenter.hxx |9 -
 unotools/source/misc/unotoolsservices.cxx  |   23 -
 unotools/source/ucbhelper/XTempFile.hxx|9 -
 unotools/source/ucbhelper/xtempfile.cxx|   30 -
 unotools/util/utl.component|8 ++--
 11 files changed, 89 insertions(+), 72 deletions(-)

New commits:
commit 3cff8c64e916eac04332c91d0bd424d4459a960b
Author: Noel Grandin 
AuthorDate: Wed Jul 8 15:44:53 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 9 11:02:45 2020 +0200

unotools: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I7a68484564aea9b416c12d5364d20ff8af77f40b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98380
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 409fda1798bf..ef2ed63dbf34 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -40,7 +40,6 @@ core_factory_list = [
 ("libucpfile1.a", "ucpfile_component_getFactory"),
 ("libucphier1.a", "ucphier1_component_getFactory"),
 ("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
-("libutllo.a", "utl_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libxmlfdlo.a", "xmlfd_component_getFactory"),
 ("libxmlfalo.a", "xmlfa_component_getFactory"),
@@ -304,6 +303,9 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# unotools/util/utl.component
+"unotools_ServiceDocument_get_implementation",
+"unotools_OTempFileService_get_implementation",
 # unoxml/source/rdf/unordf.component
 "unoxml_rdfRepository_get_implementation",
 "unoxml_CURI_get_implementation",
diff --git a/unotools/IwyuFilter_unotools.yaml 
b/unotools/IwyuFilter_unotools.yaml
index 74d2033fad7e..f26aa4001590 100644
--- a/unotools/IwyuFilter_unotools.yaml
+++ b/unotools/IwyuFilter_unotools.yaml
@@ -1,9 +1,6 @@
 ---
 assumeFilename: unotools/source/i18n/resmgr.cxx
 blacklist:
-unotools/inc/unotoolsservices.hxx:
-# Needed for extern declaration
-- namespace comphelper::service_decl { class ServiceDecl; } }
 unotools/source/config/itemholder1.hxx:
 # Base class needs complete type
 - com/sun/star/lang/XEventListener.hpp
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index b7c06cbf4a7f..84be1bb84b70 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/misc/mediadescriptor \
 unotools/source/misc/sharedunocomponent \
 unotools/source/misc/syslocale \
-unotools/source/misc/unotoolsservices \
 unotools/source/misc/wincodepage \
 unotools/source/misc/ServiceDocumenter \
 unotools/source/misc/ZipPackageHelper \
diff --git a/unotools/inc/pch/precompiled_utl.hxx 
b/unotools/inc/pch/precompiled_utl.hxx
index 56d6decc7aa7..e54f7c9826f4 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -142,7 +142,6 @@
 #include 
 #include 
 #include 
-#include 
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/inc/unotoolsservices.hxx 
b/unotools/inc/unotoolsservices.hxx
deleted file mode 100644
index 8a99f09e99ac..
--- a/unotools/inc/unotoolsservices.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_UNOTOOLS_INC_UNOTOOLSSERVICES_HXX
-#define INCLUDED_UNOTOOLS_INC_UNOTOOLSSERVICES_HXX
-
-#include 
-
-namespace comphelper::service_decl { class ServiceDecl; }
-
-extern comphelper::service_decl::ServiceDecl const OTempFileServiceDecl;
-extern comphelper::service_decl::ServiceDecl const ServiceDocumenterDecl;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/unotools/source/misc/ServiceDocumenter.cxx 
b/unotools/source/misc/ServiceDocumenter.cxx
index 0823d2a6651e..b2decb6b9a53 100644
--- a/unotools/source/misc/ServiceDocumenter.cxx
+++ b/unotools/source/misc/ServiceDocumenter.cxx
@@ -7,10 +7,12 @@
  * file, You can ob

[Libreoffice-commits] core.git: solenv/bin

2020-07-09 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 966ad3db0a7330f29d2056e46d245b9320b3202a
Author: Tor Lillqvist 
AuthorDate: Thu Jul 9 10:04:51 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jul 9 10:13:24 2020 +0200

There is no 
com_sun_star_comp_dbaccess_DatabaseDataProvider_get_implementation

Change-Id: I90f61ca1209a213757e60346ce77aff6912c8b58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98398
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index bdda0b5525ef..409fda1798bf 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -142,7 +142,6 @@ core_constructor_list = [
 # cui/util/cui.component
 "com_sun_star_cui_ColorPicker_get_implementation",
 # dbaccess/util/dba.component
-"com_sun_star_comp_dbaccess_DatabaseDataProvider_get_implementation",
 "com_sun_star_comp_dba_DataAccessDescriptorFactory",
 "com_sun_star_comp_dba_OCommandDefinition",
 "com_sun_star_comp_dba_OComponentDefinition",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-07-09 Thread Tor Lillqvist (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5be7042e2df49262d6b0bed1c2247c844ce152f1
Author: Tor Lillqvist 
AuthorDate: Thu Jul 9 09:57:31 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Jul 9 09:49:11 2020 +0200

There is no com_sun_star_comp_dba_ODatabaseContext_get_implementation

Change-Id: Ic22eb0c075c195d4480c8757642d902003bd22d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98397
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 32972c8a7fae..bdda0b5525ef 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -146,7 +146,6 @@ core_constructor_list = [
 "com_sun_star_comp_dba_DataAccessDescriptorFactory",
 "com_sun_star_comp_dba_OCommandDefinition",
 "com_sun_star_comp_dba_OComponentDefinition",
-"com_sun_star_comp_dba_ODatabaseContext_get_implementation",
 "com_sun_star_comp_dba_ODatabaseDocument",
 "com_sun_star_comp_dba_ODatabaseSource",
 "com_sun_star_comp_dba_ORowSet_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin unoxml/Library_unordf.mk unoxml/Library_unoxml.mk unoxml/source

2020-07-08 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py   |   11 +++-
 unoxml/Library_unordf.mk|1 
 unoxml/Library_unoxml.mk|1 
 unoxml/source/dom/documentbuilder.cxx   |   25 +++--
 unoxml/source/dom/documentbuilder.hxx   |7 --
 unoxml/source/dom/saxbuilder.cxx|   31 ---
 unoxml/source/dom/saxbuilder.hxx|   11 +---
 unoxml/source/rdf/CBlankNode.cxx|   29 ++
 unoxml/source/rdf/CLiteral.cxx  |   29 ++
 unoxml/source/rdf/CNodes.hxx|   61 --
 unoxml/source/rdf/CURI.cxx  |   30 ++-
 unoxml/source/rdf/librdf_repository.cxx |   27 ++
 unoxml/source/rdf/librdf_repository.hxx |   39 --
 unoxml/source/rdf/librdf_services.cxx   |   62 ---
 unoxml/source/rdf/unordf.component  |   11 ++--
 unoxml/source/service/services.cxx  |   85 
 unoxml/source/service/unoxml.component  |   11 ++--
 unoxml/source/xpath/xpathapi.cxx|   34 
 unoxml/source/xpath/xpathapi.hxx|   15 +
 19 files changed, 88 insertions(+), 432 deletions(-)

New commits:
commit f4fc5dc31eeb728777104c9ece2788bcc4bdea89
Author: Noel Grandin 
AuthorDate: Wed Jul 8 09:50:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jul 8 20:26:28 2020 +0200

unoxml: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I636d92faa3b26ac06c044c0485e632967daa709c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98313
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b1bfc8903107..32972c8a7fae 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -40,8 +40,6 @@ core_factory_list = [
 ("libucpfile1.a", "ucpfile_component_getFactory"),
 ("libucphier1.a", "ucphier1_component_getFactory"),
 ("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
-("libunordflo.a", "unordf_component_getFactory"),
-("libunoxmllo.a", "unoxml_component_getFactory"),
 ("libutllo.a", "utl_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libxmlfdlo.a", "xmlfd_component_getFactory"),
@@ -308,6 +306,15 @@ core_constructor_list = [
 "stardiv_Toolkit_VCLXPointer_get_implementation",
 "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
 "stardiv_Toolkit_VCLXToolkit_get_implementation",
+# unoxml/source/rdf/unordf.component
+"unoxml_rdfRepository_get_implementation",
+"unoxml_CURI_get_implementation",
+"unoxml_CLiteral_get_implementation",
+"unoxml_CBlankNode_get_implementation",
+# unoxml/source/service/unoxml.component
+"unoxml_CXPathAPI_get_implementation",
+"unoxml_CSAXDocumentBuilder_get_implementation",
+"unoxml_CDocumentBuilder_get_implementation",
 # uui/util/uui.component
 "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
 
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 27640e70f0e4..8998c6aac73b 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
 unoxml/source/rdf/CURI \
 unoxml/source/rdf/CLiteral \
 unoxml/source/rdf/librdf_repository \
-unoxml/source/rdf/librdf_services \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 1d2202aa8839..34d9fe555e63 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,unoxml,\
 unoxml/source/events/mutationevent \
 unoxml/source/events/uievent \
 unoxml/source/events/mouseevent \
-unoxml/source/service/services \
 ))
 
 $(eval $(call gb_Library_set_include,unoxml,\
diff --git a/unoxml/source/dom/documentbuilder.cxx 
b/unoxml/source/dom/documentbuilder.cxx
index 03f4b2a79e91..7eaa8095511f 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -96,28 +96,14 @@ namespace DOM
 xmlInitParser();
 }
 
-Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< 
XMultiServiceFactory >& )
-{
-return static_cast< XDocumentBuilder* >(new CDocumentBuilder);
-}
-
-OUString CDocumentBuilder::_getImplementationName()
-{
-return "com.sun.star.comp.xml.dom.DocumentBuilder";
-}
-Sequence CDocumentBuilder::_getSupportedServiceNames()
-{
-return { "com.sun.star.xml.dom.DocumentBuilder" };
-}
-
 Sequence< OUString > SAL_CALL CDocumentBuilder::getSupportedServiceNames()
 {
-return CDocumentBuilder::_getSupportedServiceNames();
+return { "com.sun.star.xml.dom.DocumentBuilder" };
 }
 
 OUString SAL_CALL CDocumentBuilder::getImplementationName()
 {

[Libreoffice-commits] core.git: solenv/bin vcl/inc vcl/source vcl/vcl.android.component vcl/vcl.ios.component vcl/vcl.macosx.component vcl/vcl.unx.component

2020-07-07 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py|2 +
 vcl/inc/factory.hxx  |5 --
 vcl/source/components/dtranscomp.cxx |   60 +++
 vcl/source/components/factory.cxx|6 ---
 vcl/vcl.android.component|5 +-
 vcl/vcl.ios.component|5 +-
 vcl/vcl.macosx.component |3 +
 vcl/vcl.unx.component|3 +
 8 files changed, 19 insertions(+), 70 deletions(-)

New commits:
commit 05d286e0065ff1c10e75827ac4726b5a74747128
Author: Noel Grandin 
AuthorDate: Tue Jul 7 15:55:05 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jul 7 19:58:39 2020 +0200

vcl/clipboard: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I8b50ccb014adeba8fa5084bcb804dfa61fa61159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98265
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d9d50e81103d..4f387be3186a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -304,6 +304,8 @@ core_constructor_list = [
 # uui/util/uui.component
 "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
 
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
+# vcl/*.component
+"vcl_SystemClipboard_get_implementation",
 # xmloff/source/transform/xof.component
 "xmloff_XMLCalcContentImportOOO_get_implementation",
 "xmloff_XMLCalcImportOOO_get_implementation",
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index f32fdaee6012..4a808d29c70b 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -36,11 +36,6 @@ namespace com::sun::star {
 
 namespace vcl {
 
-OUString Clipboard_getImplementationName();
-
-css::uno::Reference
-Clipboard_createFactory();
-
 css::uno::Sequence DragSource_getSupportedServiceNames();
 
 OUString DragSource_getImplementationName();
diff --git a/vcl/source/components/dtranscomp.cxx 
b/vcl/source/components/dtranscomp.cxx
index c7bda5361fdb..7e5f36f67f7d 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -185,64 +185,16 @@ void GenericClipboard::removeClipboardListener( const 
Reference< datatransfer::c
 m_aListeners.erase(std::remove(m_aListeners.begin(), m_aListeners.end(), 
listener), m_aListeners.end());
 }
 
-namespace {
-
-class ClipboardFactory : public ::cppu::WeakComponentImplHelper<
-css::lang::XSingleServiceFactory
->
-{
-osl::Mutex m_aMutex;
-public:
-ClipboardFactory();
-
-/*
- *  XSingleServiceFactory
- */
-virtual Reference< XInterface > SAL_CALL createInstance() override;
-virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( 
const Sequence< Any >& rArgs ) override;
-};
-
-}
-
-ClipboardFactory::ClipboardFactory() :
-cppu::WeakComponentImplHelper<
-css::lang::XSingleServiceFactory
->( m_aMutex )
-{
-}
 
-Reference< XInterface > ClipboardFactory::createInstance()
-{
-return createInstanceWithArguments( Sequence< Any >() );
-}
 
-Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const 
Sequence< Any >& arguments )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+vcl_SystemClipboard_get_implementation(
+css::uno::XComponentContext* , css::uno::Sequence const& 
args)
 {
 SolarMutexGuard aGuard;
-Reference< XInterface > xResult = 
ImplGetSVData()->mpDefInst->CreateClipboard( arguments );
-return xResult;
-}
-
-OUString Clipboard_getImplementationName()
-{
-return
-#if defined MACOSX
-"com.sun.star.datatransfer.clipboard.AquaClipboard"
-#elif defined IOS
-"com.sun.star.datatransfer.clipboard.iOSClipboard"
-#elif defined ANDROID
-"com.sun.star.datatransfer.VCLGenericClipboard"
-#elif defined UNX
-"com.sun.star.datatransfer.X11ClipboardSupport"
-#else
-"com.sun.star.datatransfer.VCLGenericClipboard"
-#endif
- ;
-}
-
-Reference< XSingleServiceFactory > Clipboard_createFactory()
-{
-return Reference< XSingleServiceFactory >( new ClipboardFactory() );
+auto xClipboard = ImplGetSVData()->mpDefInst->CreateClipboard( args );
+xClipboard->acquire();
+return xClipboard.get();
 }
 
 namespace {
diff --git a/vcl/source/components/factory.cxx 
b/vcl/source/components/factory.cxx
index 6c1cfe2ec872..0a5b7e8f6f8c 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -43,11 +43,7 @@ extern "C" {
 static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr )
 );
 Reference< css::lang::XSingleServiceFactory > xFactory;
-if( vcl::Clipboard_getImplementationName().equalsAscii( 
pImplementationName ) )
-{
-xFactory = vcl::Clipboard_createFactory();
-}
-else if( vcl::DragSource_getImplementationName().equalsAscii( 
pImplementationName ) )
+

[Libreoffice-commits] core.git: solenv/bin xmlscript/Library_xmlscript.mk xmlscript/source xmlscript/util

2020-07-06 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py  |2 -
 xmlscript/Library_xmlscript.mk |1 
 xmlscript/source/inc/unoservices.hxx   |   45 --
 xmlscript/source/misc/unoservices.cxx  |   49 -
 xmlscript/source/xml_helper/xml_impctx.cxx |   27 ---
 xmlscript/util/xmlscript.component |5 +-
 6 files changed, 12 insertions(+), 117 deletions(-)

New commits:
commit 67f4ece34ffae7404eaefc0286dfbe3ad64289ea
Author: Noel Grandin 
AuthorDate: Mon Jul 6 10:04:59 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 6 20:17:26 2020 +0200

xmlscript: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I648835e938746ff4f89b05d73d8960f9f8953070
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98191
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 5f6b48e6daa2..93157dcec0e9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -49,7 +49,6 @@ core_factory_list = [
 ("libxmlfdlo.a", "xmlfd_component_getFactory"),
 ("libxmlfalo.a", "xmlfa_component_getFactory"),
 ("libodfflatxmllo.a", "odfflatxml_component_getFactory"),
-("libxmlscriptlo.a", "xmlscript_component_getFactory"),
 ("libmcnttype.a", "mcnttype_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
 ("libspelllo.a", "spell_component_getFactory", "#ifndef IOS"),
@@ -383,6 +382,7 @@ core_constructor_list = [
 "com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation",
 
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
 # xmlscript/util/xmlscript.component
+"com_sun_star_comp_xml_input_SaxDocumentHandler_get_implementation",
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
 # xmlsecurity/util/xmlsecurity.component
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index 1f9387e150d2..40852a12bb70 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_add_defs,xmlscript,\
 $(eval $(call 
gb_Library_set_precompiled_header,xmlscript,xmlscript/inc/pch/precompiled_xmlscript))
 
 $(eval $(call gb_Library_add_exception_objects,xmlscript,\
-xmlscript/source/misc/unoservices \
 xmlscript/source/xml_helper/xml_byteseq \
 xmlscript/source/xml_helper/xml_element \
 xmlscript/source/xml_helper/xml_impctx \
diff --git a/xmlscript/source/inc/unoservices.hxx 
b/xmlscript/source/inc/unoservices.hxx
deleted file mode 100644
index aecdcea30427..
--- a/xmlscript/source/inc/unoservices.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include 
-
-#include 
-#include 
-
-namespace com::sun::star::uno {
-class XComponentContext;
-class XInterface;
-}
-
-namespace xmlscript {
-
-css::uno::Sequence
-getSupportedServiceNames_DocumentHandlerImpl();
-
-OUString getImplementationName_DocumentHandlerImpl();
-
-css::uno::Reference create_DocumentHandlerImpl(
-css::uno::Reference const & xContext);
-
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/source/misc/unoservices.cxx 
b/xmlscript/source/misc/unoservices.cxx
deleted file mode 100644
index 31c5e7593a26..
--- a/xmlscript/source/misc/unoservices.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this wo

[Libreoffice-commits] core.git: solenv/bin xmloff/Library_xof.mk xmloff/source

2020-07-06 Thread Noel Grandin (via logerrit)

 solenv/bin/native-code.py |   31 +++
 xmloff/Library_xof.mk |1 
 xmloff/source/transform/OOo2Oasis.cxx |   40 +---
 xmloff/source/transform/Oasis2OOo.cxx |   22 --
 xmloff/source/transform/XMLFilterRegistration.cxx |  134 --
 xmloff/source/transform/XMLFilterRegistration.hxx |  203 --
 xmloff/source/transform/xof.component |   89 ++---
 7 files changed, 106 insertions(+), 414 deletions(-)

New commits:
commit 358674b87b8d9cd78079fb105aa81b50f4b5029b
Author: Noel Grandin 
AuthorDate: Mon Jul 6 11:35:33 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 6 18:14:26 2020 +0200

xmloff/xof: create instances with uno constructors

See tdf#74608 for motivation

Also, the following
OOO_IMPORTER( XMLMathSettingsImportOOO,
  "com.sun.star.comp.Math.XMLSettingsImporter",
  "com.sun.star.comp.Math.XMLOasisSettingsImporter" )
was in the xof.component file, but was not listed in the factory class.

I fixed that, but it means we might see some differences in import
behaviour when reading math documents

Change-Id: I025b800ded28746d19e43b37032a5b37faee9b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98198
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e18af665c835..5f6b48e6daa2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -45,7 +45,6 @@ core_factory_list = [
 ("libunordflo.a", "unordf_component_getFactory"),
 ("libunoxmllo.a", "unoxml_component_getFactory"),
 ("libutllo.a", "utl_component_getFactory"),
-("libxoflo.a", "xof_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libxmlfdlo.a", "xmlfd_component_getFactory"),
 ("libxmlfalo.a", "xmlfa_component_getFactory"),
@@ -302,6 +301,36 @@ core_constructor_list = [
 # uui/util/uui.component
 "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
 
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
+# xmloff/source/transform/xof.component
+"xmloff_XMLCalcContentImportOOO_get_implementation",
+"xmloff_XMLCalcImportOOO_get_implementation",
+"xmloff_XMLCalcMetaImportOOO_get_implementation",
+"xmloff_XMLCalcSettingsImportOOO_get_implementation",
+"xmloff_XMLCalcStylesImportOOO_get_implementation",
+"xmloff_XMLChartContentImportOOO_get_implementation",
+"xmloff_XMLChartImportOOO_get_implementation",
+"xmloff_XMLChartStylesImportOOO_get_implementation",
+"xmloff_XMLDrawContentImportOOO_get_implementation",
+"xmloff_XMLDrawImportOOO_get_implementation",
+"xmloff_XMLDrawMetaImportOOO_get_implementation",
+"xmloff_XMLDrawSettingsImportOOO_get_implementation",
+"xmloff_XMLDrawStylesImportOOO_get_implementation",
+"xmloff_XMLImpressContentImportOOO_get_implementation",
+"xmloff_XMLImpressImportOOO_get_implementation",
+"xmloff_XMLImpressMetaImportOOO_get_implementation",
+"xmloff_XMLImpressSettingsImportOOO_get_implementation",
+"xmloff_XMLImpressStylesImportOOO_get_implementation",
+"xmloff_XMLMathMetaImportOOO_get_implementation",
+"xmloff_XMLMathSettingsImportOOO_get_implementation",
+"xmloff_OOo2OasisTransformer_get_implementation",
+"xmloff_Oasis2OOoTransformer_get_implementation",
+"xmloff_XMLAutoTextEventImportOOO_get_implementation",
+"xmloff_XMLWriterContentImportOOO_get_implementation",
+"xmloff_XMLWriterImportOOO_get_implementation",
+"xmloff_XMLWriterMetaImportOOO_get_implementation",
+"xmloff_XMLWriterSettingsImportOOO_get_implementation",
+"xmloff_XMLWriterStylesImportOOO_get_implementation",
+"xmloff_XMLMetaImportOOO_get_implementation",
 # xmloff/util/xo.component
 "XMLMetaExportComponent_get_implementation",
 "XMLMetaExportOOo_get_implementation",
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index a10776d81127..557935a6efc6 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
 xmloff/source/transform/TransformerBase \
 xmloff/source/transform/TransformerContext \
 xmloff/source/transform/TransformerTokenMap \
-xmloff/source/transform/XMLFilterRegistration \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmloff/source/transform/OOo2Oasis.cxx 
b/xmloff/source/transform/OOo2Oasis.cxx
index 6211b9982d7a..58c100ec5856 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -40,7 +40,6 @@
 #include "PropertyActionsOOo.hxx"
 #include "TransformerActions.hxx"
 #include "OOo2Oasis.hxx"
-#include "XMLFilterRegistration.hxx"
 #include 
 #include 
 
@@ -1999,38 +1998,21 @@ Sequence< css::uno::Type > SAL_CALL 
OOo2OasisTransformer::getTypes()
 
 // Service registration
 
-OUStri

[Libreoffice-commits] core.git: solenv/bin

2020-06-26 Thread Miklos Vajna (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9e786fb90ca2c74e884eafdd462be4eddedad110
Author: Miklos Vajna 
AuthorDate: Fri Jun 26 11:22:16 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 26 11:23:52 2020 +0200

solenv: fix Android build

Change-Id: I6938049072f458f45d47a1a5ae8901767d95e83b

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0bbf6ecb66f4..ec0cd0f75c25 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -305,7 +305,6 @@ core_constructor_list = [
 "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
 "com_sun_star_comp_Impress_XMLStylesExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLContentExporter_get_implementation",
-"com_sun_star_comp_Impress_XMLMetaExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLSettingsExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLExporter_get_implementation",
 "com_sun_star_comp_Draw_XMLExporter_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-06-12 Thread Christian Lohmaier (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit cb3c87f2c51faae58995d499a966e72092d9299a
Author: Christian Lohmaier 
AuthorDate: Fri Jun 12 13:35:50 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jun 12 13:35:50 2020 +0200

android buildfix - xo_component_getFactory is no more

192721b6c7698d1db2d9d404c6f30b2eb9224796 removed the factory

Change-Id: I4397d656ff9e6fa56539d949f7609061309edd7d

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d828d81630a4..908d50787754 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,6 @@ core_factory_list = [
 ("libunoxmllo.a", "unoxml_component_getFactory"),
 ("libutllo.a", "utl_component_getFactory"),
 ("libxoflo.a", "xof_component_getFactory"),
-("libxolo.a", "xo_component_getFactory"),
 ("libxstor.a", "xstor_component_getFactory"),
 ("libvclcanvaslo.a", "vclcanvas_component_getFactory"),
 ("libmtfrendererlo.a", "mtfrenderer_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild

2020-06-10 Thread Noel Grandin (via logerrit)

 solenv/bin/lldb-core-bt.sh   |   50 ---
 solenv/gbuild/platform/macosx.mk |3 --
 2 files changed, 53 deletions(-)

New commits:
commit 43d9959b9165faa4d67618774736b03ce60253ab
Author: Noel Grandin 
AuthorDate: Tue Jun 9 13:37:22 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 10 09:47:44 2020 +0200

Revert "enable backtraces for unit tests on macos"

This reverts commit 756c027198adc5212d46d72e0628c90698652af5.

Reason for revert: It never did work (was a test), and it cannot work 
because cores are all stored in /cores under mac, which means we cannot tell 
which cores belongs to which unit tests, or even if it belongs to the current 
build on jenkins

Change-Id: I866173a41077dbb40d61fb81953d7a92f7d0789e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95888
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/lldb-core-bt.sh b/solenv/bin/lldb-core-bt.sh
deleted file mode 100755
index def4a8939db0..
--- a/solenv/bin/lldb-core-bt.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-EXECUTABLE=${1}
-COREDIR=${2}
-EXITCODE=${3}
-
-if test -n "$(which lldb)"
-then
-found=
-for COREFILE in "$COREDIR"/core*
-do
-if [ -f "$COREFILE" ]
-then
-guess=$(file "$COREFILE")
-guess=${guess#* execfn: \'}
-guess=${guess%%\'*}
-if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
-printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-"$guess" "$COREFILE"
-$LLDBCOMMANDFILE=$(mktemp)
-printf "target create -c $COREFILE $guess\nthread backtrace 
all\nquit\n" >"$LLDBCOMMANDFILE"
-lldb -s "$LLDBCOMMANDFILE" --batch \
-&& found=x
-rm "$LLDBCOMMANDFILE"
-echo
-fi
-done
-if [ -z "$found" -a "$EXITCODE" -ge 128 ]; then
-echo
-echo "No core file identified in directory ${COREDIR}"
-echo "To show backtraces for crashes during test execution,"
-echo "enable core files with:"
-echo
-echo "   ulimit -c unlimited"
-echo
-exit 1
-fi
-else
-echo "You need lldb in your path to show backtraces"
-exit 1
-fi
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f9a805b6b62e..c743511207ce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -266,10 +266,7 @@ gb_CppunitTest_malloc_check := MallocScribble=1 
MallocPreScribble=1
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
-endef
 
-define gb_CppunitTest_postprocess
-$(SRCDIR)/solenv/bin/lldb-core-bt.sh $(1) $(2) $(3)
 endef
 
 # JunitTest class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin solenv/clang-format xmloff/inc xmloff/Library_xo.mk xmloff/source xmloff/util

2020-06-10 Thread Miklos Vajna (via logerrit)

 solenv/bin/native-code.py |1 
 solenv/clang-format/blacklist |2 
 xmloff/Library_xo.mk  |1 
 xmloff/inc/facreg.hxx |   43 ---
 xmloff/inc/pch/precompiled_xo.hxx |1 
 xmloff/source/chart/SchXMLExport.cxx  |1 
 xmloff/source/chart/SchXMLImport.cxx  |1 
 xmloff/source/core/facreg.cxx |   71 --
 xmloff/source/draw/animationimport.cxx|1 
 xmloff/source/draw/sdxmlexp.cxx   |1 
 xmloff/source/meta/MetaExportComponent.cxx|1 
 xmloff/source/text/XMLAutoTextEventExport.cxx |   24 ++--
 xmloff/source/text/XMLAutoTextEventImport.cxx |1 
 xmloff/util/xo.component  |3 -
 14 files changed, 9 insertions(+), 143 deletions(-)

New commits:
commit 192721b6c7698d1db2d9d404c6f30b2eb9224796
Author: Miklos Vajna 
AuthorDate: Tue Jun 9 21:10:34 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 10 09:27:48 2020 +0200

xmloff: create XMLAutoTextEventExportOOO instances with an uno constructor

See tdf#74608 for motivation.

Change-Id: Ibb3bc2afba00ff962e3ed4f14a5e5a3c735a1a29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95963
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ce4fcdec6d1f..d828d81630a4 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -338,6 +338,7 @@ core_constructor_list = [
 "com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation",
 "com_sun_star_comp_Chart_XMLOasisExporter_get_implementation",
 
"com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation",
+"com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation",
 
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index a9c77a4b8c10..566479f935ad 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17789,7 +17789,6 @@ xmloff/inc/XMLTextColumnsPropertyHandler.hxx
 xmloff/inc/XMLTextHeaderFooterContext.hxx
 xmloff/inc/animationimport.hxx
 xmloff/inc/animimp.hxx
-xmloff/inc/facreg.hxx
 xmloff/inc/fasttokenhandler.hxx
 xmloff/inc/forms/form_handler_factory.hxx
 xmloff/inc/forms/property_handler.hxx
@@ -17881,7 +17880,6 @@ xmloff/source/core/XMLBasicExportFilter.cxx
 xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
 xmloff/source/core/attrlist.cxx
-xmloff/source/core/facreg.cxx
 xmloff/source/core/fasttokenhandler.cxx
 xmloff/source/core/i18nmap.cxx
 xmloff/source/core/nmspmap.cxx
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 3ea643c4be8f..d101fb6a02e8 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -104,7 +104,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
 xmloff/source/core/XMLEmbeddedObjectExportFilter \
 xmloff/source/core/XMLEmbeddedObjectImportContext \
 xmloff/source/core/attrlist \
-xmloff/source/core/facreg \
 xmloff/source/core/i18nmap \
 xmloff/source/core/nmspmap \
 xmloff/source/core/unoatrcn \
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
deleted file mode 100644
index 2a98fb344721..
--- a/xmloff/inc/facreg.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_XMLOFF_INC_FACREG_HXX
-#define INCLUDED_XMLOFF_INC_FACREG_HXX
-
-#include 
-
-#include 
-#include 
-#include 
-
-namespace com::sun::star {
-namespace lang { class XMultiServiceFactory; }
-namespace uno { class XInterface; }
-}
-
-// writer autotext event export OOo
-OUString XMLAutoTextEventExportOOO_getImplementationName() throw();
-css::uno::Sequence 
XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Ref

[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

2020-06-05 Thread Miklos Vajna (via logerrit)

 solenv/bin/native-code.py |1 +
 xmloff/inc/facreg.hxx |7 ---
 xmloff/source/core/facreg.cxx |5 ++---
 xmloff/source/text/XMLAutoTextEventImport.cxx |   21 -
 xmloff/util/xo.component  |3 ++-
 5 files changed, 9 insertions(+), 28 deletions(-)

New commits:
commit c4bdc37e1a3cc6dea7688057bb33f56c2d6742c3
Author: Miklos Vajna 
AuthorDate: Thu Jun 4 21:13:51 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 5 09:11:05 2020 +0200

xmloff: create XMLAutoTextEventImport instances with an uno constructor

See tdf#74608 for motivation.

Change-Id: I24f64c9ebc2c86a574f3a76f1e739f61bc458dc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95536
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index db44ea3c1a51..ce4fcdec6d1f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -338,6 +338,7 @@ core_constructor_list = [
 "com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation",
 "com_sun_star_comp_Chart_XMLOasisExporter_get_implementation",
 
"com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation",
+
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 82d5d3e73b59..2a98fb344721 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -31,13 +31,6 @@ namespace com::sun::star {
 namespace uno { class XInterface; }
 }
 
-// writer autotext event import
-OUString XMLAutoTextEventImport_getImplementationName() throw();
-css::uno::Sequence XMLAutoTextEventImport_getSupportedServiceNames() 
throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLAutoTextEventImport_createInstance(
-css::uno::Reference const & rSMgr);
-
 // writer autotext event export OOo
 OUString XMLAutoTextEventExportOOO_getImplementationName() throw();
 css::uno::Sequence 
XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 377f05204c1a..cdc52d6c6a6e 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -54,9 +54,8 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const char * 
pImplName, void *
 
 const sal_Int32 nImplNameLen = strlen( pImplName );
 
-// auto text import/export
-SINGLEFACTORY( XMLAutoTextEventImport )
-else SINGLEFACTORY( XMLAutoTextEventExportOOO )
+// auto text export
+SINGLEFACTORY( XMLAutoTextEventExportOOO )
 
 if( xFactory.is())
 {
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx 
b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 9f74c41ce1b1..bf6b9af0118d 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -91,24 +91,11 @@ SvXMLImportContext* 
XMLAutoTextEventImport::CreateFastContext(
 return nullptr;
 }
 
-
-Sequence< OUString >
-XMLAutoTextEventImport_getSupportedServiceNames()
-throw()
-{
-Sequence aSeq { XMLAutoTextEventImport_getImplementationName() };
-return aSeq;
-}
-
-OUString XMLAutoTextEventImport_getImplementationName() throw()
-{
-return "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter";
-}
-
-Reference< XInterface > XMLAutoTextEventImport_createInstance(
-const Reference< XMultiServiceFactory > & rSMgr)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation(
+css::uno::XComponentContext* context, css::uno::Sequence 
const&)
 {
-return static_cast(new XMLAutoTextEventImport( 
comphelper::getComponentContext(rSMgr) ));
+return cppu::acquire(new XMLAutoTextEventImport(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 0219cc5328ad..2e43c129673d 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -216,7 +216,8 @@
 
   
   
+  name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"
+  
constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation">
 
   
   https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2020-06-04 Thread Stephan Bergmann (via logerrit)

 solenv/bin/gdb-core-bt.sh  |   10 +-
 solenv/bin/lldb-core-bt.sh |6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c9bc4f1eec5d66db36b6f9d845eb1a2d46e732bb
Author: Stephan Bergmann 
AuthorDate: Thu Jun 4 08:48:26 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 4 10:33:59 2020 +0200

Print out the guessed executable name that is actually passed to the 
debugger

...to avoid confusion, when the log reads e.g.

[...]
> It looks like 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/soffice.bin
 generated 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UITest/calc_demo/done.core/core.10572
[...]
> Core was generated by 
`/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python.'.
[...]

().

Change-Id: I59f544c6739329620064315c2a54c21e29865b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95480
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index 2216e2aba5e5..b48a5a4405cc 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -20,15 +20,15 @@ then
 do
 if [ -f "$COREFILE" ]
 then
-printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-"$EXECUTABLE" "$COREFILE"
-GDBCOMMANDFILE=$(mktemp)
-printf "info registers\nthread apply all backtrace full\n" \
->"$GDBCOMMANDFILE"
 guess=$(file "$COREFILE")
 guess=${guess#* execfn: \'}
 guess=${guess%%\'*}
 if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$guess" "$COREFILE"
+GDBCOMMANDFILE=$(mktemp)
+printf "info registers\nthread apply all backtrace full\n" \
+>"$GDBCOMMANDFILE"
 gdb -iex "add-auto-load-safe-path ${INSTDIR?}" -x 
"$GDBCOMMANDFILE" --batch "$guess" \
 "$COREFILE" && found=x
 rm "$GDBCOMMANDFILE"
diff --git a/solenv/bin/lldb-core-bt.sh b/solenv/bin/lldb-core-bt.sh
index 2bd982ec21e9..def4a8939db0 100755
--- a/solenv/bin/lldb-core-bt.sh
+++ b/solenv/bin/lldb-core-bt.sh
@@ -20,13 +20,13 @@ then
 do
 if [ -f "$COREFILE" ]
 then
-printf '\nIt looks like %s generated %s\nBacktraces:\n' \
-"$EXECUTABLE" "$COREFILE"
-$LLDBCOMMANDFILE=$(mktemp)
 guess=$(file "$COREFILE")
 guess=${guess#* execfn: \'}
 guess=${guess%%\'*}
 if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$guess" "$COREFILE"
+$LLDBCOMMANDFILE=$(mktemp)
 printf "target create -c $COREFILE $guess\nthread backtrace 
all\nquit\n" >"$LLDBCOMMANDFILE"
 lldb -s "$LLDBCOMMANDFILE" --batch \
 && found=x
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin solenv/gbuild

2020-06-03 Thread Noel Grandin (via logerrit)

 solenv/bin/lldb-core-bt.sh   |   50 +++
 solenv/gbuild/platform/macosx.mk |3 ++
 2 files changed, 53 insertions(+)

New commits:
commit 756c027198adc5212d46d72e0628c90698652af5
Author: Noel Grandin 
AuthorDate: Wed Jun 3 08:55:32 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 3 14:08:37 2020 +0200

enable backtraces for unit tests on macos

Change-Id: I4f07e1e7b35bccc217d78662a45ac5eaf5865ee7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95394
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/bin/lldb-core-bt.sh b/solenv/bin/lldb-core-bt.sh
new file mode 100755
index ..2bd982ec21e9
--- /dev/null
+++ b/solenv/bin/lldb-core-bt.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#
+
+EXECUTABLE=${1}
+COREDIR=${2}
+EXITCODE=${3}
+
+if test -n "$(which lldb)"
+then
+found=
+for COREFILE in "$COREDIR"/core*
+do
+if [ -f "$COREFILE" ]
+then
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$EXECUTABLE" "$COREFILE"
+$LLDBCOMMANDFILE=$(mktemp)
+guess=$(file "$COREFILE")
+guess=${guess#* execfn: \'}
+guess=${guess%%\'*}
+if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+printf "target create -c $COREFILE $guess\nthread backtrace 
all\nquit\n" >"$LLDBCOMMANDFILE"
+lldb -s "$LLDBCOMMANDFILE" --batch \
+&& found=x
+rm "$LLDBCOMMANDFILE"
+echo
+fi
+done
+if [ -z "$found" -a "$EXITCODE" -ge 128 ]; then
+echo
+echo "No core file identified in directory ${COREDIR}"
+echo "To show backtraces for crashes during test execution,"
+echo "enable core files with:"
+echo
+echo "   ulimit -c unlimited"
+echo
+exit 1
+fi
+else
+echo "You need lldb in your path to show backtraces"
+exit 1
+fi
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c743511207ce..f9a805b6b62e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -266,7 +266,10 @@ gb_CppunitTest_malloc_check := MallocScribble=1 
MallocPreScribble=1
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
+endef
 
+define gb_CppunitTest_postprocess
+$(SRCDIR)/solenv/bin/lldb-core-bt.sh $(1) $(2) $(3)
 endef
 
 # JunitTest class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 5 >

1 - 100 of 492 matches

Mail list logo