from:"Andras Timar"

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-54'

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

Tag 'cp-6.4-54' created by Andras Timar  at 
2022-01-25 20:55 +

cp-6.4-54

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-54'

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

Tag 'cp-6.4-54' created by Andras Timar  at 
2022-01-25 20:55 +

cp-6.4-54

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fdc89caed84f63c4c954951be80b11e417de726
Author: Andras Timar 
AuthorDate: Tue Jan 25 21:54:38 2022 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 25 21:54:38 2022 +0100

Bump version to 6.4-54

Change-Id: I84ef6f9f36072c2874f279e4e3bb1c8e80bf7bad

diff --git a/configure.ac b/configure.ac
index c9dfd480e767..716e2bcaf0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.53],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.54],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 4 commits - bin/pack-debug config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin sysui/desktop

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

 bin/pack-debug   |   20 +---
 config_host.mk.in|1 +
 configure.ac |   10 ++
 instsetoo_native/CustomTarget_install.mk |1 +
 solenv/bin/modules/installer/download.pm |2 +-
 solenv/bin/modules/installer/epmfile.pm  |6 +++---
 solenv/bin/modules/installer/globals.pm  |2 ++
 solenv/bin/modules/installer/helppack.pm |2 +-
 solenv/bin/modules/installer/languagepack.pm |2 +-
 solenv/bin/modules/installer/parameter.pm|2 ++
 solenv/bin/modules/installer/simplepackage.pm|2 +-
 solenv/bin/modules/installer/worker.pm   |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 13 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit 07ef9cb7c2f80c975ebe6276259c5b2ff71b3488
Author: Andras Timar 
AuthorDate: Sun Jan 23 12:17:50 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 24 11:08:26 2022 +0100

[cp] set w1T.xzdio rpm compression in bin/pack-debug, too

Change-Id: I6d808c9ba9b5353dd74e41fced2f134f1ad70501

diff --git a/bin/pack-debug b/bin/pack-debug
index e7a6d31bb938..312f59e6f81f 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -106,7 +106,7 @@ cat $DEBUGSRC | awk '
 
  # debug build source package
 
- rpmbuild -bb --define "_unpackaged_files_terminate_build  0" 
${DEBUGSRC}-debugsource --target $build_cpu --buildroot=$buildroot
+ rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" ${DEBUGSRC}-debugsource --target $build_cpu 
--buildroot=$buildroot
 
 ###
 echo create rpm debug info packages by processing logged spec files
@@ -156,7 +156,7 @@ do
 
# stripped package
 
-   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" $i 
--target $build_cpu --buildroot=$buildroot
+   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" $i --target $build_cpu --buildroot=$buildroot
rm -rf $buildroot
mv $buildroot.copy $buildroot
mkdir -p $topdir/RPMS/BUILD $topdir/RPMS/RPMS
@@ -174,7 +174,7 @@ do
 
# create debug info package
 
-   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" 
${i}-debuginfo --target $build_cpu --buildroot=$buildroot
+   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" ${i}-debuginfo --target $build_cpu 
--buildroot=$buildroot
  fi
 done
 
commit 6e5f074366a3cd944cce2b20a8eb2d67f2b49e7d
Author: Andras Timar 
AuthorDate: Sat Jan 22 20:35:00 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 24 11:07:54 2022 +0100

[cp] use pigz (parallellized compression) instead of gzip, if we can

Change-Id: I3f97702a6febd3ac0cbbd16a0932d74ea6659bf3

diff --git a/bin/pack-debug b/bin/pack-debug
index 67c4cd50150d..e7a6d31bb938 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -13,6 +13,12 @@
 export BUILD_PATH=$PWD
 export BUILD_LOG=$BUILD_PATH/pack-debug.log
 
+if type -P pigz &>/dev/null; then
+GZIP=pigz
+else
+GZIP=gzip
+fi
+
 if [ $# -gt 0 ]
 then
  for i in "$@"
@@ -180,8 +186,8 @@ TARGET_RPM=$(ls *_download/*.tar.gz)
 TARGET_DEBUG=$(echo $TARGET_RPM | sed 's/.tar.gz$/-debug.tar.gz/')
 SOURCE_RPM=$(find *_rpm -type f | grep -v debug)
 SOURCE_DEBUG=$(find *_rpm -type f | grep -E '(debug|readme|README)')
-tar c $SOURCE_RPM | gzip >$TARGET_RPM
-tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+tar c $SOURCE_RPM | $GZIP >$TARGET_RPM
+tar c $SOURCE_DEBUG | $GZIP >$TARGET_DEBUG
 cd $BUILD_PATH
 rm -rf $topdir
 }
@@ -323,8 +329,8 @@ TARGET_DEB=$(ls *_download/*.tar.gz)
 TARGET_DEBUG=$(echo $TARGET_DEB | sed 's/.tar.gz$/-debug.tar.gz/')
 SOURCE_DEB=$(find *_deb -type f | grep -v debug)
 SOURCE_DEBUG=$(find *_deb -type f | grep -E '(debug|readme|README)')
-tar c $SOURCE_DEB | gzip >$TARGET_DEB
-tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+tar c $SOURCE_DEB | $GZIP >$TARGET_DEB
+tar c $SOURCE_DEBUG | $GZIP >$TARGET_DEBUG
 
 cd $BUILD_PATH
 rm -rf DEBS
commit d3ff5c4b9980a20a2da6cb93b986b69d0554f05a
Author: Andras Timar 
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 24 11:07:19 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%

[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: Branch 'distro/collabora/co-2021' - 2 commits - bin/pack-debug solenv/bin sysui/desktop

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

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

New commits:
commit 74a04d020dc1215b2008afd84d57a91115b9a90a
Author: Andras Timar 
AuthorDate: Sun Jan 23 12:17:50 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 23 12:20:42 2022 +0100

[cp] set w1T.xzdio rpm compression in bin/pack-debug, too

Change-Id: I6d808c9ba9b5353dd74e41fced2f134f1ad70501

diff --git a/bin/pack-debug b/bin/pack-debug
index 9a6f384035e3..3e9b3fd2a6c0 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -105,7 +105,7 @@ cat $DEBUGSRC | awk '
 
  # debug build source package
 
- rpmbuild -bb --define "_unpackaged_files_terminate_build  0" 
${DEBUGSRC}-debugsource --target $build_cpu --buildroot=$buildroot
+ rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" ${DEBUGSRC}-debugsource --target $build_cpu 
--buildroot=$buildroot
 
 ###
 echo create rpm debug info packages by processing logged spec files
@@ -155,7 +155,7 @@ do
 
# stripped package
 
-   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" $i 
--target $build_cpu --buildroot=$buildroot
+   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" $i --target $build_cpu --buildroot=$buildroot
rm -rf $buildroot
mv $buildroot.copy $buildroot
mkdir -p $topdir/RPMS/BUILD $topdir/RPMS/RPMS
@@ -173,7 +173,7 @@ do
 
# create debug info package
 
-   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" 
${i}-debuginfo --target $build_cpu --buildroot=$buildroot
+   rpmbuild -bb --define "_unpackaged_files_terminate_build  0" --define 
"_binary_payload w1T.xzdio" ${i}-debuginfo --target $build_cpu 
--buildroot=$buildroot
  fi
 done
 
commit 5621a75f5ce1fe9f6b7712a7acdf8873d08d6592
Author: Andras Timar 
AuthorDate: Sat Jan 22 22:00:56 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 23 12:20:42 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

diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index d699e46e03ed..7b5a5da77198 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 3afa0600de08..2452a44b99dc 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -33,7 +33,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: Branch 'distro/collabora/co-2021' - 2 commits - bin/pack-debug config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin

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

 bin/pack-debug|   14 ++
 config_host.mk.in |1 +
 configure.ac  |   10 ++
 instsetoo_native/CustomTarget_install.mk  |1 +
 solenv/bin/modules/installer/download.pm  |2 +-
 solenv/bin/modules/installer/epmfile.pm   |4 ++--
 solenv/bin/modules/installer/globals.pm   |2 ++
 solenv/bin/modules/installer/helppack.pm  |2 +-
 solenv/bin/modules/installer/languagepack.pm  |2 +-
 solenv/bin/modules/installer/parameter.pm |2 ++
 solenv/bin/modules/installer/simplepackage.pm |2 +-
 solenv/bin/modules/installer/worker.pm|2 +-
 12 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 5442eef243b13355d73785214f86214d8a73e6e4
Author: Andras Timar 
AuthorDate: Sat Jan 22 20:35:00 2022 +0100
Commit: Andras Timar 
CommitDate: Sat Jan 22 20:35:00 2022 +0100

[cp] use pigz (parallellized compression) instead of gzip, if we can

Change-Id: I3f97702a6febd3ac0cbbd16a0932d74ea6659bf3

diff --git a/bin/pack-debug b/bin/pack-debug
index ff8defe4cb78..9a6f384035e3 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -13,6 +13,12 @@
 export BUILD_PATH=$PWD
 export BUILD_LOG=$BUILD_PATH/pack-debug.log
 
+if type -P pigz &>/dev/null; then
+GZIP=pigz
+else
+GZIP=gzip
+fi
+
 if [ $# -gt 0 ]
 then
  for i in "$@"
@@ -179,8 +185,8 @@ TARGET_RPM=$(ls *_download/*.tar.gz)
 TARGET_DEBUG=$(echo $TARGET_RPM | sed 's/.tar.gz$/-debug.tar.gz/')
 SOURCE_RPM=$(find *_rpm -type f | grep -v debug)
 SOURCE_DEBUG=$(find *_rpm -type f | grep -E '(debug|readme|README)')
-tar c $SOURCE_RPM | gzip >$TARGET_RPM
-tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+tar c $SOURCE_RPM | $GZIP >$TARGET_RPM
+tar c $SOURCE_DEBUG | $GZIP >$TARGET_DEBUG
 cd $BUILD_PATH
 rm -rf $topdir
 }
@@ -322,8 +328,8 @@ TARGET_DEB=$(ls *_download/*.tar.gz)
 TARGET_DEBUG=$(echo $TARGET_DEB | sed 's/.tar.gz$/-debug.tar.gz/')
 SOURCE_DEB=$(find *_deb -type f | grep -v debug)
 SOURCE_DEBUG=$(find *_deb -type f | grep -E '(debug|readme|README)')
-tar c $SOURCE_DEB | gzip >$TARGET_DEB
-tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+tar c $SOURCE_DEB | $GZIP >$TARGET_DEB
+tar c $SOURCE_DEBUG | $GZIP >$TARGET_DEBUG
 
 cd $BUILD_PATH
 rm -rf DEBS
commit 86c7688ec38ebf32a971d529c43779761b2dac78
Author: Thorsten Behrens 
AuthorDate: Sat Jan 15 16:24:33 2022 +0100
Commit: Andras Timar 
CommitDate: Sat Jan 22 20:24:56 2022 +0100

Make installer compression tool configurable

So we can use pigz or other parallelizable tools if available. Shaves
off noticeable build time when packaging install sets.

- figure out if pigz is available (fallback to gzip otherwise)
- pass compression tool down into make_installer
- and handle as one of many global options there

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

diff --git a/config_host.mk.in b/config_host.mk.in
index f0bf804474f7..d938ae941f88 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -88,6 +88,7 @@ export COMPILER_PLUGINS_CXXFLAGS=@COMPILER_PLUGINS_CXXFLAGS@
 export COMPILER_PLUGINS_CXX_LINKFLAGS=@COMPILER_PLUGINS_CXX_LINKFLAGS@
 export COMPILER_PLUGINS_DEBUG=@COMPILER_PLUGINS_DEBUG@
 export COMPILER_PLUGINS_TOOLING_ARGS=@COMPILER_PLUGINS_TOOLING_ARGS@
+export COMPRESSIONTOOL=@COMPRESSIONTOOL@
 export COM_IS_CLANG=@COM_IS_CLANG@
 export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
diff --git a/configure.ac b/configure.ac
index 35e6c39ed3fd..8dc18407cac4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2814,6 +2814,16 @@ if test -z "$BASH"; then
 fi
 AC_SUBST(BASH)
 
+# prefer parallel comression tools, if available
+AC_PATH_PROG(COMPRESSIONTOOL, pigz)
+if test -z "$COMPRESSIONTOOL"; then
+AC_PATH_PROG(COMPRESSIONTOOL, gzip)
+if test -z "$COMPRESSIONTOOL"; then
+AC_MSG_ERROR([gzip not found in \$PATH])
+fi
+fi
+AC_SUBST(COMPRESSIONTOOL)
+
 AC_MSG_CHECKING([for GNU or BSD tar])
 for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
 $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index a83be274ff4b..0974240be1fb 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -87,6 +87,7 @@ $(foreach pkgformat,$(5),\
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p $(PRODUCTNAME_no_spaces)$(3) \
-u $(instsetoo_OUT) \
+   -packer $(COMPRESSIONTOOL) \
-buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8aa603ef49d559a0d8c80a651cdeadea4345407
Author: Andras Timar 
AuthorDate: Fri Jan 21 13:02:36 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Jan 21 13:02:36 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 546deb42a615099a3a46532bd611b6819db6985c
  - Update Arabic translations (from libreoffice-7-3-0)

Change-Id: Iad1856ff1458b34ab694b1cd9fa4c707dfeac06b

diff --git a/translations b/translations
index 7444b582e9db..546deb42a615 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7444b582e9db67868909675606439a1a53da9750
+Subproject commit 546deb42a615099a3a46532bd611b6819db6985c

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/accessibility/messages.po |2 
 source/ar/avmedia/messages.po   |2 
 source/ar/basctl/messages.po|2 
 source/ar/basic/messages.po |2 
 source/ar/chart2/messages.po|2 
 source/ar/connectivity/messages.po  |2 
 source/ar/cui/messages.po   |  276 ++-
 source/ar/dbaccess/messages.po  |6 
 source/ar/desktop/messages.po   |2 
 source/ar/editeng/messages.po   |   12 
 source/ar/extensions/messages.po|   76 
 source/ar/filter/messages.po|4 
 source/ar/forms/messages.po |   61 
 source/ar/formula/messages.po   |2 
 source/ar/fpicker/messages.po   |2 
 source/ar/framework/messages.po |2 
 source/ar/oox/messages.po   |2 
 source/ar/reportdesign/messages.po  |2 
 source/ar/sc/messages.po|  243 +--
 source/ar/scaddins/messages.po  |2 
 source/ar/sccomp/messages.po|   17 
 source/ar/sd/messages.po|   67 
 source/ar/sfx2/messages.po  |   58 
 source/ar/shell/messages.po |2 
 source/ar/starmath/messages.po  |2 
 source/ar/svl/messages.po   |2 
 source/ar/svtools/messages.po   |   22 
 source/ar/svx/messages.po   | 2751 ++--
 source/ar/sw/messages.po|  274 +--
 source/ar/uui/messages.po   |2 
 source/ar/vcl/messages.po   |2 
 source/ar/wizards/messages.po   |2 
 source/ar/writerperfect/messages.po |2 
 source/ar/xmlsecurity/messages.po   |2 
 34 files changed, 2030 insertions(+), 1879 deletions(-)

New commits:
commit 546deb42a615099a3a46532bd611b6819db6985c
Author: Andras Timar 
AuthorDate: Fri Jan 21 13:02:27 2022 +0100
Commit: Andras Timar 
CommitDate: Fri Jan 21 13:02:27 2022 +0100

Update Arabic translations (from libreoffice-7-3-0)

Change-Id: Iad1856ff1458b34ab694b1cd9fa4c707dfeac06b

diff --git a/source/ar/accessibility/messages.po 
b/source/ar/accessibility/messages.po
index 840377f86b5..b662634f072 100644
--- a/source/ar/accessibility/messages.po
+++ b/source/ar/accessibility/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2020-01-07 14:09+0100\n"
+"POT-Creation-Date: 2022-01-21 12:52+0100\n"
 "PO-Revision-Date: 2017-10-05 20:57+\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE \n"
diff --git a/source/ar/avmedia/messages.po b/source/ar/avmedia/messages.po
index 971adfa5c2c..879acc3d1cc 100644
--- a/source/ar/avmedia/messages.po
+++ b/source/ar/avmedia/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2020-10-27 12:30+0100\n"
+"POT-Creation-Date: 2022-01-21 12:52+0100\n"
 "PO-Revision-Date: 2021-02-18 21:36+\n"
 "Last-Translator: Riyadh Talal \n"
 "Language-Team: Arabic 
<https://translations.documentfoundation.org/projects/libo_ui-7-1/avmediamessages/ar/>\n"
diff --git a/source/ar/basctl/messages.po b/source/ar/basctl/messages.po
index 3bc86525299..1f73e38ce79 100644
--- a/source/ar/basctl/messages.po
+++ b/source/ar/basctl/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2021-01-30 14:54+0100\n"
+"POT-Creation-Date: 2022-01-21 12:52+0100\n"
 "PO-Revision-Date: 2021-03-15 09:37+\n"
 "Last-Translator: Riyadh Talal \n"
 "Language-Team: Arabic 
<https://translations.documentfoundation.org/projects/libo_ui-7-1/basctlmessages/ar/>\n"
diff --git a/source/ar/basic/messages.po b/source/ar/basic/messages.po
index 6096aa7bb35..44a26adc903 100644
--- a/source/ar/basic/messages.po
+++ b/source/ar/basic/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice_status=UNCONFIRMED=UI\n;
-"POT-Creation-Date: 2020-10-27 12:30+0100\n"
+"POT-Creation-Date: 2022-01-21 12:52+0100\n"
 "PO-Revision-Date: 2021-02-17 16:36+\n"
 "Last-Translator: Riyadh Talal \n"
 "Language-Team: Arabic 
<https://translations.documentfoundation.org/projects/libo_ui-7-1/basicmessages/ar/>\n"
diff --git a/source/ar/chart2/messages.po b/source/ar/chart2/messages.po
index cf59cd06685..533fe471748

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d2d443269186cb6352a04531a7e7d30f721cbfe
Author: Andras Timar 
AuthorDate: Thu Jan 20 16:44:19 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Jan 20 16:44:19 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 7444b582e9db67868909675606439a1a53da9750
  - Updated Arabic translation

Change-Id: I1626379e214d65796a9ab36ef6003e5b53ef4b60

diff --git a/translations b/translations
index 4b4b5982179c..7444b582e9db 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4b4b5982179c39e3611ed07cf09b781a4a911758
+Subproject commit 7444b582e9db67868909675606439a1a53da9750

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/cui/messages.po |2 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po |  214 +-
 source/ar/sc/messages.po  |   14 
 source/ar/sd/messages.po  |3 
 source/ar/svx/messages.po |   17 
 source/ar/sw/messages.po  |   32 -
 source/ar/vcl/messages.po |   56 +-
 7 files changed, 165 insertions(+), 173 deletions(-)

New commits:
commit 7444b582e9db67868909675606439a1a53da9750
Author: Andras Timar 
AuthorDate: Thu Jan 20 16:44:08 2022 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 20 16:44:08 2022 +0100

Updated Arabic translation

Change-Id: I1626379e214d65796a9ab36ef6003e5b53ef4b60

diff --git a/source/ar/cui/messages.po b/source/ar/cui/messages.po
index ab9766cb5f8..17f9a55cf2a 100644
--- a/source/ar/cui/messages.po
+++ b/source/ar/cui/messages.po
@@ -18989,7 +18989,7 @@ msgstr "ال_لون:"
 #: cui/uiconfig/ui/shadowtabpage.ui:214
 msgctxt "shadowtabpage|FT_SHADOW_BLUR"
 msgid "_Blur:"
-msgstr ""
+msgstr "التشويش:"
 
 #. DMAGP
 #: cui/uiconfig/ui/shadowtabpage.ui:228
diff --git a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
index a5df38c0e37..9d603549212 100644
--- a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1114,7 +1114,7 @@ msgctxt ""
 "TooltipLabel\n"
 "value.text"
 msgid "Insert or Edit Pivot Table"
-msgstr ""
+msgstr "إدراج جدول محوري أو تحريره"
 
 #. VZAqF
 #: CalcCommands.xcu
@@ -1134,7 +1134,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "~Insert or Edit..."
-msgstr ""
+msgstr "إدراج أو تحرير ..."
 
 #. vqC2u
 #: CalcCommands.xcu
@@ -1754,7 +1754,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Fill ~Down"
-msgstr ""
+msgstr "ملء لأس~فل"
 
 #. b3SoG
 #: CalcCommands.xcu
@@ -1774,7 +1774,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Fill ~Right"
-msgstr ""
+msgstr "ملء ~لليمين"
 
 #. XFAhB
 #: CalcCommands.xcu
@@ -1794,7 +1794,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Fill ~Up"
-msgstr ""
+msgstr "ملء لأعلى"
 
 #. QdDYA
 #: CalcCommands.xcu
@@ -1814,7 +1814,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Fill ~Left"
-msgstr ""
+msgstr "ملء للي~سار"
 
 #. 4tV7E
 #: CalcCommands.xcu
@@ -2624,7 +2624,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Insert Co~lumns Before"
-msgstr ""
+msgstr "إدراج أعمدة قبل"
 
 #. 7fDfk
 #: CalcCommands.xcu
@@ -2644,7 +2644,7 @@ msgctxt ""
 "PopupLabel\n"
 "value.text"
 msgid "Insert Columns ~Before"
-msgstr ""
+msgstr "إدراج أعمدة قبل"
 
 #. AGNAm
 #: CalcCommands.xcu
@@ -2684,7 +2684,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Insert Co~lumns After"
-msgstr ""
+msgstr "إدراج الأعمدة بعد"
 
 #. DQE4i
 #: CalcCommands.xcu
@@ -2704,7 +2704,7 @@ msgctxt ""
 "PopupLabel\n"
 "value.text"
 msgid "Insert Columns ~After"
-msgstr ""
+msgstr "إدراج الأعمدة بعد"
 
 #. oFZEB
 #: CalcCommands.xcu
@@ -3534,7 +3534,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Rename S~heet..."
-msgstr ""
+msgstr "أعد تسمية الورقة"
 
 #. dRbma
 #: CalcCommands.xcu
@@ -3644,7 +3644,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Align Center"
-msgstr ""
+msgstr "محاذاة للوسط"
 
 #. LfMgB
 #: CalcCommands.xcu
@@ -4534,7 +4534,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Use Text Import Dialog"
-msgstr ""
+msgstr "استخدام مربع حوار استيراد النص "
 
 #. yombs
 #: CalcCommands.xcu
@@ -4544,7 +4544,7 @@ msgctxt ""
 "TooltipLabel\n"
 "value.text"
 msgid "Use text import dialog"
-msgstr ""
+msgstr "استخدام مربع حوار استيراد النص "
 
 #. uoxAP
 #: CalcCommands.xcu
@@ -4604,7 +4604,7 @@ msgctxt ""
 "TooltipLabel\n"
 "value.text"
 msgid "Default Cell Style"
-msgstr ""
+msgstr "نمط الخلية الافتراضي"
 
 #. 9tAAv
 #: CalcCommands.xcu
@@ -4624,7 +4624,7 @@ msgctxt ""
 "Label\n

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.13-1'

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

Tag 'cp-21.06.13-1' created by Andras Timar  at 
2022-01-17 21:07 +

cp-21.06.13-1

Changes since cp-21.06.12-1-3:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.13-1'

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

Tag 'cp-21.06.13-1' created by Andras Timar  at 
2022-01-17 21:07 +

cp-21.06.13-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

Rebased ref, commits from common ancestor:
commit f31219cf3b1ad517b919db6cc6ac11163e85fe25
Author: Andras Timar 
AuthorDate: Mon Jan 17 14:22:04 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 17 17:09:31 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to fde42484b7a512b3ea5b8c3bde79a5aa6e4cb5f0
  - Updated Arabic translation

Change-Id: I3f130007d2183575bc7c99ee7499dcbb761c8e53

diff --git a/translations b/translations
index 01fad3f3f64f..4b4b5982179c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
+Subproject commit 4b4b5982179c39e3611ed07cf09b781a4a911758

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bf5c4f50ef427cedf4738018492256ff45c0182
Author: Andras Timar 
AuthorDate: Mon Jan 17 15:19:10 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jan 17 15:19:10 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 4b4b5982179c39e3611ed07cf09b781a4a911758
  - Updated Arabic translation

Change-Id: Iec9c187723e075d8c5bec4bbe1a63a1a2ed5b410

diff --git a/translations b/translations
index fde42484b7a5..4b4b5982179c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fde42484b7a512b3ea5b8c3bde79a5aa6e4cb5f0
+Subproject commit 4b4b5982179c39e3611ed07cf09b781a4a911758

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

Rebased ref, commits from common ancestor:
commit 4b4b5982179c39e3611ed07cf09b781a4a911758
Author: Andras Timar 
AuthorDate: Mon Jan 17 15:19:00 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 17 15:19:00 2022 +0100

Updated Arabic translation

Change-Id: Iec9c187723e075d8c5bec4bbe1a63a1a2ed5b410

diff --git a/source/ar/cui/messages.po b/source/ar/cui/messages.po
index 9128b964c1c..ab9766cb5f8 100644
--- a/source/ar/cui/messages.po
+++ b/source/ar/cui/messages.po
@@ -5864,13 +5864,13 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:374
 msgctxt "bulletandposition|colorft"
 msgid "Color:"
-msgstr ""
+msgstr "اللون"
 
 #. jxFmf
 #: cui/uiconfig/ui/bulletandposition.ui:419
 msgctxt "bulletandposition|label2"
 msgid "Properties"
-msgstr ""
+msgstr "الصفح"
 
 #. CrtKB
 #: cui/uiconfig/ui/bulletandposition.ui:455
@@ -8726,7 +8726,7 @@ msgstr "خيار قابلية الوصول ”استخدم لون الخط ال
 #: cui/uiconfig/ui/effectspage.ui:660
 msgctxt "effectspage|fonttransparencyft"
 msgid "_Transparency:"
-msgstr ""
+msgstr "الشفافية:"
 
 #. vELSr
 #: cui/uiconfig/ui/effectspage.ui:694
diff --git a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
index 4ecfa316c2f..a5df38c0e37 100644
--- a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -25682,7 +25682,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "T~able"
-msgstr ""
+msgstr "جدول"
 
 #. JHiCn
 #: GenericCommands.xcu
diff --git a/source/ar/sc/messages.po b/source/ar/sc/messages.po
index 731e6438357..b473a387908 100644
--- a/source/ar/sc/messages.po
+++ b/source/ar/sc/messages.po
@@ -3151,13 +3151,13 @@ msgstr ""
 #: sc/inc/globstr.hrc:535
 msgctxt "STR_VERTICALSTACKCELL_ON"
 msgid "Vertically stacked: On"
-msgstr ""
+msgstr "مترا_صة رأسيًا: "
 
 #. 2x976
 #: sc/inc/globstr.hrc:536
 msgctxt "STR_VERTICALSTACKCELL_OFF"
 msgid "Vertically stacked: Off"
-msgstr ""
+msgstr "مترا_صة رأسيًا: "
 
 #. uxnQA
 #: sc/inc/globstr.hrc:537
diff --git a/source/ar/sd/messages.po b/source/ar/sd/messages.po
index 45d03cb776a..ce3f5a79741 100644
--- a/source/ar/sd/messages.po
+++ b/source/ar/sd/messages.po
@@ -3387,7 +3387,7 @@ msgstr ""
 #: sd/uiconfig/sdraw/ui/drawpagedialog.ui:8
 msgctxt "drawpagedialog|DrawPageDialog"
 msgid "Page Properties"
-msgstr ""
+msgstr "خصائص الصفحة"
 
 #. Py4db
 #: sd/uiconfig/sdraw/ui/drawpagedialog.ui:136
@@ -3834,25 +3834,25 @@ msgstr ""
 #: sd/uiconfig/sdraw/ui/notebookbar.ui:9766
 msgctxt "drawnotebookbar|TextMenuButton"
 msgid "T_ext"
-msgstr ""
+msgstr "النص"
 
 #. PQtWE
 #: sd/uiconfig/sdraw/ui/notebookbar.ui:9863
 msgctxt "drawnotebookbar|ReferencesLabel"
 msgid "T~ext"
-msgstr ""
+msgstr "النص"
 
 #. tNq7H
 #: sd/uiconfig/sdraw/ui/notebookbar.ui:10793
 msgctxt "drawnotebookbar|TableMenuButton"
 msgid "_Table"
-msgstr ""
+msgstr "جدول"
 
 #. 9pJGh
 #: sd/uiconfig/sdraw/ui/notebookbar.ui:10878
 msgctxt "drawnotebookbar|TableLabel"
 msgid "~Table"
-msgstr ""
+msgstr "جدول"
 
 #. ECD4J
 #: sd/uiconfig/sdraw/ui/notebookbar.ui:11422
@@ -4052,25 +4052,25 @@ msgstr ""
 #: sd/uiconfig/sdraw/ui/notebookbar_compact.ui:9413
 msgctxt "notebookbar_draw_compact|TextMenuButton"
 msgid "T_ext"
-msgstr ""
+msgstr "النص"
 
 #. LFcJC
 #: sd/uiconfig/sdraw/ui/notebookbar_compact.ui:9467
 msgctxt "notebookbar_draw_compact|ReferencesLabel"
 msgid "T~ext"
-msgstr ""
+msgstr "النص"
 
 #. sdACh
 #: sd/uiconfig/sdraw/ui/notebookbar_compact.ui:11219
 msgctxt "notebookbar_draw_compact|TableMenuButton"
 msgid "T_able"
-msgstr ""
+msgstr "جدول"
 
 #. GEmbu
 #: sd/uiconfig/sdraw/ui/notebookbar_compact.ui:11270
 msgctxt "notebookbar_draw_compact|TableLabel"
 msgid "~Table"
-msgstr ""
+msgstr "جدول"
 
 #. EGCcN
 #: sd/uiconfig/sdraw/ui/notebookbar_compact.ui:12697
@@ -6714,13 +6714,13 @@ msgstr ""
 #: sd/uiconfig/simpress/ui/notebookbar.ui:10559
 msgctxt "impressnotebookbar|TableMenuButton"
 msgid "_Table"
-msgstr ""
+msgstr "جدول"
 
 #. dmEJG
 #: sd/uiconfig/simpress/ui/notebookbar.ui:10644
 msgctxt "impressnotebookbar|TableLabel"
 msgid "~Table"
-msgstr ""
+msgstr "جدول"
 
 #. Cn8TS
 #: sd/uiconfig/simpress/ui/notebookbar.ui:11186
@@ -6944,13 +6944,1

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf01d296bcf6ac05c02e965de36b92ab61856a62
Author: Andras Timar 
AuthorDate: Mon Jan 17 14:22:04 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jan 17 14:22:04 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to fde42484b7a512b3ea5b8c3bde79a5aa6e4cb5f0
  - Updated Arabic translation

Change-Id: I3f130007d2183575bc7c99ee7499dcbb761c8e53

diff --git a/translations b/translations
index 01fad3f3f64f..fde42484b7a5 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
+Subproject commit fde42484b7a512b3ea5b8c3bde79a5aa6e4cb5f0

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/cui/messages.po  |6 +++---
 source/ar/sc/messages.po   |4 ++--
 source/ar/sfx2/messages.po |2 +-
 source/ar/svx/messages.po  |   12 ++--
 source/ar/sw/messages.po   |2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit fde42484b7a512b3ea5b8c3bde79a5aa6e4cb5f0
Author: Andras Timar 
AuthorDate: Mon Jan 17 14:21:54 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 17 14:21:54 2022 +0100

Updated Arabic translation

Change-Id: I3f130007d2183575bc7c99ee7499dcbb761c8e53

diff --git a/source/ar/cui/messages.po b/source/ar/cui/messages.po
index 9128b964c1c..ab9766cb5f8 100644
--- a/source/ar/cui/messages.po
+++ b/source/ar/cui/messages.po
@@ -5864,13 +5864,13 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:374
 msgctxt "bulletandposition|colorft"
 msgid "Color:"
-msgstr ""
+msgstr "اللون"
 
 #. jxFmf
 #: cui/uiconfig/ui/bulletandposition.ui:419
 msgctxt "bulletandposition|label2"
 msgid "Properties"
-msgstr ""
+msgstr "الصفح"
 
 #. CrtKB
 #: cui/uiconfig/ui/bulletandposition.ui:455
@@ -8726,7 +8726,7 @@ msgstr "خيار قابلية الوصول ”استخدم لون الخط ال
 #: cui/uiconfig/ui/effectspage.ui:660
 msgctxt "effectspage|fonttransparencyft"
 msgid "_Transparency:"
-msgstr ""
+msgstr "الشفافية:"
 
 #. vELSr
 #: cui/uiconfig/ui/effectspage.ui:694
diff --git a/source/ar/sc/messages.po b/source/ar/sc/messages.po
index 731e6438357..b473a387908 100644
--- a/source/ar/sc/messages.po
+++ b/source/ar/sc/messages.po
@@ -3151,13 +3151,13 @@ msgstr ""
 #: sc/inc/globstr.hrc:535
 msgctxt "STR_VERTICALSTACKCELL_ON"
 msgid "Vertically stacked: On"
-msgstr ""
+msgstr "مترا_صة رأسيًا: "
 
 #. 2x976
 #: sc/inc/globstr.hrc:536
 msgctxt "STR_VERTICALSTACKCELL_OFF"
 msgid "Vertically stacked: Off"
-msgstr ""
+msgstr "مترا_صة رأسيًا: "
 
 #. uxnQA
 #: sc/inc/globstr.hrc:537
diff --git a/source/ar/sfx2/messages.po b/source/ar/sfx2/messages.po
index f6b01467663..dff53beb119 100644
--- a/source/ar/sfx2/messages.po
+++ b/source/ar/sfx2/messages.po
@@ -2231,7 +2231,7 @@ msgstr ""
 #: sfx2/uiconfig/ui/addtargetdialog.ui:169
 msgctxt "addtargetdialog|type"
 msgid "Text"
-msgstr ""
+msgstr "النص"
 
 #. dGQqg
 #: sfx2/uiconfig/ui/addtargetdialog.ui:170
diff --git a/source/ar/svx/messages.po b/source/ar/svx/messages.po
index 50a4de7632a..f5e6b9d09a5 100644
--- a/source/ar/svx/messages.po
+++ b/source/ar/svx/messages.po
@@ -6154,7 +6154,7 @@ msgstr "بقية أنواع الترقيم…"
 #: include/svx/strings.hrc:1101
 msgctxt "RID_SVXSTR_MOREBULLETS"
 msgid "More Bullets..."
-msgstr ""
+msgstr "المزيد من النقاط..."
 
 #. uDT6G
 #: include/svx/strings.hrc:1102
@@ -19187,7 +19187,7 @@ msgstr "الشعاع:"
 #: svx/uiconfig/ui/sidebareffect.ui:83
 msgctxt "sidebarglow|color"
 msgid "Color:"
-msgstr ""
+msgstr "اللون"
 
 #. EvWsM
 #: svx/uiconfig/ui/sidebareffect.ui:115
@@ -19328,7 +19328,7 @@ msgstr "الشفافية"
 #: svx/uiconfig/ui/sidebarline.ui:38
 msgctxt "sidebarline|widthlabel"
 msgid "_Line:"
-msgstr ""
+msgstr "السطر"
 
 #. 5yM6T
 #: svx/uiconfig/ui/sidebarline.ui:61
@@ -19683,7 +19683,7 @@ msgstr "أدخل ارتفاعًا للكائن المحدد."
 #: svx/uiconfig/ui/sidebarpossize.ui:174
 msgctxt "sidebarpossize|selectheight"
 msgid "Height"
-msgstr ""
+msgstr "الارت_فاع"
 
 #. dJdfn
 #: svx/uiconfig/ui/sidebarpossize.ui:186
@@ -19776,13 +19776,13 @@ msgstr "محاذاة"
 #: svx/uiconfig/ui/sidebarshadow.ui:56
 msgctxt "sidebarshadow|angle"
 msgid "Angle:"
-msgstr ""
+msgstr "الزاوية"
 
 #. n7wff
 #: svx/uiconfig/ui/sidebarshadow.ui:70
 msgctxt "sidebarshadow|distance"
 msgid "Distance:"
-msgstr ""
+msgstr "المسافة"
 
 #. RFRDq
 #: svx/uiconfig/ui/sidebarshadow.ui:97
diff --git a/source/ar/sw/messages.po b/source/ar/sw/messages.po
index 86de6e1731f..f893aee43cd 100644
--- a/source/ar/sw/messages.po
+++ b/source/ar/sw/messages.po
@@ -29010,7 +29010,7 @@ msgstr ""
 #: sw/uiconfig/swriter/ui/viewoptionspage.ui:185
 msgctxt "viewoptionspage|resolvedcomments"
 msgid "_Resolved comments"
-msgstr ""
+msgstr "التعليقات المحلولة"
 
 #. ZPSpD
 #: sw/uiconfig/swriter/ui/viewoptionspage.ui:206

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ad6f05095ec5de6f444bcc2265ae3748d9e34d1
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:19:36 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Jan 16 21:19:36 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
  - fix: source/ar/sd/messages.po:4281: end-of-line within string

Change-Id: I4a19ef59b6595ea7305b95920a9e2567465ac5ed

diff --git a/translations b/translations
index 16814729583b..01fad3f3f64f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 16814729583b6d0179eca9e520ce09c24cbbaf15
+Subproject commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/sd/messages.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01fad3f3f64f74bf3ee4fb884a6a6bd4013ede74
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:19:32 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 21:19:32 2022 +0100

fix: source/ar/sd/messages.po:4281: end-of-line within string

Change-Id: I4a19ef59b6595ea7305b95920a9e2567465ac5ed

diff --git a/source/ar/sd/messages.po b/source/ar/sd/messages.po
index b5577bd3e6b..45d03cb776a 100644
--- a/source/ar/sd/messages.po
+++ b/source/ar/sd/messages.po
@@ -4277,7 +4277,7 @@ msgstr ""
 #: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5969
 msgctxt "draw_notebookbar_groupedbar_compact|rowscolumnst"
 msgid "_Table"
-msgstr "جدول""
+msgstr "جدول"
 
 #. QzCG4
 #: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6656

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e25b621f224315149cc78787d27d478f033091f
Author: Andras Timar 
AuthorDate: Sun Jan 16 21:06:24 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 21:06:24 2022 +0100

Bump version to 21.06.13.1

Change-Id: I5b98d1236285f0e2837dc442353cc413db7b9e67

diff --git a/configure.ac b/configure.ac
index 6b5f48c47aca..35e6c39ed3fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.12.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.13.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 13dcef949020bbd4e8db31fc394a10bb02da7467
Author: Andras Timar 
AuthorDate: Sun Jan 16 19:58:41 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Jan 16 19:58:41 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 16814729583b6d0179eca9e520ce09c24cbbaf15
  - Updated Arabic translation

Change-Id: I7af3893248270bd9241ed34efe291e5daa9ea9c7

diff --git a/translations b/translations
index d76f14f896fc..16814729583b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d76f14f896fc608ae1c1d427d9ab5ed6d77cedc8
+Subproject commit 16814729583b6d0179eca9e520ce09c24cbbaf15

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/cui/messages.po |   10 -
 source/ar/extensions/messages.po  |2 
 source/ar/formula/messages.po |2 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po |   44 +++
 source/ar/reportdesign/messages.po|2 
 source/ar/sc/messages.po  |   42 +++---
 source/ar/sd/messages.po  |   32 ++---
 source/ar/sfx2/messages.po|2 
 source/ar/starmath/messages.po|2 
 source/ar/svtools/messages.po |4 
 source/ar/svx/messages.po |   61 +-
 source/ar/sw/messages.po  |   50 
 source/ar/vcl/messages.po |4 
 source/ar/xmlsecurity/messages.po |2 
 14 files changed, 130 insertions(+), 129 deletions(-)

New commits:
commit 16814729583b6d0179eca9e520ce09c24cbbaf15
Author: Andras Timar 
AuthorDate: Sun Jan 16 19:58:30 2022 +0100
Commit: Andras Timar 
CommitDate: Sun Jan 16 19:58:30 2022 +0100

Updated Arabic translation

Change-Id: I7af3893248270bd9241ed34efe291e5daa9ea9c7

diff --git a/source/ar/cui/messages.po b/source/ar/cui/messages.po
index a0b1659ab14..9128b964c1c 100644
--- a/source/ar/cui/messages.po
+++ b/source/ar/cui/messages.po
@@ -5054,7 +5054,7 @@ msgstr ""
 #: cui/uiconfig/ui/areatabpage.ui:34
 msgctxt "areatabpage|tablelb"
 msgid "Row"
-msgstr ""
+msgstr "صف"
 
 #. sEdWf
 #: cui/uiconfig/ui/areatabpage.ui:35
@@ -5852,7 +5852,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:342
 msgctxt "bulletandposition|bullet"
 msgid "Select..."
-msgstr ""
+msgstr "تحديد..."
 
 #. oJgFH
 #: cui/uiconfig/ui/bulletandposition.ui:354
@@ -5918,7 +5918,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:668
 msgctxt "bulletandposition|keepratio"
 msgid "Keep ratio"
-msgstr ""
+msgstr "أبقِ التناسب"
 
 #. EhFU7
 #: cui/uiconfig/ui/bulletandposition.ui:706
@@ -5966,7 +5966,7 @@ msgstr ""
 #: cui/uiconfig/ui/bulletandposition.ui:885
 msgctxt "bulletandposition|position"
 msgid "Position"
-msgstr ""
+msgstr "الموضع"
 
 #. MSmfX
 #: cui/uiconfig/ui/bulletandposition.ui:919
@@ -6902,7 +6902,7 @@ msgstr ""
 #: cui/uiconfig/ui/colorconfigwin.ui:1100
 msgctxt "colorconfigwin|text"
 msgid "Text"
-msgstr ""
+msgstr "النص"
 
 #. ZCYmf
 #: cui/uiconfig/ui/colorconfigwin.ui:1130
diff --git a/source/ar/extensions/messages.po b/source/ar/extensions/messages.po
index 602fbd0aaa8..c48d9f39cbc 100644
--- a/source/ar/extensions/messages.po
+++ b/source/ar/extensions/messages.po
@@ -3642,7 +3642,7 @@ msgstr "المدخلة"
 #: extensions/uiconfig/sbibliography/ui/combobox.ui:16
 msgctxt "combobox|TBC_FT_SOURCE"
 msgid "Table"
-msgstr ""
+msgstr "جدول"
 
 #. HWJFh
 #: extensions/uiconfig/sbibliography/ui/editbox.ui:14
diff --git a/source/ar/formula/messages.po b/source/ar/formula/messages.po
index 8830780331f..44dd27d8c4c 100644
--- a/source/ar/formula/messages.po
+++ b/source/ar/formula/messages.po
@@ -2484,7 +2484,7 @@ msgstr ""
 #: formula/inc/core_resource.hrc:2701
 msgctxt "RID_STRLIST_FUNCTION_NAMES"
 msgid "COLOR"
-msgstr ""
+msgstr "اللون"
 
 #. ufFAa
 #: formula/inc/core_resource.hrc:2702
diff --git a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
index d9bc263b7e6..4ecfa316c2f 100644
--- a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1124,7 +1124,7 @@ msgctxt ""
 "PopupLabel\n"
 "value.text"
 msgid "~Properties..."
-msgstr ""
+msgstr "ال~خصائص..."
 
 #. kvbcj
 #: CalcCommands.xcu
@@ -2634,7 +2634,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Columns ~Before"
-msgstr ""
+msgstr "أعمدة قبل"
 
 #. AhNfD
 #: CalcCommands.xcu
@@ -2694,7 +2694,7 @@ msgctxt ""
 "ContextLabel\n"
 "value.text"
 msgid "Columns ~After"
-msgstr ""
+msgstr "أعمدة بعد"
 
 #. Q6qKb
 #: CalcCommands.xcu
@@ -4594,7 +4594,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Default"
-msgstr ""
+msgstr "المبدئي"
 
 #. uh4sC
 #: CalcCommands.xcu
@@ -8810,7 +8810,7 @@ msgctxt ""
 "ContextLab

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations

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

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b855ab29f080dc95fbb7d8ef2acf506c2cf4f82d
Author: Andras Timar 
AuthorDate: Wed Jan 12 17:48:04 2022 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 12 17:48:04 2022 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to d76f14f896fc608ae1c1d427d9ab5ed6d77cedc8
  - Updated Arabic translation

Change-Id: Ib92390270fa7dc07821fb4175cf7a4071560899d

diff --git a/translations b/translations
index 0b553b25815d..d76f14f896fc 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0b553b25815d61d60042f58cf00faaea5a1da55c
+Subproject commit d76f14f896fc608ae1c1d427d9ab5ed6d77cedc8

[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ar

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

 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po |8 
 source/ar/svx/messages.po |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d76f14f896fc608ae1c1d427d9ab5ed6d77cedc8
Author: Andras Timar 
AuthorDate: Wed Jan 12 17:47:57 2022 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 12 17:47:57 2022 +0100

Updated Arabic translation

Change-Id: Ib92390270fa7dc07821fb4175cf7a4071560899d

diff --git a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
index 07db1d322c5..d9bc263b7e6 100644
--- a/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -8400,7 +8400,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Master Slides"
-msgstr ""
+msgstr "الشريحة الرئيسية"
 
 #. yFsEC
 #: DrawImpressCommands.xcu
@@ -23250,7 +23250,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Symbol"
-msgstr ""
+msgstr "رمز"
 
 #. TMdYK
 #: GenericCommands.xcu
@@ -23922,7 +23922,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Find and Rep~lace..."
-msgstr ""
+msgstr "جِد واستبدل..."
 
 #. B4Dm5
 #: GenericCommands.xcu
@@ -31327,7 +31327,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "~Page Style..."
-msgstr ""
+msgstr "نمط الصفحة..."
 
 #. 8aUD6
 #: WriterCommands.xcu
diff --git a/source/ar/svx/messages.po b/source/ar/svx/messages.po
index 87ab85f8efb..692f06b7f12 100644
--- a/source/ar/svx/messages.po
+++ b/source/ar/svx/messages.po
@@ -14292,7 +14292,7 @@ msgstr "أشكال أساسية"
 #: svx/uiconfig/ui/defaultshapespanel.ui:201
 msgctxt "defaultshapespanel|label5"
 msgid "Symbol Shapes"
-msgstr ""
+msgstr "أشكال الرموز"
 
 #. SGxDy
 #: svx/uiconfig/ui/defaultshapespanel.ui:239
@@ -14316,7 +14316,7 @@ msgstr "الحوارات"
 #: svx/uiconfig/ui/defaultshapespanel.ui:353
 msgctxt "defaultshapespanel|label9"
 msgid "Stars and Banners"
-msgstr ""
+msgstr "نجوم وشعارات"
 
 #. cibWf
 #: svx/uiconfig/ui/defaultshapespanel.ui:391

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.12-1'

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

Tag 'cp-21.06.12-1' created by Andras Timar  at 
2022-01-11 20:30 +

cp-21.06.12-1

Changes since cp-21.06.11-1-40:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.12-1'

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

Tag 'cp-21.06.12-1' created by Andras Timar  at 
2022-01-11 20:30 +

cp-21.06.12-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45f56ee448e5615cc6caa5093d8b9dae268a5a83
Author: Andras Timar 
AuthorDate: Tue Jan 11 21:29:25 2022 +0100
Commit: Andras Timar 
CommitDate: Tue Jan 11 21:29:25 2022 +0100

Bump version to 21.06.12.1

Change-Id: I7684599864becb805c5e0f8441debd227417671c

diff --git a/configure.ac b/configure.ac
index e6aed419456b..6b5f48c47aca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.11.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.12.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/qa vcl/source

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

 vcl/qa/cppunit/BmpFilterTest.cxx |   13 +
 vcl/qa/cppunit/data/tdf73523.bmp |binary
 vcl/source/bitmap/dibtools.cxx   |   34 --
 3 files changed, 37 insertions(+), 10 deletions(-)

New commits:
commit e16a9fda5ab95f1abc0d3d6ca0437081384aa36b
Author: Andras Timar 
AuthorDate: Mon Jan 3 22:12:01 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Jan 10 19:26:41 2022 +0100

tdf#73523 support WinBMPv3-NT version of BMP files (found in Visio files)

It is a special case when there are additional 12 bytes of color bitfields
after the info header. See also the useful comments at

https://searchfox.org/mozilla-central/source/image/decoders/nsBMPDecoder.cpp#47

It turned out we generate this type of BMP files internally from EMF files,
but in that case the bfOffBits of BITMAPFILEHEADER struct points to the
pixel data. In case of Visio, bfOffBits points to the color mask. There was
no better solution than preventing jumping back in the stream.

Change-Id: I97f0fd4f184ea77beeab8b22fc98fdb78472d9bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127920
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127927
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 3a0d539b3a8a76efc2cdac04c658645fe750bec4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128158
Reviewed-by: Xisco Fauli 

diff --git a/vcl/qa/cppunit/BmpFilterTest.cxx b/vcl/qa/cppunit/BmpFilterTest.cxx
index 20be739d0e98..1ab7bc2a0a4a 100644
--- a/vcl/qa/cppunit/BmpFilterTest.cxx
+++ b/vcl/qa/cppunit/BmpFilterTest.cxx
@@ -204,4 +204,17 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_V2)
 CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, aBitmap.GetPixelColor(2, 2));
 }
 
+CPPUNIT_TEST_FIXTURE(BmpFilterTest, testTdf73523)
+{
+SvFileStream aFileStream(getFullUrl(u"tdf73523.bmp"), StreamMode::READ);
+Graphic aGraphic;
+CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic));
+auto aBitmap = aGraphic.GetBitmapEx();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: c[8000]
+// - Actual  : c[]
+// i.e. the pixel is red not black
+CPPUNIT_ASSERT_EQUAL(COL_RED, aBitmap.GetPixelColor(0, 0));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/data/tdf73523.bmp b/vcl/qa/cppunit/data/tdf73523.bmp
new file mode 100644
index ..f4364ea3e841
Binary files /dev/null and b/vcl/qa/cppunit/data/tdf73523.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 55e287e44411..b1e7648d0282 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -246,8 +246,18 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& 
rHeader, bool& bTopDown
 readUInt32( rHeader.nV5ProfileSize );
 readUInt32( rHeader.nV5Reserved );
 
+// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
+sal_uInt32 nColorMask = 0;
+if (BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE == 
rHeader.nSize)
+{
+rIStm.ReadUInt32( rHeader.nV5RedMask );
+rIStm.ReadUInt32( rHeader.nV5GreenMask );
+rIStm.ReadUInt32( rHeader.nV5BlueMask );
+nColorMask = 12;
+}
+
 // seek to EndPos
-if (!checkSeek(rIStm, aStartPos + rHeader.nSize))
+if (!checkSeek(rIStm, aStartPos + rHeader.nSize + nColorMask))
 return false;
 }
 
@@ -530,14 +540,12 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& 
rHeader, BitmapWriteAccess& r
 }
 else
 {
-// Read color mask
-if(bTCMask && BITFIELDS == rHeader.nCompression)
-{
-rIStm.SeekRel( -12 );
-rIStm.ReadUInt32( nRMask );
-rIStm.ReadUInt32( nGMask );
-rIStm.ReadUInt32( nBMask );
-}
+if (rHeader.nV5RedMask > 0)
+nRMask = rHeader.nV5RedMask;
+if (rHeader.nV5GreenMask > 0)
+nGMask = rHeader.nV5GreenMask;
+if (rHeader.nV5BlueMask > 0)
+nBMask = rHeader.nV5BlueMask;
 
 const tools::Long nWidth(rHeader.nWidth);
 const tools::Long nHeight(rHeader.nHeight);
@@ -908,7 +916,13 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_uL
 
 if (nOffset)
 {
-pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
+// It is problematic to seek backwar

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M9'

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

Tag 'mimo-7.0.7.0.M9' created by Andras Timar  at 
2022-01-07 15:26 +

mimo-7.0.7.0.M9

Changes since mimo-7.0.7.0.M7-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

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

 vcl/source/gdi/dibtools.cxx |   33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 9d2c6fc2f0bd79ae5dbe3ca5d0bb34aeecfb1efd
Author: Andras Timar 
AuthorDate: Thu Jan 6 23:01:29 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 7 08:25:16 2022 +0100

Backport the better fix of tdf#73523 from master

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

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 949423a1f255..6a64f60549fa 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -249,8 +249,18 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& 
rHeader, bool& bTopDown
 readUInt32( rHeader.nV5ProfileSize );
 readUInt32( rHeader.nV5Reserved );
 
+// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
+sal_uInt32 nColorMask = 0;
+if (BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE == 
rHeader.nSize)
+{
+rIStm.ReadUInt32( rHeader.nV5RedMask );
+rIStm.ReadUInt32( rHeader.nV5GreenMask );
+rIStm.ReadUInt32( rHeader.nV5BlueMask );
+nColorMask = 12;
+}
+
 // seek to EndPos
-if (!checkSeek(rIStm, aStartPos + rHeader.nSize))
+if (!checkSeek(rIStm, aStartPos + rHeader.nSize + nColorMask))
 return false;
 }
 
@@ -533,13 +543,12 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& 
rHeader, BitmapWriteAccess& r
 }
 else
 {
-// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
-if(bTCMask && BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE 
== rHeader.nSize)
-{
-rIStm.ReadUInt32( nRMask );
-rIStm.ReadUInt32( nGMask );
-rIStm.ReadUInt32( nBMask );
-}
+if (rHeader.nV5RedMask > 0)
+nRMask = rHeader.nV5RedMask;
+if (rHeader.nV5GreenMask > 0)
+nGMask = rHeader.nV5GreenMask;
+if (rHeader.nV5BlueMask > 0)
+nBMask = rHeader.nV5BlueMask;
 
 const long nWidth(rHeader.nWidth);
 const long nHeight(rHeader.nHeight);
@@ -910,7 +919,13 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_uL
 
 if (nOffset)
 {
-pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
+// It is problematic to seek backwards. We are at the
+// end of BITMAPINFOHEADER or 12 bytes further in case
+// of WinBMPv3-NT format. It is possible to seek forward
+// though because a gap may be there.
+sal_Int32 nSeekRel = nOffset - (pIStm->Tell() - nStmPos);
+if (nSeekRel > 0)
+pIStm->SeekRel(nSeekRel);
 }
 
 const sal_Int64 nBitsPerLine (static_cast(aHeader.nWidth) * 
static_cast(aHeader.nBitCount));

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

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

 vcl/source/gdi/dibtools.cxx |   33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

New commits:
commit fd9648dc6f022b49db7f55fd55d69e18b6e95dc5
Author: Andras Timar 
AuthorDate: Thu Jan 6 22:56:49 2022 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 7 08:25:00 2022 +0100

Backport the better fix of tdf#73523 from master

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

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 99ec4af8f386..98a149aa901f 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -250,8 +250,18 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& 
rHeader, bool& bTopDown
 readUInt32( rHeader.nV5ProfileSize );
 readUInt32( rHeader.nV5Reserved );
 
+// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
+sal_uInt32 nColorMask = 0;
+if (BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE == 
rHeader.nSize)
+{
+rIStm.ReadUInt32( rHeader.nV5RedMask );
+rIStm.ReadUInt32( rHeader.nV5GreenMask );
+rIStm.ReadUInt32( rHeader.nV5BlueMask );
+nColorMask = 12;
+}
+
 // seek to EndPos
-if (!checkSeek(rIStm, aStartPos + rHeader.nSize))
+if (!checkSeek(rIStm, aStartPos + rHeader.nSize + nColorMask))
 return false;
 }
 
@@ -534,13 +544,12 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& 
rHeader, BitmapWriteAccess& r
 }
 else
 {
-// Read color mask
-if(bTCMask && BITFIELDS == rHeader.nCompression)
-{
-rIStm.ReadUInt32( nRMask );
-rIStm.ReadUInt32( nGMask );
-rIStm.ReadUInt32( nBMask );
-}
+if (rHeader.nV5RedMask > 0)
+nRMask = rHeader.nV5RedMask;
+if (rHeader.nV5GreenMask > 0)
+nGMask = rHeader.nV5GreenMask;
+if (rHeader.nV5BlueMask > 0)
+nBMask = rHeader.nV5BlueMask;
 
 const tools::Long nWidth(rHeader.nWidth);
 const tools::Long nHeight(rHeader.nHeight);
@@ -911,7 +920,13 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_uL
 
 if (nOffset)
 {
-pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
+// It is problematic to seek backwards. We are at the
+// end of BITMAPINFOHEADER or 12 bytes further in case
+// of WinBMPv3-NT format. It is possible to seek forward
+// though because a gap may be there.
+sal_Int32 nSeekRel = nOffset - (pIStm->Tell() - nStmPos);
+if (nSeekRel > 0)
+pIStm->SeekRel(nSeekRel);
 }
 
 const sal_Int64 nBitsPerLine (static_cast(aHeader.nWidth) * 
static_cast(aHeader.nBitCount));

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

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

 vcl/qa/cppunit/BmpFilterTest.cxx |   13 +
 vcl/qa/cppunit/data/tdf73523.bmp |binary
 vcl/source/bitmap/dibtools.cxx   |   34 --
 3 files changed, 37 insertions(+), 10 deletions(-)

New commits:
commit 3a0d539b3a8a76efc2cdac04c658645fe750bec4
Author: Andras Timar 
AuthorDate: Mon Jan 3 22:12:01 2022 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 6 23:12:13 2022 +0100

tdf#73523 support WinBMPv3-NT version of BMP files (found in Visio files)

It is a special case when there are additional 12 bytes of color bitfields
after the info header. See also the useful comments at

https://searchfox.org/mozilla-central/source/image/decoders/nsBMPDecoder.cpp#47

It turned out we generate this type of BMP files internally from EMF files,
but in that case the bfOffBits of BITMAPFILEHEADER struct points to the
pixel data. In case of Visio, bfOffBits points to the color mask. There was
no better solution than preventing jumping back in the stream.

Change-Id: I97f0fd4f184ea77beeab8b22fc98fdb78472d9bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127920
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127927
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/vcl/qa/cppunit/BmpFilterTest.cxx b/vcl/qa/cppunit/BmpFilterTest.cxx
index 20be739d0e98..1ab7bc2a0a4a 100644
--- a/vcl/qa/cppunit/BmpFilterTest.cxx
+++ b/vcl/qa/cppunit/BmpFilterTest.cxx
@@ -204,4 +204,17 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_V2)
 CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, aBitmap.GetPixelColor(2, 2));
 }
 
+CPPUNIT_TEST_FIXTURE(BmpFilterTest, testTdf73523)
+{
+SvFileStream aFileStream(getFullUrl(u"tdf73523.bmp"), StreamMode::READ);
+Graphic aGraphic;
+CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic));
+auto aBitmap = aGraphic.GetBitmapEx();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: c[8000]
+// - Actual  : c[]
+// i.e. the pixel is red not black
+CPPUNIT_ASSERT_EQUAL(COL_RED, aBitmap.GetPixelColor(0, 0));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/data/tdf73523.bmp b/vcl/qa/cppunit/data/tdf73523.bmp
new file mode 100644
index ..f4364ea3e841
Binary files /dev/null and b/vcl/qa/cppunit/data/tdf73523.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 65117319afe5..96b82b9a7b86 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -246,8 +246,18 @@ bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& 
rHeader, bool& bTopDown
 readUInt32( rHeader.nV5ProfileSize );
 readUInt32( rHeader.nV5Reserved );
 
+// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
+sal_uInt32 nColorMask = 0;
+if (BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE == 
rHeader.nSize)
+{
+rIStm.ReadUInt32( rHeader.nV5RedMask );
+rIStm.ReadUInt32( rHeader.nV5GreenMask );
+rIStm.ReadUInt32( rHeader.nV5BlueMask );
+nColorMask = 12;
+}
+
 // seek to EndPos
-if (!checkSeek(rIStm, aStartPos + rHeader.nSize))
+if (!checkSeek(rIStm, aStartPos + rHeader.nSize + nColorMask))
 return false;
 }
 
@@ -530,14 +540,12 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& 
rHeader, BitmapWriteAccess& r
 }
 else
 {
-// Read color mask
-if(bTCMask && BITFIELDS == rHeader.nCompression)
-{
-rIStm.SeekRel( -12 );
-rIStm.ReadUInt32( nRMask );
-rIStm.ReadUInt32( nGMask );
-rIStm.ReadUInt32( nBMask );
-}
+if (rHeader.nV5RedMask > 0)
+nRMask = rHeader.nV5RedMask;
+if (rHeader.nV5GreenMask > 0)
+nGMask = rHeader.nV5GreenMask;
+if (rHeader.nV5BlueMask > 0)
+nBMask = rHeader.nV5BlueMask;
 
 const tools::Long nWidth(rHeader.nWidth);
 const tools::Long nHeight(rHeader.nHeight);
@@ -908,7 +916,13 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, 
AlphaMask* pBmpAlpha, sal_uI
 
 if (nOffset)
 {
-pIStm->SeekRel(nOffset - (pIStm->Tell() - nStmPos));
+// It is problematic to seek backwards. We are at the
+// end of BITMAPINFOHEADER or 12 bytes further in case
+// of WinBMPv3-NT format. It is possible to seek forward
+// though b

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.11-1'

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

Tag 'cp-21.06.11-1' created by Andras Timar  at 
2022-01-06 12:45 +

cp-21.06.11-1

Changes since co-21.06.10-1-44:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.11-1'

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

Tag 'cp-21.06.11-1' created by Andras Timar  at 
2022-01-06 12:45 +

cp-21.06.11-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 035f34be44a92808f5dc060e9010d521d9946403
Author: Andras Timar 
AuthorDate: Thu Jan 6 13:44:54 2022 +0100
Commit: Andras Timar 
CommitDate: Thu Jan 6 13:44:54 2022 +0100

Bump version to 21.06.11.1

Change-Id: I9012065f8d196f15b478fb3b5d6a083cd5b2b671

diff --git a/configure.ac b/configure.ac
index 143d04870758..e6aed419456b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.10.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.11.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/qa vcl/source

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

 vcl/source/gdi/dibtools.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4aedf0956fb6849781bfb5139b04d8ca0708acdc
Author: Andras Timar 
AuthorDate: Mon Jan 3 22:12:01 2022 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 5 13:56:48 2022 +0100

tdf#73523 do not seek backwards, the color mask info is not there

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

diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index ce1df4a68a65..949423a1f255 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -533,10 +533,9 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& 
rHeader, BitmapWriteAccess& r
 }
 else
 {
-// Read color mask
-if(bTCMask && BITFIELDS == rHeader.nCompression)
+// Read color mask. An additional 12 bytes of color bitfields follow 
the info header (WinBMPv3-NT)
+if(bTCMask && BITFIELDS == rHeader.nCompression && DIBINFOHEADERSIZE 
== rHeader.nSize)
 {
-rIStm.SeekRel( -12 );
 rIStm.ReadUInt32( nRMask );
 rIStm.ReadUInt32( nGMask );
 rIStm.ReadUInt32( nBMask );

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/CppunitTest_vcl_filter_bmp.mk vcl/Module_vcl.mk vcl/qa vcl/source

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

 vcl/CppunitTest_vcl_filter_bmp.mk   |   46 +++
 vcl/Module_vcl.mk   |1 
 vcl/qa/cppunit/filter/bmp/bmp.cxx   |   47 
 vcl/qa/cppunit/filter/bmp/data/tdf73523.bmp |binary
 vcl/source/gdi/dibtools.cxx |1 
 5 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit 7025e57c8f1e26f40754dd0aeb07aa7096a90e1f
Author: Andras Timar 
AuthorDate: Mon Jan 3 22:12:01 2022 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 4 08:41:33 2022 +0100

tdf#73523 do not seek backwards, the color mask info is not there

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

diff --git a/vcl/CppunitTest_vcl_filter_bmp.mk 
b/vcl/CppunitTest_vcl_filter_bmp.mk
new file mode 100644
index ..c9020b8c59c5
--- /dev/null
+++ b/vcl/CppunitTest_vcl_filter_bmp.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_filter_bmp))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_filter_bmp,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_filter_bmp, \
+vcl/qa/cppunit/filter/bmp/bmp \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_filter_bmp, \
+comphelper \
+cppu \
+sal \
+test \
+tl \
+unotest \
+utl \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filter_bmp))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_filter_bmp))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_filter_bmp))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_filter_bmp,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,vcl_filter_bmp,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_filter_bmp))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f2b4058d876c..3c9ef13c011b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -212,6 +212,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 CppunitTest_vcl_pdfium_library_test) \
 $(if $(filter SKIA,$(BUILD_TYPE)), \
 CppunitTest_vcl_skia) \
+CppunitTest_vcl_filter_bmp \
 CppunitTest_vcl_filter_igif \
 ))
 
diff --git a/vcl/qa/cppunit/filter/bmp/bmp.cxx 
b/vcl/qa/cppunit/filter/bmp/bmp.cxx
new file mode 100644
index ..4cf04c4843a2
--- /dev/null
+++ b/vcl/qa/cppunit/filter/bmp/bmp.cxx
@@ -0,0 +1,47 @@
+/* -*- 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/.
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/vcl/qa/cppunit/filter/bmp/data/";
+
+/// Covers vcl/source/gdi/dibtools.cxx fixes.
+class Test : public test::BootstrapFixture
+{
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf73523)
+{
+GraphicFilter aGraphicFilter;
+test::Directories aDirectories;
+OUString aURL = aDirectories.getURLFromSrc(DATA_DIRECTORY) + 
"tdf73523.bmp";
+SvFileStream aStream(aURL, StreamMode::READ);
+Graphic aGraphic = aGraphicFilter.ImportUnloadedGraphic(aStream);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: c[8000]
+// - Actual  : c[]
+// i.e. the pixel is red not black
+CPPUNIT_ASSERT_EQUAL(COL_RED, aGraphic.GetBitmapEx().GetPixelColor(0, 0));
+}
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/filter/bmp/data/tdf73523.bmp 
b/vcl/qa/cppunit/filter/bmp/data/tdf73523.bmp
new file mode 100644
index ..f4364ea3e841
Binary files /dev/null and b/vcl/qa/cppunit/filter/bmp/data/tdf73523.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/fail/crash-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/pass/crash-1.bmp
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index c846d0a3a60c..99ec4af8f386 100644
--- a/vcl/source/gd

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-53'

2021-12-21 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-53' created by Andras Timar  at 
2021-12-21 15:23 +

cp-6.4-53

Changes since cp-6.4-52-10:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-53'

2021-12-21 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-53' created by Andras Timar  at 
2021-12-21 15:23 +

cp-6.4-53

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-53'

2021-12-21 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-53' created by Andras Timar  at 
2021-12-21 15:23 +

cp-6.4-53

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - configure.ac xmlsecurity/inc xmlsecurity/source

2021-12-21 Thread Andras Timar (via logerrit)

 configure.ac   |2 +-
 xmlsecurity/inc/xmlsec-wrapper.h   |4 
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx |4 
 xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx |4 
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit eae20c95fb1d4ca7a720ab1833fe6117ebfdfad0
Author: Andras Timar 
AuthorDate: Tue Dec 21 16:22:59 2021 +0100
Commit: Andras Timar 
CommitDate: Tue Dec 21 16:22:59 2021 +0100

Bump version to 6.4-53

Change-Id: I02d59387f4e660f292f3a5205f36be27338b411c

diff --git a/configure.ac b/configure.ac
index b71a881089bf..7145e2453487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.52],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.53],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 02d498164c95f0f984b6aae63718be34dd4a555f
Author: Caolán McNamara 
AuthorDate: Mon Dec 20 17:05:44 2021 +
Commit: Andras Timar 
CommitDate: Tue Dec 21 16:15:01 2021 +0100

only use X509Data

Change-Id: I52e6588f5fac04bb26d77c1f3af470db73e41f72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127193
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit be446d81e07b5499152efeca6ca23034e51ea5ff)

diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index c060c8bf23b8..2d06dcfdd549 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -43,6 +43,10 @@
 #include 
 #include 
 #include 
+#include 
+#endif
+#ifdef XMLSEC_CRYPTO_MSCRYPTO
+#include 
 #endif
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index db400e6f1ed9..6e4ca3d4e2c0 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -229,6 +229,10 @@ SAL_CALL XMLSignature_MSCryptImpl::validate(
 // We do certificate verification ourselves.
 pDsigCtx->keyInfoReadCtx.flags |= 
XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS;
 
+// limit possible key data to valid X509 certificates only, no KeyValues
+if (xmlSecPtrListAdd(&(pDsigCtx->keyInfoReadCtx.enabledKeyData), BAD_CAST 
xmlSecMSCngKeyDataX509GetKlass()) < 0)
+throw RuntimeException("failed to limit allowed key data");
+
 //Verify signature
 //The documentation says that the signature is only valid if the return 
value is 0 (that is, not < 0)
 //AND pDsigCtx->status == xmlSecDSigStatusSucceeded. That is, we must not 
make any assumptions, if
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 9d2a5251026a..6f70f76d23be 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -244,6 +244,10 @@ SAL_CALL XMLSignature_NssImpl::validate(
 // We do certificate verification ourselves.
 pDsigCtx->keyInfoReadCtx.flags |= 
XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS;
 
+// limit possible key data to valid X509 certificates only, no 
KeyValues
+if (xmlSecPtrListAdd(&(pDsigCtx->keyInfoReadCtx.enabledKeyData), 
BAD_CAST xmlSecNssKeyDataX509GetKlass()) < 0)
+throw RuntimeException("failed to limit allowed key data");
+
 //Verify signature
 int rs = xmlSecDSigCtxVerify( pDsigCtx.get() , pNode );

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.10-1'

2021-12-17 Thread Andras Timar (via logerrit)

Tag 'co-21.06.10-1' created by Andras Timar  at 
2021-12-17 13:41 +

co-21.06.10-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.10-1'

2021-12-16 Thread Andras Timar (via logerrit)

Tag 'cp-21.06.10-1' created by Andras Timar  at 
2021-12-16 08:37 +

cp-21.06.10-1

Changes since co-21.06.9-1-18:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.10-1'

2021-12-16 Thread Andras Timar (via logerrit)

Tag 'cp-21.06.10-1' created by Andras Timar  at 
2021-12-16 08:37 +

cp-21.06.10-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

2021-12-16 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d382e7c1decd39c4f3d8a25ce4e808e79b516e68
Author: Andras Timar 
AuthorDate: Thu Dec 16 09:35:03 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 16 09:35:03 2021 +0100

Bump version to 21.06.10.1

Change-Id: I9aadb797eaf4392eab3a5c4f7387be21706e4568

diff --git a/configure.ac b/configure.ac
index aa4b3c62157e..c68e60d07796 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.9.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.10.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-34'

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

Tag 'cp-6.2-34' created by Andras Timar  at 
2021-12-08 11:34 +

cp-6.2-34

Changes since co-6.2-33-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-52'

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

Tag 'cp-6.4-52' created by Andras Timar  at 
2021-12-08 11:16 +

cp-6.4-52

Changes since co-6.4-51-1:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-52'

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

Tag 'cp-6.4-52' created by Andras Timar  at 
2021-12-08 11:16 +

cp-6.4-52

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-52'

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

Tag 'cp-6.4-52' created by Andras Timar  at 
2021-12-08 11:16 +

cp-6.4-52

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61824e9f0dde1e8c437d0cfe841ca1b7529388d0
Author: Andras Timar 
AuthorDate: Wed Dec 8 12:16:14 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Dec 8 12:16:14 2021 +0100

Bump version to 6.4-52

Change-Id: I5343238dc29c5abef8c59cf840b49099f71df38e

diff --git a/configure.ac b/configure.ac
index 12f94cf51b3b..6bd1d832d1b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.51],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.52],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.2-34'

2021-12-06 Thread Andras Timar (via logerrit)

Tag 'co-6.2-34' created by Andras Timar  at 
2021-12-06 15:52 +

co-6.2-34

Changes since co-6.2-33-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

2021-12-06 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20b5c7f7d3c65cf80e29fd2f4bc1e6d9d588c33e
Author: Andras Timar 
AuthorDate: Mon Dec 6 16:52:18 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 6 16:52:18 2021 +0100

Bump version to 6.2-34

Change-Id: If492b3bcc55660dc24be24c537584f388d8a50da

diff --git a/configure.ac b/configure.ac
index f83483543137..0e062d2c12d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.2.10.33],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.34],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.4-51'

2021-12-06 Thread Andras Timar (via logerrit)

Tag 'co-6.4-51' created by Andras Timar  at 
2021-12-06 10:25 +

co-6.4-51

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.4-51'

2021-12-06 Thread Andras Timar (via logerrit)

Tag 'co-6.4-51' created by Andras Timar  at 
2021-12-06 10:25 +

co-6.4-51

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.9-1'

2021-12-06 Thread Andras Timar (via logerrit)

Tag 'co-21.06.9-1' created by Andras Timar  at 
2021-12-04 20:58 +

co-21.06.9-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.9-1'

2021-12-02 Thread Andras Timar (via logerrit)

Tag 'cp-21.06.9-1' created by Andras Timar  at 
2021-12-02 15:15 +

cp-21.06.9-1

Changes since cp-21.06.8-1-3:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

2021-12-02 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e60ec9fd734f3920e871474221453687cd622786
Author: Andras Timar 
AuthorDate: Thu Dec 2 16:14:34 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 2 16:14:34 2021 +0100

Bump version to 21.06.9-1

Change-Id: I0072b5e5912badd21d73b1f59fe7d5ad4c9a85ce

diff --git a/configure.ac b/configure.ac
index 1fc658a0ed15..aa4b3c62157e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.8.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.9.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-51'

2021-12-02 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-51' created by Andras Timar  at 
2021-12-02 14:57 +

cp-6.4-51

Changes since cp-6.4-50-60:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-51'

2021-12-02 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-51' created by Andras Timar  at 
2021-12-02 14:57 +

cp-6.4-51

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-51'

2021-12-02 Thread Andras Timar (via logerrit)

Tag 'cp-6.4-51' created by Andras Timar  at 
2021-12-02 14:57 +

cp-6.4-51

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

2021-12-02 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 740e89232eb5ffe50a6b08dd9136a5c176092b2f
Author: Andras Timar 
AuthorDate: Thu Dec 2 15:56:21 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 2 15:56:21 2021 +0100

Bump verson to 6.4-51

Change-Id: I8c2006c05d41590b3760bf0f0ce9f69a826898a6

diff --git a/configure.ac b/configure.ac
index 3463e7458479..12f94cf51b3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.50],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.51],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac connectivity/source external/iODBC external/unixODBC readlicense_oo/license RepositoryExternal.mk solenv/clang-format

2021-12-02 Thread Andras Timar (via logerrit)

 RepositoryExternal.mk   |2 
 configure.ac|1 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |2 
 connectivity/source/drivers/odbc/OTools.cxx |4 
 external/iODBC/README   |1 
 external/iODBC/inc/odbc/iodbcunix.h |  160 
 external/iODBC/inc/odbc/sql.h   | 1187 +++
 external/iODBC/inc/odbc/sqlext.h| 2573 
 external/iODBC/inc/odbc/sqltypes.h  |  429 ++
 external/iODBC/inc/odbc/sqlucode.h  |  818 +
 external/unixODBC/README|1 
 external/unixODBC/inc/odbc/sql.h|  824 -
 external/unixODBC/inc/odbc/sqlext.h | 2122 -
 external/unixODBC/inc/odbc/sqltypes.h   |  471 --
 external/unixODBC/inc/odbc/sqlucode.h   |  789 
 readlicense_oo/license/license.xml  |   37 
 solenv/clang-format/excludelist |8 
 17 files changed, 5210 insertions(+), 4219 deletions(-)

New commits:
commit 0d64d036a5bb8fd0ac0ad5ddf778ab20e6ee3110
Author: Andras Timar 
AuthorDate: Tue Nov 30 12:45:40 2021 +0100
Commit: Michael Meeks 
CommitDate: Thu Dec 2 14:33:12 2021 +0100

Replace unixODBC to iODBC that is BSD licensed

Change-Id: Ia794fd97bb70b1e33385517971a174430d11cab7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126117
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e63b6fba6d0f..d52afc12f41c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -50,7 +50,7 @@ else # !SYSTEM_ODBC_HEADERS
 
 define gb_LinkTarget__use_odbc_headers
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(SRCDIR)/external/unixODBC/inc \
+   -I$(SRCDIR)/external/iODBC/inc \
$$(INCLUDE) \
 )
 
diff --git a/configure.ac b/configure.ac
index 5de32fbac1e7..1fc658a0ed15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10194,6 +10194,7 @@ elif test "$enable_database_connectivity" != yes; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_ODBC_HEADERS=
+BUILD_TYPE="$BUILD_TYPE IODBC"
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx 
b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 65cfbf5e7b5f..0b535cef3d2e 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -306,7 +306,7 @@ void OPreparedStatement::setParameter(const sal_Int32 
parameterIndex, const sal_
  * ODBC Programmer's reference > Developing Applications > Programming 
Considerations > Unicode >  Unicode Function Arguments
  *http://support.microsoft.com/kb/294169
  *
- * UnixODBC can be configured at compile-time so that the "W" variants 
expect
+ * iODBC can be configured at compile-time so that the "W" variants 
expect
  * UTF-16 or UTF-32 encoded strings, and character lengths are number 
of codepoints.
  * However, UTF-16 is the default, what all/most distributions do
  * and the established API that most drivers implement.
diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index 4781415de474..e65da53c20cf 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -65,7 +65,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 return sizeof(SQLBIGINT);
 case SQL_C_UBIGINT:
 return sizeof(SQLUBIGINT);
-/* UnixODBC gives this the same value as SQL_C_UBIGINT
+/* iODBC gives this the same value as SQL_C_UBIGINT
 case SQL_C_BOOKMARK:
 return sizeof(BOOKMARK); */
 case SQL_C_TYPE_DATE:
@@ -99,7 +99,7 @@ size_t sqlTypeLen ( SQLSMALLINT _nType )
 case SQL_C_CHAR:
 case SQL_C_WCHAR:
 case SQL_C_BINARY:
-// UnixODBC gives this the same value as SQL_C_BINARY
+// iODBC gives this the same value as SQL_C_BINARY
 //case SQL_C_VARBOOKMARK:
 // Unknown datatype -> cannot predict length
 default:
diff --git a/external/iODBC/README b/external/iODBC/README
new file mode 100644
index ..df189dcd88e7
--- /dev/null
+++ b/external/iODBC/README
@@ -0,0 +1 @@
+iODBC is an open-source ODBC driver manager and SDK that facilitates the 
development of database-independent applications on Linux, FreeBSD, Unix and 
macOS platforms.  [http://www.iodbc.org/]
diff --git a/external/iODBC/inc/odbc/iodbcunix.h 
b/external/iODBC/inc/odbc/iodbcunix.h
new file mode 100644
index ..22e1518ba44a
--- /dev/null
+++ b/external/iODBC/inc/odbc/iodbcunix.h
@@ -0,0 +1,160 @@
+/*
+ *  i

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - readlicense_oo/license

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

 readlicense_oo/license/license.xml |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 7769527cbefa25d09db87375ce2c20fba03ac3b5
Author: Andras Timar 
AuthorDate: Mon Nov 29 21:25:39 2021 +0100
Commit: Andras Timar 
CommitDate: Tue Nov 30 10:19:28 2021 +0100

typo fixes in license text

Change-Id: I27e1baa2fd5d19546afc7bce30758b3442bd8ed3

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index cc46bd194e4c..bc8d37879a2b 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1217,9 +1217,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of Daniel Veillard 
shall not be used in advertising or
 otherwise to promote the sale, use or other dealings in this Software 
without prior written authorization from
@@ -1238,9 +1238,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of Daniel Veillard 
shall not be used in advertising or
 otherwise to promote the sale, use or other dealings in this Software 
without prior written authorization from
@@ -1254,9 +1254,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE 
SOFTWARE OR THE USE OR OTHER DEALINGS IN
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 Except as contained in this notice, the name of the authors shall 
not be used in advertising or otherwise to
 promote the sale, use or other dealings in this Software without prior 
written authorization from him.
@@ -2095,9 +2095,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT. IN NO
 EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this

[Libreoffice-commits] core.git: readlicense_oo/license

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

 readlicense_oo/license/license.xml |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit c395be2cce7030506b0913a139a4e9a5677f5753
Author: Andras Timar 
AuthorDate: Mon Nov 29 21:25:39 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Nov 29 21:26:47 2021 +0100

typo fixes in license text

Change-Id: I27e1baa2fd5d19546afc7bce30758b3442bd8ed3

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 25d37248e738..d4bc0f824209 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1217,9 +1217,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of Daniel Veillard 
shall not be used in advertising or
 otherwise to promote the sale, use or other dealings in this Software 
without prior written authorization from
@@ -1238,9 +1238,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this notice, the name of Daniel Veillard 
shall not be used in advertising or
 otherwise to promote the sale, use or other dealings in this Software 
without prior written authorization from
@@ -1254,9 +1254,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT.  IN NO
 EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE 
SOFTWARE OR THE USE OR OTHER DEALINGS IN
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 Except as contained in this notice, the name of the authors shall 
not be used in advertising or otherwise to
 promote the sale, use or other dealings in this Software without prior 
written authorization from him.
@@ -2085,9 +2085,9 @@
 The above copyright notice and this permission notice shall be 
included in all copies or substantial
 portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A 
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
PURPOSE AND NONINFRINGEMENT. IN NO
 EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR 
OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 Except as contained in this

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.0.7.3.M1'

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

Tag 'mimo-6.0.7.3.M1' created by Andras Timar  at 
2021-11-25 15:12 +

mimo-6.0.7.3.M1

Changes since mimo-6-0-branch-point-107:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.8-1'

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

Tag 'cp-21.06.8-1' created by Andras Timar  at 
2021-11-24 20:58 +

cp-21.06.8-1

Changes since cp-21.06.7-1-6:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.8-1'

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

Tag 'cp-21.06.8-1' created by Andras Timar  at 
2021-11-24 20:58 +

cp-21.06.8-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

Rebased ref, commits from common ancestor:
commit 68738ca6d632ed57ea25bc8909959bad0d171872
Author: Andras Timar 
AuthorDate: Wed Nov 24 21:57:01 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 24 21:57:52 2021 +0100

Bump version to 21.06.8.1

Change-Id: I273a257760216d6232b9624cfbb0b729098696d8

diff --git a/configure.ac b/configure.ac
index 98e3b70c62a6..5de32fbac1e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.7.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.8.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a8a549e9cf6c43e9f4d4c11badfc47a3a35abf0
Author: Andras Timar 
AuthorDate: Wed Nov 24 21:57:01 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 24 21:57:01 2021 +0100

Bump version to 21.11.8.1

Change-Id: I273a257760216d6232b9624cfbb0b729098696d8

diff --git a/configure.ac b/configure.ac
index 98e3b70c62a6..5de32fbac1e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.7.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.8.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M7'

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

Tag 'mimo-7.0.7.0.M7' created by Andras Timar  at 
2021-11-23 09:48 +

mimo-7.0.7.0.M7

Changes since mimo-7.0.7.0.M6-8:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-0' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e28a638d2180ca4d5d91d3b6719dacd5299f46b4
Author: Andras Timar 
AuthorDate: Tue Nov 23 10:25:37 2021 +0100
Commit: Andras Timar 
CommitDate: Tue Nov 23 10:25:37 2021 +0100

Bump version to 6.0.7.3.M1

Change-Id: Ib7161ceef3662269a6fb95a34f21652daff26bd7

diff --git a/configure.ac b/configure.ac
index 0ae66814529f..76ddd1d2eea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.7.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.7.3.M1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c1b495515eb786b91d87f3c42035b376c5147fe
Author: Andras Timar 
AuthorDate: Tue Nov 23 10:23:55 2021 +0100
Commit: Andras Timar 
CommitDate: Tue Nov 23 10:23:55 2021 +0100

Bump version to 5.4.7.2.M9

Change-Id: I314880b70c68a3f62705c688be575e22fe9c7f62

diff --git a/configure.ac b/configure.ac
index c37ca3ee975a..e058c6b34149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.4.7.2.M8],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.7.2.M9],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.7-1'

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

Tag 'cp-21.06.7-1' created by Andras Timar  at 
2021-11-19 21:09 +

cp-21.06.7-1

Changes since cp-21.06.6-1-10:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.7-1'

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

Tag 'cp-21.06.7-1' created by Andras Timar  at 
2021-11-19 21:09 +

cp-21.06.7-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8d39cd98ab0610b2ddcd2e4c568e967f493e80b
Author: Andras Timar 
AuthorDate: Fri Nov 19 22:09:03 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 19 22:09:03 2021 +0100

Bump version to 21.06.7.1

Change-Id: I3b491c4475c327507784ee5ec86a4e67c4810c23

diff --git a/configure.ac b/configure.ac
index d96bc28576be..98e3b70c62a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.6.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.7.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - chart2/source

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

 chart2/source/inc/ChartTypeHelper.hxx   |1 +
 chart2/source/tools/ChartTypeHelper.cxx |   13 +
 chart2/source/view/main/ChartView.cxx   |9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 80ada110c56398e984d3f2d1f0ae1f30e8a73690
Author: Andras Timar 
AuthorDate: Tue Nov 9 23:36:32 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Nov 15 12:37:02 2021 +0100

tdf#136111 fix scaling problem on chart driven by a macro

Change-Id: I9a55bcfceb9259f0d5dc944c00a34b3e4a891e0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124940
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
(cherry picked from commit 0644f44daef7caa8a246221d762fbc0f6af3672c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124864
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 453363ae1384a6d6f2c77052170b39a1ebf567a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124970
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/inc/ChartTypeHelper.hxx 
b/chart2/source/inc/ChartTypeHelper.hxx
index 1a6345321825..d4917be283fb 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -49,6 +49,7 @@ public:
 static bool isSupportingDateAxis( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
 static bool isSupportingComplexCategory( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
 static bool isSupportingCategoryPositioning( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+static bool shiftCategoryPosAtXAxisPerDefault( const 
css::uno::Reference< css::chart2::XChartType >& xChartType );
 
 //returns sequence of css::chart::DataLabelPlacement
 static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
diff --git a/chart2/source/tools/ChartTypeHelper.cxx 
b/chart2/source/tools/ChartTypeHelper.cxx
index a4b8059ffb19..a260636a0604 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -464,6 +464,19 @@ bool ChartTypeHelper::isSupportingCategoryPositioning( 
const uno::Reference< cha
 return false;
 }
 
+bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< 
chart2::XChartType >& xChartType )
+{
+if(xChartType.is())
+{
+OUString aChartTypeName = xChartType->getChartType();
+if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) 
)
+return true;
+}
+return false;
+}
+
 bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< 
chart2::XChartType >& xChartType )
 {
 if(xChartType.is())
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index f6642c920968..5cfee64f0641 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -323,7 +323,7 @@ public:
 
 void AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& rModel );
 
-static bool isCategoryPositionShifted(
+bool isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories );
 
 private:
@@ -348,12 +348,14 @@ private:
  */
 sal_Int32 m_nMaxAxisIndex;
 
+bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 sal_Int32 m_nDefaultDateNumberFormat;
 };
 
 SeriesPlotterContainer::SeriesPlotterContainer( std::vector< 
std::unique_ptr >& rVCooSysList )
 : m_rVCooSysList( rVCooSysList )
 , m_nMaxAxisIndex(0)
+, m_bChartTypeUsesShiftedCategoryPositionPerDefault(false)
 , m_nDefaultDateNumberFormat(0)
 {
 }
@@ -517,6 +519,9 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 }
 }
 
+if(nT==0)
+m_bChartTypeUsesShiftedCategoryPositionPerDefault = 
ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( xChartType );
+
 bool bExcludingPositioning = 
DiagramHelper::getDiagramPositioningMode( xDiagram ) == 
DiagramPositioningMode_EXCLUDING;
 VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( 
xChartType, nDimensionCount, bExcludingPositioning );
 if( !pPlotter )
@@ -628,7 +633,7 @@ bool SeriesPlotterContainer::isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories )
 {
 if (rSourceScale.AxisType == AxisType::CATEGORY)
-return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition;
+return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition 
|| m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 
 if (rSourceScale.AxisType == AxisType::DATE)
 return rSourceScale.ShiftedCategoryPosition;

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.6-1'

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

Tag 'cp-21.06.6-1' created by Andras Timar  at 
2021-11-11 15:28 +

cp-21.06.6-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: chart2/source

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

 chart2/source/inc/ChartTypeHelper.hxx   |1 +
 chart2/source/tools/ChartTypeHelper.cxx |   13 +
 chart2/source/view/main/ChartView.cxx   |9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 453363ae1384a6d6f2c77052170b39a1ebf567a6
Author: Andras Timar 
AuthorDate: Tue Nov 9 23:36:32 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 16:02:47 2021 +0100

tdf#136111 fix scaling problem on chart driven by a macro

Change-Id: I9a55bcfceb9259f0d5dc944c00a34b3e4a891e0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124940
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
(cherry picked from commit 0644f44daef7caa8a246221d762fbc0f6af3672c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124864
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/chart2/source/inc/ChartTypeHelper.hxx 
b/chart2/source/inc/ChartTypeHelper.hxx
index 1a6345321825..d4917be283fb 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -49,6 +49,7 @@ public:
 static bool isSupportingDateAxis( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
 static bool isSupportingComplexCategory( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
 static bool isSupportingCategoryPositioning( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+static bool shiftCategoryPosAtXAxisPerDefault( const 
css::uno::Reference< css::chart2::XChartType >& xChartType );
 
 //returns sequence of css::chart::DataLabelPlacement
 static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
diff --git a/chart2/source/tools/ChartTypeHelper.cxx 
b/chart2/source/tools/ChartTypeHelper.cxx
index bb8f965ee199..323e68197969 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -464,6 +464,19 @@ bool ChartTypeHelper::isSupportingCategoryPositioning( 
const uno::Reference< cha
 return false;
 }
 
+bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< 
chart2::XChartType >& xChartType )
+{
+if(xChartType.is())
+{
+OUString aChartTypeName = xChartType->getChartType();
+if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) 
)
+return true;
+}
+return false;
+}
+
 bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< 
chart2::XChartType >& xChartType )
 {
 if(xChartType.is())
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 698583e477aa..021853b6408f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -325,7 +325,7 @@ public:
 
 void AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& rModel );
 
-static bool isCategoryPositionShifted(
+bool isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories );
 
 private:
@@ -350,12 +350,14 @@ private:
  */
 sal_Int32 m_nMaxAxisIndex;
 
+bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 sal_Int32 m_nDefaultDateNumberFormat;
 };
 
 SeriesPlotterContainer::SeriesPlotterContainer( std::vector< 
std::unique_ptr >& rVCooSysList )
 : m_rVCooSysList( rVCooSysList )
 , m_nMaxAxisIndex(0)
+, m_bChartTypeUsesShiftedCategoryPositionPerDefault(false)
 , m_nDefaultDateNumberFormat(0)
 {
 }
@@ -519,6 +521,9 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 }
 }
 
+if(nT==0)
+m_bChartTypeUsesShiftedCategoryPositionPerDefault = 
ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( xChartType );
+
 bool bExcludingPositioning = 
DiagramHelper::getDiagramPositioningMode( xDiagram ) == 
DiagramPositioningMode_EXCLUDING;
 VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( 
xChartType, nDimensionCount, bExcludingPositioning );
 if( !pPlotter )
@@ -630,7 +635,7 @@ bool SeriesPlotterContainer::isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories )
 {
 if (rSourceScale.AxisType == AxisType::CATEGORY)
-return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition;
+return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition 
|| m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 
 if (rSourceScale.AxisType == AxisType::DATE)
 return rSourceScale.ShiftedCategoryPosition;

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 356e43b08d2b4872213fb31ea5a8138c58bf8038
Author: Andras Timar 
AuthorDate: Wed Nov 10 12:21:06 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 12:21:06 2021 +0100

Bump version to 7.0.7.0.M7

Change-Id: I94e2a50e6ee2b2f8da30dc18566709af23f0bb00

diff --git a/configure.ac b/configure.ac
index 17b81ded2c63..36e39a8c5109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M7],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.6-1'

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

Tag 'co-21.06.6-1' created by Andras Timar  at 
2021-11-10 10:43 +

co-21.06.6-1

Changes since cp-21.06.5-2-28:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.6-1'

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

Tag 'co-21.06.6-1' created by Andras Timar  at 
2021-11-10 10:43 +

co-21.06.6-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8366dce02f68e6ddf5dc719663123f2502a36728
Author: Andras Timar 
AuthorDate: Wed Nov 10 11:42:31 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 11:42:31 2021 +0100

Bump version to 21.06.6.1

Change-Id: Ic49366632debf2c7b603e6a81d6ae41316065bde

diff --git a/configure.ac b/configure.ac
index 151e6dc08954..38953def3252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[21.06.5.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.6.1],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - chart2/source

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

 chart2/source/inc/ChartTypeHelper.hxx   |1 +
 chart2/source/tools/ChartTypeHelper.cxx |   13 +
 chart2/source/view/main/ChartView.cxx   |9 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 0644f44daef7caa8a246221d762fbc0f6af3672c
Author: Andras Timar 
AuthorDate: Tue Nov 9 23:36:32 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 11:29:45 2021 +0100

tdf#136111 fix scaling problem on chart driven by a macro

Change-Id: I9a55bcfceb9259f0d5dc944c00a34b3e4a891e0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124940
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/chart2/source/inc/ChartTypeHelper.hxx 
b/chart2/source/inc/ChartTypeHelper.hxx
index 1a6345321825..d4917be283fb 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -49,6 +49,7 @@ public:
 static bool isSupportingDateAxis( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
 static bool isSupportingComplexCategory( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
 static bool isSupportingCategoryPositioning( const css::uno::Reference< 
css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+static bool shiftCategoryPosAtXAxisPerDefault( const 
css::uno::Reference< css::chart2::XChartType >& xChartType );
 
 //returns sequence of css::chart::DataLabelPlacement
 static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
diff --git a/chart2/source/tools/ChartTypeHelper.cxx 
b/chart2/source/tools/ChartTypeHelper.cxx
index a4b8059ffb19..a260636a0604 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -464,6 +464,19 @@ bool ChartTypeHelper::isSupportingCategoryPositioning( 
const uno::Reference< cha
 return false;
 }
 
+bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< 
chart2::XChartType >& xChartType )
+{
+if(xChartType.is())
+{
+OUString aChartTypeName = xChartType->getChartType();
+if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
+|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) 
)
+return true;
+}
+return false;
+}
+
 bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< 
chart2::XChartType >& xChartType )
 {
 if(xChartType.is())
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 56a64d349e6f..052e2f370f3f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -325,7 +325,7 @@ public:
 
 void AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel& rModel );
 
-static bool isCategoryPositionShifted(
+bool isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories );
 
 private:
@@ -350,12 +350,14 @@ private:
  */
 sal_Int32 m_nMaxAxisIndex;
 
+bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 sal_Int32 m_nDefaultDateNumberFormat;
 };
 
 SeriesPlotterContainer::SeriesPlotterContainer( std::vector< 
std::unique_ptr >& rVCooSysList )
 : m_rVCooSysList( rVCooSysList )
 , m_nMaxAxisIndex(0)
+, m_bChartTypeUsesShiftedCategoryPositionPerDefault(false)
 , m_nDefaultDateNumberFormat(0)
 {
 }
@@ -519,6 +521,9 @@ void 
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 }
 }
 
+if(nT==0)
+m_bChartTypeUsesShiftedCategoryPositionPerDefault = 
ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( xChartType );
+
 bool bExcludingPositioning = 
DiagramHelper::getDiagramPositioningMode( xDiagram ) == 
DiagramPositioningMode_EXCLUDING;
 VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( 
xChartType, nDimensionCount, bExcludingPositioning );
 if( !pPlotter )
@@ -630,7 +635,7 @@ bool SeriesPlotterContainer::isCategoryPositionShifted(
 const chart2::ScaleData& rSourceScale, bool bHasComplexCategories )
 {
 if (rSourceScale.AxisType == AxisType::CATEGORY)
-return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition;
+return bHasComplexCategories || rSourceScale.ShiftedCategoryPosition 
|| m_bChartTypeUsesShiftedCategoryPositionPerDefault;
 
 if (rSourceScale.AxisType == AxisType::DATE)
 return rSourceScale.ShiftedCategoryPosition;

[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: Branch 'distro/collabora/co-2021' - distro-configs/CPLinux.conf

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

Rebased ref, commits from common ancestor:
commit b3dace9c22b08f4660ac7c2e1d28db69f044afe6
Author: Andras Timar 
AuthorDate: Thu Nov 4 22:42:18 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 21:53:38 2021 +0100

[cp] --disable-skia, there's not that much point in building that for Linux

Change-Id: I0ccd3e6b544609dcdb6e78ef846adaa0f4d93768

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index 72fd0b0ffd17..7e586c7410a5 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -45,3 +45,4 @@
 --enable-release-build
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-symbols
+--disable-skia

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.2.8.2.M7'

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

Tag 'mimo-6.2.8.2.M7' created by Andras Timar  at 
2021-11-05 11:35 +

mimo-6.2.8.2.M7

Changes since mimo-6.2.8.2.M6-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 569781b501be2f238c84c0d9184be0338827268b
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:34:39 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:34:39 2021 +0100

Bump product version to 6.2.8.2.M7

Change-Id: I1bdeca6613e1365a5f93b291b8e69f1b14dda862

diff --git a/configure.ac b/configure.ac
index 8dc8b4f93a41..786f9dce9054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.8.2.M6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M7],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.3.6.2.M2'

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

Tag 'mimo-6.3.6.2.M2' created by Andras Timar  at 
2021-11-05 11:33 +

mimo-6.3.6.2.M2

Changes since mimo-6.3.6.2.M1-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2dd773743fd9a11aa52043133be93266cffd2127
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:32:55 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:32:55 2021 +0100

Bump product version to 6.3.6.2.M2

Change-Id: Ib9e7204c6fc18f14ec091817013f7d752b2e6c1d

diff --git a/configure.ac b/configure.ac
index 14de6af60a79..a9e375192510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.6.2.M1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.2.M2],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.4.7.2.M4'

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

Tag 'mimo-6.4.7.2.M4' created by Andras Timar  at 
2021-11-05 11:29 +

mimo-6.4.7.2.M4

Changes since mimo-6.4.7.2.M3-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 990e3526a388b520c339211a30af3574d423c4f5
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:28:26 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:28:26 2021 +0100

Bump product version to 6.4.7.2.M4

Change-Id: I44d6e115b462e996bb989315e76f542db700ece8

diff --git a/configure.ac b/configure.ac
index f9ae0c1093f1..91000ab78666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.4.7.2.M3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M4],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M6'

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

Tag 'mimo-7.0.7.0.M6' created by Andras Timar  at 
2021-11-05 11:25 +

mimo-7.0.7.0.M6

Changes since mimo-7.0.7.0.M5-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2193db210309cebcf4da3c63fdf9194fd7ea9038
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:25:27 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:25:27 2021 +0100

Bump version to 7.0.7.0.M6

Change-Id: Ice8339c03f2383be2c9440dc22f5693e05689347

diff --git a/configure.ac b/configure.ac
index 3453c65554d8..17b81ded2c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M6],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M5'

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

Tag 'mimo-7.0.7.0.M5' created by Andras Timar  at 
2021-11-05 11:23 +

mimo-7.0.7.0.M5

Changes since mimo-7.0.7.0.M4-1:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - distro-configs/CPLinux.conf vcl/unx

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

 distro-configs/CPLinux.conf|1 +
 vcl/unx/generic/gdi/freetypetextrender.cxx |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14969915918118aeec7a18f934ef0a77d3a21eb3
Author: Andras Timar 
AuthorDate: Thu Nov 4 22:42:18 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 4 22:44:49 2021 +0100

[cp] --disable-skia, there's not that much point in building that for Linux

Change-Id: I0ccd3e6b544609dcdb6e78ef846adaa0f4d93768

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index 72fd0b0ffd17..7e586c7410a5 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -45,3 +45,4 @@
 --enable-release-build
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-symbols
+--disable-skia
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx 
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 5f28ebdb91fe..9e47ad2d5ce0 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -148,7 +148,6 @@ void FreeTypeTextRenderImpl::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric,
 
 std::unique_ptr FreeTypeTextRenderImpl::GetTextLayout(int 
nFallbackLevel)
 {
-assert(mpFreetypeFont[nFallbackLevel]);
 if (!mpFreetypeFont[nFallbackLevel])
 return nullptr;
 return std::make_unique(*mpFreetypeFont[nFallbackLevel]);

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-50'

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

Tag 'cp-6.4-50' created by Andras Timar  at 
2021-11-03 15:44 +

cp-6.4-50

Changes since cp-6.4-49-21:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-50'

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

Tag 'cp-6.4-50' created by Andras Timar  at 
2021-11-03 15:44 +

cp-6.4-50

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-50'

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

Tag 'cp-6.4-50' created by Andras Timar  at 
2021-11-03 15:44 +

cp-6.4-50

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d53ee720f4279b8133b6e10708d2f07ee133c805
Author: Andras Timar 
AuthorDate: Wed Nov 3 16:43:49 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 3 16:43:49 2021 +0100

Bump version to 6.4-50

Change-Id: I478b567d41e71c07d11c17449c0c64c90e3d529b

diff --git a/configure.ac b/configure.ac
index 07badf170dba..3920842e71aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.49],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.50],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

< 5 6 7 8 9 10 11 12 13 14 >

901 - 1000 of 7674 matches

Mail list logo