[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - solenv/bin
solenv/bin/modules/installer/epmfile.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 28c77f04df51d73890ca0175c66704d1abbd6ed9
Author: Andras Timar
AuthorDate: Tue Aug 23 21:57:10 2022 +0200
Commit: Andras Timar
CommitDate: Tue Aug 23 21:57:14 2022 +0200
Debian package names must not contain uppercase letters
MIMO packageversion string contains capital M.
Change-Id: Iefa3d8102e1c7ebb779e84a246abb7262bbad384
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 7a1f5fd94c52..09b9deb0289b 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -289,7 +289,7 @@ sub create_epm_header
installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion,
$variableshashref, 0);
if ( $variableshashref->{'PACKAGEREVISION'} ) {
$installer::globals::packagerevision = $variableshashref->{'PACKAGEREVISION'}; }
-$line = "%version" . " " . $installer::globals::packageversion . "\n";
+$line = "%version" . " " . lc $installer::globals::packageversion . "\n";
push(@epmheader, $line);
$line = "%release" . " " . $installer::globals::packagerevision . "\n";
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - setup_native/source
setup_native/source/packinfo/spellchecker_selection.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e33bf4775261e535d93fff8356862f66f9630bfa Author: Andras Timar AuthorDate: Tue Aug 23 21:14:10 2022 +0200 Commit: Andras Timar CommitDate: Tue Aug 23 21:14:10 2022 +0200 Linux languagepacks take the first from the language list Change-Id: Id470e88f16b502aeb576a8512f55cd34c56f3500 diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 348365e6b0d7..9c181bf3b717 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -46,7 +46,7 @@ en-ZA = "en,es,fr" eo = "eo" es = "es,an,ca,fr,gl,oc,pt-PT" et = "et" -fr = "de,en,eo,es,fr,it,pt-PT" +fr = "fr,de,en,eo,es,it,pt-PT" gd = "gd" gl = "gl,pt-PT,es" gu = "gu"
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.32-1'
Tag 'cp-21.06.32-1' created by Andras Timar at 2022-08-05 12:19 + cp-21.06.32-1 Changes since cp-21.06.31-1-13: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e211b5bd8f650e41def794c1d21bb8213f3c Author: Andras Timar AuthorDate: Fri Aug 5 14:18:49 2022 +0200 Commit: Andras Timar CommitDate: Fri Aug 5 14:18:55 2022 +0200 Bump version to 21.06.32.1 Change-Id: I15315c7b408b63dfd40360f44e311aa92f4be050 diff --git a/configure.ac b/configure.ac index 7c80eca51db5..627f1dcdfffe 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.31.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.32.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-22.05.5-2'
Tag 'cp-22.05.5-2' created by Andras Timar at 2022-08-04 17:23 + cp-22.05.5-2 Changes since cp-22.05.5-1-17: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 8 commits - configure.ac download.lst external/more_fonts framework/source oox/source postprocess/signing sfx2/source sw/qa sw/sour
configure.ac|2 -
dev/null|binary
download.lst|8 ++---
external/more_fonts/ExternalPackage_reem.mk |1
framework/source/uielement/subtoolbarcontroller.cxx | 28 +++-
oox/source/drawingml/fillproperties.cxx |5 ++-
postprocess/signing/signing.pl |3 +-
sfx2/source/dialog/recfloat.cxx | 15 --
sfx2/source/inc/recfloat.hxx|4 ++
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 10 ---
sw/source/core/txtnode/txtatr2.cxx | 15 ++
vcl/qa/cppunit/pdfexport/data/tdf66597-1.odt|binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 18 ++--
13 files changed, 56 insertions(+), 53 deletions(-)
New commits:
commit 71210659bdfbde77507836eb39ed53c68d102d41
Author: Andras Timar
AuthorDate: Thu Aug 4 19:21:26 2022 +0200
Commit: Andras Timar
CommitDate: Thu Aug 4 19:21:26 2022 +0200
Bump version to 22.05.5.2
Change-Id: I7cab891b04c9e11fc8d8a1635b9a62baf55d9160
diff --git a/configure.ac b/configure.ac
index 4e6a80ace4f6..274ebd124902 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],[22.05.5.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.5.2],[],[],[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 8d43e3bd3ee403600a1edf1c9624eb75ce3f3021
Author: Caolán McNamara
AuthorDate: Thu Aug 4 11:45:47 2022 +0100
Commit: Andras Timar
CommitDate: Thu Aug 4 19:20:35 2022 +0200
tdf#150249 close of popover not detected
the popover listened to here isn't the one that ends up getting actually
used, its contents are transferred to another one, so the
OnPopoverClosed wasn't called, its sufficient to just use the
SubToolbarControl dtor to detect what is wanted here
Change-Id: I3f4a038acfc183b863457919bf89d600517ddc01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137732
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx
b/framework/source/uielement/subtoolbarcontroller.cxx
index e02e4631bd6b..8731f311b7b0 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -46,7 +46,6 @@ namespace {
class SubToolBarController : public ToolBarBase
{
-DECL_LINK(OnPopoverClose, weld::Popover&, void);
OUString m_aSubTbName;
OUString m_aLastCommand;
css::uno::Reference< css::ui::XUIElement > m_xUIElement;
@@ -56,6 +55,8 @@ public:
const css::uno::Sequence< css::uno::Any >&
rxArgs );
virtual ~SubToolBarController() override;
+void PopoverDestroyed();
+
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rxArgs ) override;
@@ -209,22 +210,24 @@ namespace {
class SubToolbarControl final : public WeldToolbarPopup
{
public:
-explicit SubToolbarControl(css::uno::Reference< css::frame::XFrame >
xFrame,
- weld::Widget* pParent);
+explicit SubToolbarControl(SubToolBarController& rController,
weld::Widget* pParent);
+virtual ~SubToolbarControl() override;
virtual void GrabFocus() override;
weld::Container* GetContainer() { return m_xTargetContainer.get(); }
private:
+SubToolBarController& m_rController;
std::unique_ptr m_xTargetContainer;
};
}
-SubToolbarControl::SubToolbarControl(css::uno::Reference< css::frame::XFrame >
xFrame,
+SubToolbarControl::SubToolbarControl(SubToolBarController& rController,
weld::Widget* pParent)
-: WeldToolbarPopup(xFrame, pParent, "svt/ui/subtoolbar.ui", "subtoolbar")
-, m_xTargetContainer(m_xBuilder->weld_container("container"))
+: WeldToolbarPopup(rController.getFrameInterface(), pParent,
"svt/ui/subtoolbar.ui", "subtoolbar")
+, m_rController(rController)
+, m_xTargetContainer(m_xBuilder->weld_container("container"))
{
}
@@ -233,11 +236,16 @@ void SubToolbarControl::GrabFocus()
// TODO
}
+SubToolbarControl::~SubToolbarControl()
+{
+m_rController.PopoverDestroyed();
+}
+
std::unique_ptr SubToolBarController::weldPopupWindow()
{
SolarMut
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.5-1'
Tag 'cp-22.05.5-1' created by Andras Timar at 2022-08-01 20:16 + cp-22.05.5-1 Changes since cp-22.05.4-1-76: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - external/epm
external/epm/UnpackedTarball_epm.mk |1 +
external/epm/ppc64el.patch.0| 11 +++
2 files changed, 12 insertions(+)
New commits:
commit 0e1ada088d97fbf3887404d016ccfc58e5c9f523
Author: Andras Timar
AuthorDate: Mon Aug 1 15:03:21 2022 +0200
Commit: Andras Timar
CommitDate: Mon Aug 1 15:04:32 2022 +0200
Fix 'Architecture' string on ppc64le platform, Debian uses 'ppc64el'
Change-Id: Idb678ac2669914575d3ddb813d35212df26e3d17
diff --git a/external/epm/UnpackedTarball_epm.mk
b/external/epm/UnpackedTarball_epm.mk
index c064a5bacc1e..91d9fbd2b29a 100644
--- a/external/epm/UnpackedTarball_epm.mk
+++ b/external/epm/UnpackedTarball_epm.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm))
$(eval $(call gb_UnpackedTarball_add_patches,epm,\
external/epm/epm-3.7.patch \
external/epm/asan.patch.0 \
+ external/epm/ppc64el.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/epm/ppc64el.patch.0 b/external/epm/ppc64el.patch.0
new file mode 100644
index ..2b9416e8d215
--- /dev/null
+++ b/external/epm/ppc64el.patch.0
@@ -0,0 +1,11 @@
+--- deb.c.orig 2022-08-01 14:50:38.593375838 +0200
deb.c 2022-08-01 14:58:08.0 +0200
+@@ -163,6 +163,8 @@
+ #endif
+ else if (!strcmp(platform->machine, "ppc"))
+ fputs("Architecture: powerpc\n", fp);
++ else if (!strcmp(platform->machine, "ppc64le"))
++fputs("Architecture: ppc64el\n", fp);
+ else
+ fprintf(fp, "Architecture: %s\n", platform->machine);
+
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.2.8.2.M9'
Tag 'mimo-6.2.8.2.M9' created by Andras Timar at 2022-07-26 16:55 + mimo-6.2.8.2.M9 Changes since mimo-6.2.8.2.M8-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - 5 commits - configure.ac include/sfx2 officecfg/registry sfx2/source svl/source uui/source xmlsecurity/source
configure.ac |2
include/sfx2/strings.hrc |2
include/sfx2/viewfrm.hxx |1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 16 +
sfx2/source/view/viewfrm.cxx | 40 ++
svl/source/passwordcontainer/passwordcontainer.cxx | 176 +
svl/source/passwordcontainer/passwordcontainer.hxx | 69 -
uui/source/iahndl-authentication.cxx |5
xmlsecurity/source/component/documentdigitalsignatures.cxx | 35 +-
9 files changed, 274 insertions(+), 72 deletions(-)
New commits:
commit 86c57d3e6826169d5be53472fa21590fc8364748
Author: Andras Timar
AuthorDate: Tue Jul 26 15:19:06 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jul 26 15:40:02 2022 +0200
Bump version to 6.2.8.2.M9
Change-Id: I87168a2e9be351774c53bb1ba49dbcc3bd6687fb
diff --git a/configure.ac b/configure.ac
index 73e4cbfc2b7f..44144ae01383 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.M8],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M9],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit feeeff8b228c34680373f2e3fe5b9b6cd7786731
Author: Caolán McNamara
AuthorDate: Wed Mar 23 13:03:30 2022 +
Commit: Andras Timar
CommitDate: Tue Jul 26 15:40:02 2022 +0200
CVE-2022-2630[6|7] add infobar to prompt to refresh to replace old format
Change-Id: Id99cbf2b50a4ebf289dae6fc67e22e20afcda35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131976
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307
Reviewed-by: Sophie Gautier
Reviewed-by: Christian Lohmaier
(cherry picked from commit c5d01b11db3c83cb4a89d3b388d78e20dd3990b5)
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index a77dbc86d77d..c196bcd19989 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -266,6 +266,8 @@
#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be
validated and the document is only partially signed.")
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
+#define STR_REFRESH_MASTER_PASSWORD
NC_("STR_REFRESH_MASTER_PASSWORD", "The master password is stored in an
outdated format, you should refresh it")
+#define STR_REFRESH_PASSWORDNC_("STR_REFRESH_PASSWORD",
"Refresh Password")
#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close
Pane")
#define STR_SFX_DOCKNC_("STR_SFX_DOCK", "Dock")
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 6d9ef75b8ffe..b78a0c92cd3a 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -80,6 +80,7 @@ protected:
DECL_LINK(GetDonateHandler, Button*, void);
DECL_LINK(SwitchReadOnlyHandler, Button*, void);
DECL_LINK(SignDocumentHandler, Button*, void);
+DECL_DLLPRIVATE_LINK(RefreshMasterPasswordHdl, Button*, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
virtual ~SfxViewFrame() override;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 814a45f42b6f..e4666de79a27 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1274,6 +1275,24 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
batch->commit();
}
+if (officecfg::Office::Common::Passwords::HasMaster::get() &&
+
officecfg::Office::Common::Passwords::StorageVersion::get() == 0)
+{
+// master password stored in deprecated format
+VclPtr pOldMasterPasswordInfoBar =
+AppendInfoBar("oldmasterpassword",
+ SfxResId(STR_REFRESH_MASTER_PASSWORD),
InfoBarType::Danger);
+if (pOldMasterPasswordInfoBar)
+{
+VclPtrI
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.4.7.2.M6'
Tag 'mimo-6.4.7.2.M6' created by Andras Timar at 2022-07-26 13:00 + mimo-6.4.7.2.M6 Changes since mimo-6.4.7.2.M5-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - 5 commits - configure.ac include/sfx2 officecfg/registry sfx2/source svl/source uui/source xmlsecurity/source
configure.ac |2
include/sfx2/strings.hrc |2
include/sfx2/viewfrm.hxx |1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 16 +
sfx2/source/view/viewfrm.cxx | 40 +++
svl/source/passwordcontainer/passwordcontainer.cxx | 164 +
svl/source/passwordcontainer/passwordcontainer.hxx | 69 -
uui/source/iahndl-authentication.cxx |5
xmlsecurity/source/component/documentdigitalsignatures.cxx | 23 +
9 files changed, 267 insertions(+), 55 deletions(-)
New commits:
commit a49d125f7a655e9d6caad4fd3018a79d15a77b14
Author: Andras Timar
AuthorDate: Tue Jul 26 14:58:56 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jul 26 14:58:56 2022 +0200
Bump version to 6.4.7.2.M6
Change-Id: Ifab8a66733ac79e4eff2784862f46280c06728e9
diff --git a/configure.ac b/configure.ac
index 8b253b07b235..ddc8cf8f2bc0 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.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.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
commit e129fc57b0a64a38f5b018eb6a6863a1f4afbeb8
Author: Caolán McNamara
AuthorDate: Wed Mar 23 13:03:30 2022 +
Commit: Andras Timar
CommitDate: Tue Jul 26 14:34:38 2022 +0200
CVE-2022-2630[6|7] add infobar to prompt to refresh to replace old format
Change-Id: Id99cbf2b50a4ebf289dae6fc67e22e20afcda35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131976
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307
Reviewed-by: Sophie Gautier
Reviewed-by: Christian Lohmaier
(cherry picked from commit c5d01b11db3c83cb4a89d3b388d78e20dd3990b5)
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 1f21f0a0f186..1db36e733c0c 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -297,6 +297,8 @@
#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be
validated and the document is only partially signed.")
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
+#define STR_REFRESH_MASTER_PASSWORD
NC_("STR_REFRESH_MASTER_PASSWORD", "The master password is stored in an
outdated format, you should refresh it")
+#define STR_REFRESH_PASSWORDNC_("STR_REFRESH_PASSWORD",
"Refresh Password")
#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close
Pane")
#define STR_SFX_DOCKNC_("STR_SFX_DOCK", "Dock")
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index fe336ba5f091..cc6a7dae7047 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -61,6 +61,7 @@ protected:
DECL_LINK(WhatsNewHandler, Button*, void);
DECL_LINK(SwitchReadOnlyHandler, Button*, void);
DECL_LINK(SignDocumentHandler, Button*, void);
+DECL_DLLPRIVATE_LINK(RefreshMasterPasswordHdl, Button*, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
virtual ~SfxViewFrame() override;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5a64599e5894..93e60371d4a1 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1390,6 +1391,24 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
batch->commit();
}
+if (officecfg::Office::Common::Passwords::HasMaster::get() &&
+
officecfg::Office::Common::Passwords::StorageVersion::get() == 0)
+{
+// master password stored in deprecated format
+VclPtr pOldMasterPasswordInfoBar =
+AppendInfoBar("oldmasterpassword", "",
+ SfxResId(STR_RE
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.1.8.1.M2'
Tag 'mimo-7.1.8.1.M2' created by Andras Timar at 2022-07-26 12:29 + mimo-7.1.8.1.M2 Changes since mimo-7.1.8.1.M1-1: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3454f6dc43df41c4012aa75921960da0ab486c32 Author: Andras Timar AuthorDate: Tue Jul 26 14:28:14 2022 +0200 Commit: Andras Timar CommitDate: Tue Jul 26 14:28:14 2022 +0200 Bump version to 7.1.8.1.M2 Change-Id: If2999d13bc9052cbc3002e287d3d9b57ffc31843 diff --git a/configure.ac b/configure.ac index dd2a9e9eb0e4..6358381d7a72 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.1.8.1.M1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.1.8.1.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-7.0.7.0.M10'
Tag 'mimo-7.0.7.0.M10' created by Andras Timar at 2022-07-26 12:25 + mimo-7.0.7.0.M10 Changes since mimo-7.0.7.0.M9-6: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - 5 commits - configure.ac include/sfx2 officecfg/registry sfx2/source svl/source uui/source xmlsecurity/source
configure.ac |2
include/sfx2/strings.hrc |2
include/sfx2/viewfrm.hxx |1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 16 +
sfx2/source/view/viewfrm.cxx | 40 +++
svl/source/passwordcontainer/passwordcontainer.cxx | 164 +
svl/source/passwordcontainer/passwordcontainer.hxx | 69 -
uui/source/iahndl-authentication.cxx |5
xmlsecurity/source/component/documentdigitalsignatures.cxx | 23 +
9 files changed, 267 insertions(+), 55 deletions(-)
New commits:
commit 701e0da3d137406219eb5c2919e8011079a7539a
Author: Andras Timar
AuthorDate: Tue Jul 26 14:24:28 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jul 26 14:24:28 2022 +0200
Bump version to 7.0.7.0.M10
Change-Id: I31e973c428ee929a99d128100183e6bf84ba2909
diff --git a/configure.ac b/configure.ac
index f711e08b9676..dd299f510cef 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.M9],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M10],[],[],[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
commit 2f7bf38ab4a76954e42acfa1ba04b1cebf962e28
Author: Caolán McNamara
AuthorDate: Wed Mar 23 13:03:30 2022 +
Commit: Andras Timar
CommitDate: Tue Jul 26 13:33:29 2022 +0200
CVE-2022-2630[6|7] add infobar to prompt to refresh to replace old format
Change-Id: Id99cbf2b50a4ebf289dae6fc67e22e20afcda35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131976
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307
Reviewed-by: Sophie Gautier
Reviewed-by: Christian Lohmaier
(cherry picked from commit c5d01b11db3c83cb4a89d3b388d78e20dd3990b5)
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d7c6635b793e..c391ed72f14a 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -290,6 +290,8 @@
#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be
validated and the document is only partially signed.")
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
+#define STR_REFRESH_MASTER_PASSWORD
NC_("STR_REFRESH_MASTER_PASSWORD", "The master password is stored in an
outdated format, you should refresh it")
+#define STR_REFRESH_PASSWORDNC_("STR_REFRESH_PASSWORD",
"Refresh Password")
#define STR_CLOSE_PANE NC_("STR_CLOSE_PANE", "Close
Pane")
#define STR_SFX_DOCKNC_("STR_SFX_DOCK", "Dock")
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 0a40a4179afc..6b56166a0966 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -64,6 +64,7 @@ protected:
DECL_LINK(WhatsNewHandler, Button*, void);
DECL_LINK(SwitchReadOnlyHandler, Button*, void);
DECL_LINK(SignDocumentHandler, Button*, void);
+DECL_DLLPRIVATE_LINK(RefreshMasterPasswordHdl, Button*, void);
SAL_DLLPRIVATE void KillDispatcher_Impl();
virtual ~SfxViewFrame() override;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 39b1c911778d..3f2b21b0d72d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1378,6 +1379,24 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
batch->commit();
}
+if (officecfg::Office::Common::Passwords::HasMaster::get() &&
+
officecfg::Office::Common::Passwords::StorageVersion::get() == 0)
+{
+// master password stored in deprecated format
+VclPtr pOldMasterPasswordInfoBar =
+AppendInfoBar("oldmasterpassword", "",
+ SfxResId(S
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.2.7.2.M4'
Tag 'mimo-7.2.7.2.M4' created by Andras Timar at 2022-07-24 14:28 + mimo-7.2.7.2.M4 Changes since mimo-7.2.7.2.M3-2: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86074c84ebbf8de43ce4560ff83111d3892fbb86 Author: Andras Timar AuthorDate: Sun Jul 24 16:27:31 2022 +0200 Commit: Andras Timar CommitDate: Sun Jul 24 16:27:31 2022 +0200 Bump version to 7.2.7.2.M4 Change-Id: I3e12a450ba3343b9a31b50fc7bd329c5db01b3fd diff --git a/configure.ac b/configure.ac index e48839f2658a..916318f9c232 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.2.7.2.M3],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.2.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.2.7.2.M3'
Tag 'mimo-7.2.7.2.M3' created by Andras Timar at 2022-07-12 20:52 + mimo-7.2.7.2.M3 Changes since mimo-7.2.6.2.M1-56: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 2 commits - configure.ac sc/source
configure.ac|2 +- sc/source/ui/view/spellcheckcontext.cxx |4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit bbc4139793af90ff37b117874863c2d47793df4c Author: Andras Timar AuthorDate: Tue Jul 12 22:50:10 2022 +0200 Commit: Andras Timar CommitDate: Tue Jul 12 22:50:10 2022 +0200 Bump version to 7.2.7.2.M3 Change-Id: I8fd332a138311e4530d08dcd220610f7eab26a98 diff --git a/configure.ac b/configure.ac index d7fac789e347..e48839f2658a 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.2.7.2.M2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.2.7.2.M3],[],[],[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 commit d9a052ec8cf7e31bdc38c3f8c1c3cf98dd6d6e1a Author: Szymon Kłos AuthorDate: Wed Mar 23 13:02:29 2022 +0100 Commit: Andras Timar CommitDate: Tue Jul 12 22:47:37 2022 +0200 Use correct language for spellchecking in calc Fixes the problem of not applied spellchecking language change in calc. 1. Open spreadsheet with German text but with English UI language 2. Change spellchecking language to German result: no difference expected: spellchecking should be performed and mark words correctly Visible in both LOK and desktop. Regression introduced in: commit bdd149b1ff3d43b94cadc0d43365100c287c7639 Author: Dennis Francis Date: Sun Oct 4 12:47:46 2020 +0530 Improve spell checking performance and impl. in several ways: Change-Id: I679b1181af118e9894a3f5240523d4945af8ccf5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131870 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/sc/source/ui/view/spellcheckcontext.cxx b/sc/source/ui/view/spellcheckcontext.cxx index 224af6859f59..a1358dcd647a 100644 --- a/sc/source/ui/view/spellcheckcontext.cxx +++ b/sc/source/ui/view/spellcheckcontext.cxx @@ -327,12 +327,14 @@ void SpellCheckContext::ensureResults(SCCOL nCol, SCROW nRow) } // Cache miss, the cell needs spell-check.. -mpEngine->SetDefaultItem(SvxLanguageItem(eCellLang, EE_CHAR_LANGUAGE)); if (eType == CELLTYPE_STRING) mpEngine->SetText(aCell.mpString->getString()); else mpEngine->SetText(*aCell.mpEditText); +// it has to happen after we set text +mpEngine->SetDefaultItem(SvxLanguageItem(eCellLang, EE_CHAR_LANGUAGE)); + mpStatus->mbModified = false; mpEngine->CompleteOnlineSpelling(); std::unique_ptr pRanges;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sdext/source
sdext/source/pdfimport/test/tests.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 0d3bc933855232bd9fdb41c98f1fb414c4d80a86
Author: Andras Timar
AuthorDate: Mon Jul 11 23:38:00 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jul 12 09:08:25 2022 +0200
sdext: these tests won't run without poppler
Change-Id: I61deb7d5271bf87ac1bb3aad54c430ace8fd3f9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136966
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index c8c3b9e28a8f..cbca5c30122d 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -585,6 +585,7 @@ namespace
void testTdf78427_FontFeatures()
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -711,10 +712,12 @@ namespace
assertXPath(pXmlDoc, xpath, "font-weight", "normal");
assertXPathNoAttribute(pXmlDoc, xpath, "font-style");
assertXPath(pXmlDoc, xpath, "text-outline", "true");
+#endif
}
void testTdf78427_FontWeight_MyraidProSemibold() // Related to
attachment 155937.
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -744,10 +747,12 @@ namespace
"\"]/style:text-properties";
// the font-weight and font-style should be 300 (Light)
assertXPath(pXmlDoc, xpath, "font-weight", "300");
+#endif
}
void testTdf143959_nameFromFontFile()
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -777,6 +782,7 @@ namespace
getXPath(pXmlDoc, xpath,
"font-family").replaceAll(u" ", u""));
CPPUNIT_ASSERT_EQUAL(OUString("bold"),
getXPath(pXmlDoc, xpath, "font-weight"));
+#endif
}
CPPUNIT_TEST_SUITE(PDFITest);
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/test/tests.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5e1ab6a203843f98966956e706c888fd1f89e284
Author: Andras Timar
AuthorDate: Mon Jul 11 23:38:00 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jul 12 09:08:12 2022 +0200
sdext: these tests won't run without poppler
Change-Id: I61deb7d5271bf87ac1bb3aad54c430ace8fd3f9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136975
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 77d98999d0d3..193ec2227620 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -586,6 +586,7 @@ namespace
void testTdf78427_FontFeatures()
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -712,10 +713,12 @@ namespace
assertXPath(pXmlDoc, xpath, "font-weight", "normal");
assertXPathNoAttribute(pXmlDoc, xpath, "font-style");
assertXPath(pXmlDoc, xpath, "text-outline", "true");
+#endif
}
void testTdf78427_FontWeight_MyraidProSemibold() // Related to
attachment 155937.
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -745,10 +748,12 @@ namespace
"\"]/style:text-properties";
// the font-weight and font-style should be 300 (Light)
assertXPath(pXmlDoc, xpath, "font-weight", "300");
+#endif
}
void testTdf143959_nameFromFontFile()
{
+#if HAVE_FEATURE_POPPLER
rtl::Reference xAdaptor(new
pdfi::PDFIRawAdaptor(OUString(), getComponentContext()));
xAdaptor->setTreeVisitorFactory(createDrawTreeVisitorFactory());
@@ -778,6 +783,7 @@ namespace
getXPath(pXmlDoc, xpath,
"font-family").replaceAll(u" ", u""));
CPPUNIT_ASSERT_EQUAL(OUString("bold"),
getXPath(pXmlDoc, xpath, "font-weight"));
+#endif
}
CPPUNIT_TEST_SUITE(PDFITest);
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.4-1'
Tag 'cp-22.05.4-1' created by Andras Timar at 2022-07-11 17:08 + cp-22.05.4-1 Changes since cp-22.05.3-1-84: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-22.05.4-1'
Tag 'cp-22.05.4-1' created by Andras Timar at 2022-07-11 17:08 + cp-22.05.4-1 Changes since co-22.05-branch-point-8: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe4468db8de113d2844a8733dd094506af778b51 Author: Andras Timar AuthorDate: Mon Jul 11 19:06:49 2022 +0200 Commit: Andras Timar CommitDate: Mon Jul 11 19:06:49 2022 +0200 Bump version to 22.05.4.1 Change-Id: I613ba29dfcdcf977677ede8c74e78272bcb79ab7 diff --git a/configure.ac b/configure.ac index acfd70ed4859..f2284ec730ce 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],[22.05.3.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.4.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-22.05.3-1'
Tag 'cp-22.05.3-1' created by Andras Timar at 2022-06-27 19:04 + cp-22.05.3-1 Changes since co-22.05.2-1-167: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-22.05.3-1'
Tag 'cp-22.05.3-1' created by Andras Timar at 2022-06-27 19:04 + cp-22.05.3-1 Changes since co-22.05-branch-point-8: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 6 commits - configure.ac editeng/source external/libnumbertext include/editeng sc/qa sc/source svtools/source svx/qa svx/source wri
configure.ac|2 editeng/source/items/frmitems.cxx | 12 - external/libnumbertext/EmptyString.patch1 | 13 + external/libnumbertext/UnpackedTarball_libnumbertext.mk |1 include/editeng/brushitem.hxx |5 ++ sc/qa/unit/data/xlsx/tdf148820.xlsx |binary sc/qa/unit/subsequent_export_test2.cxx | 32 + sc/source/filter/inc/stylesbuffer.hxx |2 sc/source/filter/oox/autofilterbuffer.cxx |2 sc/source/filter/oox/stylesbuffer.cxx | 17 +-- svtools/source/control/ctrlbox.cxx |3 - svx/qa/unit/table.cxx | 38 svx/source/table/tablecontroller.cxx|7 ++ writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 14 files changed, 127 insertions(+), 9 deletions(-) New commits: commit 10ffe3bf44effec88c0510222b3a66b513b70139 Author: Andras Timar AuthorDate: Mon Jun 27 19:36:13 2022 +0200 Commit: Andras Timar CommitDate: Mon Jun 27 19:36:13 2022 +0200 Bump version to 22.05.3.1 Change-Id: I9f5884ad4a2cacd5f9266616235803c82f5b1920 diff --git a/configure.ac b/configure.ac index 93319018fa4d..f3375595e235 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],[22.05.2.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.3.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 commit b351612821e782d26713c4ab53382bf628bf1bd1 Author: Xisco Fauli AuthorDate: Tue Jun 21 16:58:24 2022 +0200 Commit: Andras Timar CommitDate: Mon Jun 27 19:26:47 2022 +0200 svtools: avoid divide by zero in calcCustomItemSize See https://crashreport.libreoffice.org/stats/signature/%60anonymous%20namespace'::calcCustomItemSize Change-Id: I5f1b19b7679c73cf29952629469e5151395b2b12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136254 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit ec03eef9b431048ea21a733c39c79b792b0f653c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136393 Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136451 diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 0b1c67e31980..393eea9e80fd 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -343,7 +343,8 @@ namespace gUserItemSz.setHeight(gUserItemSz.Height() / 10); size_t nMaxDeviceHeight = SAL_MAX_INT16 / 2; // see limitXCreatePixmap -gPreviewsPerDevice = nMaxDeviceHeight / gUserItemSz.Height(); +assert(gUserItemSz.Height() != 0); +gPreviewsPerDevice = gUserItemSz.Height() == 0 ? 16 : nMaxDeviceHeight / gUserItemSz.Height(); } } commit 8db2090059c79599c71493bc19536558c85d2975 Author: Miklos Vajna AuthorDate: Fri Jun 24 10:46:40 2022 +0200 Commit: Andras Timar CommitDate: Mon Jun 27 19:26:47 2022 +0200 tdf#148522 svx: fix undo of cell border changes text alignment in other cells The Impress table properties dialog has multiple purposes: normally it only affects the properties of the currently active cell, but shadow is applied on the whole shape. Regression from commit fdeb04f7c59cf8032fe17072ed779e70505cc6ab (tdf#129961 svx: finish UI for table shadow as direct format, 2020-12-15), we started to apply properties to the current cell, and then to the whole shape as well, unconditionally. This affects undo/redo, as there is a separate undo manager while the text edit of a table cell is active and when the text edit is ended. Fix the problem by only applying properties on the shape when there we actually have some properties: this way the text edit is typically not ended, bringing back the old undo/redo behavior. Note that we still need to end the text edit if the user explicitly sets some shadow properties, that part is unchanged with this commit. Change-Id: I78e28bd326a2c12c3775b33957adca4cd95ac582 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136357 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit 3edfbc19950610bb2061d29cb58b3811b1a0b1a5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136460 Reviewed-by: Xisco
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7-4-branch-point'
Tag 'libreoffice-7-4-branch-point' created by Christian Lohmaier at 2022-06-10 13:09 + Tag libreoffice-7-4-branch-point -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmKjQpgACgkQ9DSh76/u rqNtRxAAxXND1TU2yxcfMo39wOUP4E0JV+Q3ckIxhJ10OMKDfFsVPZhRLd0usY/J m3iHHCAx55+E80+tvL6wcS4Q8cVsY+3gwDSvn/GQaV9NdYnsgxiAOjufvVh1gfti 8Nyt56yHYEZXQEgpvk6fWSRaD1thU1vdaWgQ5vsYpqgKqs30Ws/oCNZF6rjAeZDj J9loTx8YkOy2WCNT27DLXDU7LkWrKb4FJAuhrbMy6AP+G9ehPyphymc0k66sen9l YQDGRRDGsIUFYRZrcu3mdnMMN8NugfK5URZjqgREiL6FFg2Sf1qWyIM1hRU5amhB lOZV0LvQ560BeDnO/ZUITiEMpnyyrSdZwjbnjreZtS1KyD+CaidLArJDpKrGnmWA pD/z4v8py2MBzyzaky2fmO1duSLrXQEqy9gMi6GcvlcDnkq7/Yz8bbkPZ2noZ/FU FBLa0UqDZKaE5dqj7uzJJOZlD0IUqD06AeJ2o/pZ3F0MDwlo4sLiWLfCFL91otCq 1dww0eaGFO4zTyVAVVhEtj4RpkHhuX5gy1oSRuPypel1GrsI/JUwiRqb627uUJaB lnUoVYg/p3wrh3vdQORWN4iAfzrE+Jx0CkVnMREgF7zwG9mAoBvSj9Tw2qpEtnuL gB1AoZIEi6KLTUJbIQ90ZVBadRdrgkpmWq/5djjAZJX/8SVd0V0= =P0Je -END PGP SIGNATURE- Changes since libreoffice-7-3-branch-point-13: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.31-1'
Tag 'cp-21.06.31-1' created by Andras Timar at 2022-06-10 09:12 + cp-21.06.31-1 Changes since cp-21.06.30-1-13: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.31-1'
Tag 'cp-21.06.31-1' created by Andras Timar at 2022-06-10 09:12 + cp-21.06.31-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.31-1'
Tag 'cp-21.06.31-1' created by Andras Timar at 2022-06-10 09:12 + cp-21.06.31-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 36b45cc585fe914751848a1b8febf3ba0a41761b Author: Andras Timar AuthorDate: Fri Jun 10 11:11:52 2022 +0200 Commit: Andras Timar CommitDate: Fri Jun 10 11:11:52 2022 +0200 Bump version to 21.06.31.1 Change-Id: Ifde24eb65acf6536f8da0d67e4bce81592fd860b diff --git a/configure.ac b/configure.ac index d23731af2f18..7c80eca51db5 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.30.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.31.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/mimo/mimo-7-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7799ce4f27985e8ee0337a5a1c456c2134bca76 Author: Andras Timar AuthorDate: Thu Jun 9 14:52:33 2022 +0200 Commit: Andras Timar CommitDate: Thu Jun 9 14:52:33 2022 +0200 Bump version to 7.2.7.2.M2 Change-Id: I36ccea359fb05d96a9983fe66e45e3c49b1bc22d diff --git a/configure.ac b/configure.ac index fc6a4c1e61bd..d7fac789e347 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.2.7.2.M1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.2.7.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: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8494815ba566c94b59c3690fe138f70d8b6e169a Author: Andras Timar AuthorDate: Thu Jun 9 11:42:31 2022 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 9 11:42:31 2022 +0200 Update git submodules * Update dictionaries from branch 'master' to 68b272ec160ded8157c13117e350fc4dfc3037fb - Updated Danish spellchecker Change-Id: I7c8ff2e7fac358706a580f2b24842ade0a1baa55 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/135531 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/dictionaries b/dictionaries index 15c340d66842..68b272ec160d 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 15c340d66842e3f99729e20686ffec28d36c2784 +Subproject commit 68b272ec160ded8157c13117e350fc4dfc3037fb
[Libreoffice-commits] dictionaries.git: da_DK/da_DK.aff da_DK/da_DK.dic da_DK/description.xml da_DK/README_da_DK.txt
da_DK/README_da_DK.txt |2 da_DK/da_DK.aff| 886 da_DK/da_DK.dic|147678 ++--- da_DK/description.xml |2 4 files changed, 81724 insertions(+), 66844 deletions(-) New commits: commit 68b272ec160ded8157c13117e350fc4dfc3037fb Author: Andras Timar AuthorDate: Thu Jun 9 11:39:45 2022 +0200 Commit: Andras Timar CommitDate: Thu Jun 9 11:42:30 2022 +0200 Updated Danish spellchecker Change-Id: I7c8ff2e7fac358706a580f2b24842ade0a1baa55 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/135531 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/da_DK/README_da_DK.txt b/da_DK/README_da_DK.txt index 526e2ed..6efd5b2 100644 --- a/da_DK/README_da_DK.txt +++ b/da_DK/README_da_DK.txt @@ -1,5 +1,5 @@ Stavekontrolden - Danish dictionary files for Hunspell and thesaurus files for MyThes -Version 2.6.035 - 15-01-2021 +Version 2.7.001 - 03-06-2022 da_DK.dic, da_DK.aff, th_da_DK.dat, th_da_DK.idx: © 2020 Foreningen for frit tilgængelige sprogværktøjer - http://www.stavekontrolden.dk These files are published under the following open source licenses: diff --git a/da_DK/da_DK.aff b/da_DK/da_DK.aff index 25a6ee5..ac67fc0 100644 --- a/da_DK/da_DK.aff +++ b/da_DK/da_DK.aff @@ -1,7 +1,8 @@ -#Stavekontrolden version 2.6.035 +#A. Intro ## +#Stavekontrolden version 2.7.001 #Denne fil er en del af Stavekontrolden - et softwareprodukt, der gør det muligt at stavekontrollere på dansk. -#Copyright (C) 2021 Foreningen for frit tilgængelige sprogværktøjer +#Copyright (C) 2022 Foreningen for frit tilgængelige sprogværktøjer #Website: http://www.stavekontrolden.dk #E-mail: i...@stavekontrolden.dk @@ -9,11 +10,18 @@ #GPL 2.0/LGPL 2.1/MPL 1.1 tri-license -#This library is free software; you can redistribute it and/or modify it under the terms of one or more of the following, the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License, GNU General Public License as published by the Free Software Foundation; version 2.0 of the License, and Mozilla Public License as published by the The Mozilla Foundation; version 1.1 of the License. +#This library is free software; you can redistribute it and/or modify it under the terms of one or more of the following: +#the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License, +#the GNU General Public License as published by the Free Software Foundation; version 2.0 of the License, +#and the Mozilla Public License as published by the The Mozilla Foundation; version 1.1 of the License. #This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, GNU General Public License, and Mozilla Public License for more details. -#You should have received a copy of the GNU Lesser General Public License and GNU General Public along with this library; if not, write to the: +#You should have received a copy of the GNU Lesser General Public License along with this library; if not, visit https://www.gnu.org/licenses/licenses.html#LGPL + +#You should have received a copy of the GNU General Public License along with this library; if not, visit https://www.gnu.org/licenses/licenses.html#GPL + +#Alternatively, write to the: #Free Software Foundation, Inc. #51 Franklin Street, Fifth Floor @@ -22,35 +30,61 @@ #You should have received a copy of the Mozilla Public License along with this library; if not, visit http://www.mozilla.org/MPL/MPL-1.1.html -#Til sammensætninger: Bindestreg er et ord i sammensætninger -COMPOUNDMIN 1 -COMPOUNDWORDMAX 10 +#Tegnsæt UTF-8 +SET UTF-8 + + +#B. Ord-sammensætninger # + +#Bindestreg og punktum kan indgå i ord (ifølge hunspell-manual kun vigtigt for kommandolinjetjek) WORDCHARS -. -#Undlad at foreslå opdeling af ord - opdeling vil forårsage flere fejl end det vil afhjælpe +#Ord ned til 2 bogstaver kan indgå i sammensætning. Default er mindst 3 bogstaver. +COMPOUNDMIN 2 + +#Op til 10 ord i sammensætninger. +COMPOUNDWORDMAX 10 + +#Tjek ordsammensætninger mod REP-listen over erstatningsforslag. Hvis ordsammensætningen med en +#erstatning kan blive til et ord, som findes i ordbogen, så er det sandsynligvis en stavefejl. (Kun tjek +#for nye sammensætninger - hvis et et sammensat ord er lagt ind i ordbogen, så er det et gyldigt ord). +CHECKCOMPOUNDREP + + +#C. Ord-forslag, definitioner ## + +#Undlad at foreslå opdeling af ord - opdeling vil forårsage flere fejl end det vil afhjælpe. Ord specifikt defineret +#med mellemrum (i ordlisten eller i erstatningslisten længere nede) kan stadig forslås som opdeling. NOSPLITSUGS -#Max. antal sammensatte ord i forslagslisten (0 switches off - n) +#Max. antal sammensatte ord i
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-22.05.2-1'
Tag 'co-22.05.2-1' created by Andras Timar at 2022-06-01 10:57 + co-22.05.2-1 Changes since co-22.05-branch-point-8: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - configure.ac distro-configs/CPWin32.conf distro-configs/CPWin64.conf
configure.ac|2 +- distro-configs/CPWin32.conf |1 + distro-configs/CPWin64.conf |1 + 3 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 2f933c8c2e374433aa322250310830e7ca1e3cdf Author: Andras Timar AuthorDate: Wed Jun 1 12:28:47 2022 +0200 Commit: Andras Timar CommitDate: Wed Jun 1 12:28:47 2022 +0200 Bump version to 22.05.2.1 Change-Id: Ifd37ef6e6c73db9432bf47a7f1f67a2d75250e8e diff --git a/configure.ac b/configure.ac index 187f1e599edc..9a77f638157b 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],[22.05.1.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.2.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 commit cb30676177e69ffc84a479ada9a08c7537ee3138 Author: Andras Timar AuthorDate: Wed Jun 1 12:25:48 2022 +0200 Commit: Andras Timar CommitDate: Wed Jun 1 12:26:12 2022 +0200 [cp] Add privacy policy url Change-Id: Ibbc18fd03b117b25b3d5daf298d4724a37ea0dec diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf index b3b2f6cbc5f7..c9c9312c9013 100644 --- a/distro-configs/CPWin32.conf +++ b/distro-configs/CPWin32.conf @@ -24,3 +24,4 @@ --enable-windows-build-signing --enable-symbols --enable-breakpad +--with-privacy-policy-url=https://www.collaboraoffice.com/privacy-policy/ diff --git a/distro-configs/CPWin64.conf b/distro-configs/CPWin64.conf index 7216b352dc3c..d48c7cdade0f 100644 --- a/distro-configs/CPWin64.conf +++ b/distro-configs/CPWin64.conf @@ -24,3 +24,4 @@ --enable-windows-build-signing --enable-symbols --enable-breakpad +--with-privacy-policy-url=https://www.collaboraoffice.com/privacy-policy/
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/uiconfig
sw/uiconfig/swriter/ui/calendar.ui |3 --- 1 file changed, 3 deletions(-) New commits: commit 726019784580f67ec9e52ea063b839a7c8e389bb Author: Andras Timar AuthorDate: Mon May 30 22:58:11 2022 +0200 Commit: Xisco Fauli CommitDate: Tue May 31 18:20:11 2022 +0200 date picker should rather show the current date instead of February 14, 2019 Change-Id: Ie449873aad40b6f02198a8a44a7eae1aaba1cfae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135148 Tested-by: Jenkins Reviewed-by: Andras Timar (cherry picked from commit 090ed6199ec8ed805d645b62387bc89df01b9564) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135166 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/swriter/ui/calendar.ui b/sw/uiconfig/swriter/ui/calendar.ui index 5c8d3eb43bfd..e5355f723621 100644 --- a/sw/uiconfig/swriter/ui/calendar.ui +++ b/sw/uiconfig/swriter/ui/calendar.ui @@ -15,9 +15,6 @@ True True -2019 -1 -14 False
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-62'
Tag 'cp-6.4-62' created by Andras Timar at 2022-05-31 13:57 + cp-6.4-62 Changes since cp-6.4-61-67: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-62'
Tag 'cp-6.4-62' created by Andras Timar at 2022-05-31 13:57 + cp-6.4-62 Changes since cp-6.4-branch-point-11: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-62'
Tag 'cp-6.4-62' created by Andras Timar at 2022-05-31 13:57 + cp-6.4-62 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' - 64 commits - configure.ac connectivity/source download.lst drawinglayer/source external/curl external/libxslt hwpfilter/source includ
/frame.hxx | 11 sw/source/core/layout/ftnfrm.cxx |3 sw/source/core/layout/layact.cxx |3 sw/source/core/layout/objectformattertxtfrm.cxx | 54 sw/source/core/layout/sectfrm.cxx |3 sw/source/core/layout/tabfrm.cxx | 74 - sw/source/core/layout/wsfrm.cxx |2 sw/source/core/table/swtable.cxx | 15 sw/source/core/text/itratr.cxx|2 sw/source/core/text/itrform2.cxx | 15 sw/source/core/text/itrform2.hxx |2 sw/source/core/text/porfld.cxx| 13 sw/source/core/text/porlay.cxx|4 sw/source/core/text/txtfrm.cxx|8 sw/source/core/undo/unbkmk.cxx|2 sw/source/core/undo/undobj.cxx|2 sw/source/filter/ww8/wrtw8sty.cxx | 28 sw/source/filter/ww8/wrtww8.hxx |4 sw/source/filter/xml/xmltbli.cxx |2 sw/source/ui/misc/bookmark.cxx|2 sw/source/uibase/dochdl/swdtflvr.cxx |4 sw/source/uibase/shells/textsh1.cxx |2 sw/source/uibase/utlui/content.cxx|2 sw/source/uibase/utlui/navipi.cxx |2 uui/source/iahndl-authentication.cxx |5 vcl/source/fontsubset/sft.cxx | 12 vcl/source/fontsubset/ttcr.cxx| 36 vcl/source/helper/strhelper.cxx |3 vcl/source/outdev/textline.cxx|2 writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 96 files changed, 2133 insertions(+), 425 deletions(-) New commits: commit 7d91873bfb354e0956f0eff5ade0770647f26421 Author: Andras Timar AuthorDate: Tue May 31 15:53:19 2022 +0200 Commit: Andras Timar CommitDate: Tue May 31 15:53:19 2022 +0200 Bump version to 6.4-62 Change-Id: Ia5f0559adbc3eee2b9114872b817f0e0cfb3f898 diff --git a/configure.ac b/configure.ac index 1ecad82f17c6..697df181fd5d 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.61],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.62],[],[],[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 678b4fdcc671a7c3a59e0213f4f7fd5f06d00275 Author: Michael Weghorn AuthorDate: Wed Jan 20 12:41:47 2021 +0100 Commit: Andras Timar CommitDate: Tue May 31 15:43:30 2022 +0200 Related tdf#139782 sc: Make sure column exists before accessing it While the first fix (Change-Id I12a780bf52024cef31188651813d3a93cc2b5ddd, "tdf#139782 sc: Don't try to access unallocated column") makes opening the simplified bugdoc I had attached to tdf#139782 work, the original document I was given (which I can't share as is, but from which the simplified bugdoc was created) had more formulas and managed to hit another similar issue related to the fact that columns are now dynamically allocated, and crashed trying to access one that wasn't yet allocated. Fix this place as well by making sure the column exists. Backtrace: "#0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50\n" "#1 0x77aa7537 in __GI_abort () at abort.c:79\n" "#2 0x7794beb1 in std::__throw_bad_exception() () at /lib/x86_64-linux-gnu/libstdc++.so.6\n" "#3 0x7fffa0b161dc in std::__debug::vector >, std::allocator > > >::operator[](unsigned long) (this=0x58827250, __n=84) at /usr/include/c++/10/debug/vector:427\n" "#4 0x7fffa0c23935 in ScColContainer::operator[](unsigned long) (this=0x58827250, nIndex=84) at .../libreoffice/sc/inc/colcontainer.hxx:44\n" "#5 0x7fffa0c76275 in ScQueryCellIterator::InitPos() (this=0x7fff8040) at .../libreoffice/sc/source/core/data/d
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/uiconfig
sw/uiconfig/swriter/ui/calendar.ui |3 --- 1 file changed, 3 deletions(-) New commits: commit 7aeff80c565837cbcd46c649cefe11462cb6948e Author: Andras Timar AuthorDate: Mon May 30 22:58:11 2022 +0200 Commit: Andras Timar CommitDate: Tue May 31 15:47:17 2022 +0200 date picker should rather show the current date instead of February 14, 2019 Change-Id: Ie449873aad40b6f02198a8a44a7eae1aaba1cfae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135148 Tested-by: Jenkins Reviewed-by: Andras Timar (cherry picked from commit 090ed6199ec8ed805d645b62387bc89df01b9564) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135157 Tested-by: Jenkins CollaboraOffice diff --git a/sw/uiconfig/swriter/ui/calendar.ui b/sw/uiconfig/swriter/ui/calendar.ui index 5c8d3eb43bfd..e5355f723621 100644 --- a/sw/uiconfig/swriter/ui/calendar.ui +++ b/sw/uiconfig/swriter/ui/calendar.ui @@ -15,9 +15,6 @@ True True -2019 -1 -14 False
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - external/python3
external/python3/ExternalPackage_python3.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 7cbdc774c90c0160f80e16c6a79abc58ca4b3dee Author: Andras Timar AuthorDate: Tue May 31 07:37:20 2022 + Commit: Andras Timar CommitDate: Tue May 31 14:11:58 2022 +0200 fix internal python build on powerpc64le-unknown-linux-gnu Change-Id: I49c1368542a1af5dbbf377dbd8cb0cad8c6e2a38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135174 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index dd470ef37f4e..241233914381 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -142,6 +142,11 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_sysconfigdata__freebsd12_.py \ )) else +ifeq ($(HOST_PLATFORM),powerpc64le-unknown-linux-gnu) +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ +LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_linux_powerpc64le-linux-gnu.py \ +)) +else # note: python configure overrides config.guess with something that doesn't # put -pc in its linux platform triplets, so filter that... ifneq ($(OS),WNT) @@ -156,6 +161,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor endif endif endif +endif # packages not shipped:
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/calendar.ui |3 --- 1 file changed, 3 deletions(-) New commits: commit 090ed6199ec8ed805d645b62387bc89df01b9564 Author: Andras Timar AuthorDate: Mon May 30 22:58:11 2022 +0200 Commit: Andras Timar CommitDate: Tue May 31 09:25:43 2022 +0200 date picker should rather show the current date instead of February 14, 2019 Change-Id: Ie449873aad40b6f02198a8a44a7eae1aaba1cfae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135148 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/sw/uiconfig/swriter/ui/calendar.ui b/sw/uiconfig/swriter/ui/calendar.ui index 5c8d3eb43bfd..e5355f723621 100644 --- a/sw/uiconfig/swriter/ui/calendar.ui +++ b/sw/uiconfig/swriter/ui/calendar.ui @@ -15,9 +15,6 @@ True True -2019 -1 -14 False
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-22.05.1-1'
Tag 'co-22.05.1-1' created by Andras Timar at 2022-05-30 06:57 + co-22.05.1-1 Changes since cp-22.05.0-1-427: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-22.05.1-1'
Tag 'co-22.05.1-1' created by Andras Timar at 2022-05-30 06:57 + co-22.05.1-1 Changes since co-22.05-branch-point-8: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d49e388d7d384d7328047d8fccceddfa5953d2e3 Author: Andras Timar AuthorDate: Mon May 30 08:57:06 2022 +0200 Commit: Andras Timar CommitDate: Mon May 30 08:57:06 2022 +0200 Bump version to 22.05.1.1 Change-Id: I8eb51386723330e08de3c39db37330ca54acffad diff --git a/configure.ac b/configure.ac index 19b227786bcb..187f1e599edc 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],[22.05.0.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[22.05.1.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/mimo/mimo-7-2' - 32 commits - configure.ac connectivity/source download.lst editeng/inc editeng/qa editeng/source external/liborcus external/nss external
configure.ac| 23 connectivity/source/drivers/dbase/DTable.cxx|2 download.lst|8 editeng/inc/editdoc.hxx | 38 editeng/qa/unit/core-test.cxx |4 editeng/source/editeng/editdbg.cxx | 32 editeng/source/editeng/editdoc.cxx | 114 editeng/source/editeng/editeng.cxx | 24 editeng/source/editeng/impedit.cxx | 16 editeng/source/editeng/impedit.hxx |8 editeng/source/editeng/impedit2.cxx | 211 editeng/source/editeng/impedit3.cxx | 279 editeng/source/editeng/impedit4.cxx | 79 editeng/source/editeng/impedit5.cxx | 10 external/liborcus/UnpackedTarball_liborcus.mk | 12 external/liborcus/forcepoint-83.patch.1 | 16 external/liborcus/forcepoint-84.patch.1 | 38 external/liborcus/forcepoint-87.patch.1 | 27 external/liborcus/forcepoint-95.patch.1 | 11 external/nss/ExternalProject_nss.mk |7 external/zlib/UnpackedTarball_zlib.mk |4 external/zlib/ubsan.patch | 11 include/sfx2/strings.hrc|2 include/sfx2/viewfrm.hxx|1 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 readlicense_oo/license/CREDITS.fodt | 4462 +- sc/source/ui/docshell/impex.cxx |2 sd/source/ui/slideshow/slideshowimpl.cxx|2 sfx2/source/view/viewfrm.cxx| 38 slideshow/source/engine/activities/simplecontinuousactivitybase.cxx | 12 svl/source/numbers/zforfind.cxx | 23 svl/source/passwordcontainer/passwordcontainer.cxx | 126 svl/source/passwordcontainer/passwordcontainer.hxx | 63 svx/source/xml/xmlxtimp.cxx |2 sw/CppunitTest_sw_core_text.mk |2 sw/qa/core/text/text.cxx| 44 sw/qa/extras/uiwriter/uiwriter.cxx | 51 sw/source/core/inc/layfrm.hxx |1 sw/source/core/inc/rootfrm.hxx |2 sw/source/core/layout/findfrm.cxx | 21 sw/source/core/layout/pagechg.cxx |2 sw/source/core/layout/tabfrm.cxx| 42 sw/source/core/text/frmform.cxx | 18 sw/source/core/text/frmpaint.cxx|9 sw/source/core/text/porfld.cxx | 14 sw/source/core/text/porrst.cxx |2 sw/source/core/txtnode/ndtxt.cxx|5 vcl/source/filter/itiff/itiff.cxx |4 vcl/source/outdev/text.cxx |2 vcl/unx/gtk3/gtkframe.cxx | 20 50 files changed, 3262 insertions(+), 2694 deletions(-) New commits: commit ca5abbfa9eba0843daf66a07513cf6b683f1bff1 Author: Andras Timar AuthorDate: Fri May 27 20:32:11 2022 +0200 Commit: Andras Timar CommitDate: Fri May 27 20:34:49 2022 +0200 Bump version to 7.2.7.2.M1 Change-Id: I7a78259f40b48e6a2532143ab3b8432ec5a87f3e diff --git a/configure.ac b/configure.ac index 043e510dfa3a..fc6a4c1e61bd 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.2.6.2.M2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.2.7.2.M1],[],[],[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 commit 3ee19fa102f373b633e015e7aa294ba118e58aad Author: Michael Stahl AuthorDate: Fri May
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.30-1'
Tag 'cp-21.06.30-1' created by Andras Timar at 2022-05-24 20:57 + cp-21.06.30-1 Changes since co-21.06.29-1-10: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.30-1'
Tag 'cp-21.06.30-1' created by Andras Timar at 2022-05-24 20:57 + cp-21.06.30-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.30-1'
Tag 'cp-21.06.30-1' created by Andras Timar at 2022-05-24 20:57 + cp-21.06.30-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79bc17465c8f309db6f127d38264dc570f4a975a Author: Andras Timar AuthorDate: Tue May 24 22:57:37 2022 +0200 Commit: Andras Timar CommitDate: Tue May 24 22:57:37 2022 +0200 Bump version to 21.06.30.1 Change-Id: I5a7f5cd0dfcfabcc50a60d5895ffa7ae3bfaf1a3 diff --git a/configure.ac b/configure.ac index db08a4da9bb6..95585a8293c9 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.29.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.30.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-22.05' - sfx2/source
sfx2/source/doc/objstor.cxx | 31 ---
1 file changed, 31 deletions(-)
New commits:
commit 1c9d9bdeca9534f7267c9c2488f57a2e1d01c4e9
Author: Andras Timar
AuthorDate: Mon May 16 15:55:35 2022 +0200
Commit: Andras Timar
CommitDate: Wed May 18 10:41:23 2022 +0200
Revert "sw: restore UI language to en while saving"
This reverts commit f4ef1e3e580f7a590496d62aaa3dc7e092510a9c.
Reason: T35383 Writer: Page breaks saved in German UI/locale turn into line
breaks
Change-Id: Iea7c41b361beb0bc6f455e72ab48cef3604305d6
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 65a340221223..548ce34b1c21 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -91,7 +91,6 @@
#include
#include
#include
-#include
#include
#include
@@ -3176,11 +3175,6 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
return false;
}
-namespace
-{
-static LanguageTag g_defaultLanguageTag("en-US", true);
-}
-
bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
{
uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();
@@ -3203,31 +3197,6 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium
)
pImpl->aBasicManager.storeLibrariesToStorage( xStorage );
}
#endif
-
-// Because XMLTextFieldExport::ExportFieldDeclarations (called from
SwXMLExport)
-// calls SwXTextFieldMasters::getByName, which in turn maps property
names by
-// calling SwStyleNameMapper::GetTextUINameArray, which uses
-// SvtSysLocale().GetUILanguageTag() to do the mapping, saving
indirectly depends
-// on the UI language. This is an unfortunate depenency.
-// Here we restore to English
-const auto viewLanguage = comphelper::LibreOfficeKit::getLanguageTag();
-
-// Use the default language for saving and restore later if necessary.
-bool restoreLanguage = false;
-if (comphelper::LibreOfficeKit::isActive() && viewLanguage !=
g_defaultLanguageTag)
-{
-restoreLanguage = true;
-comphelper::LibreOfficeKit::setLanguageTag(g_defaultLanguageTag);
-}
-
-// Restore the view's original language automatically and as necessary.
-const ::comphelper::ScopeGuard aGuard(
-[&viewLanguage, restoreLanguage]()
-{
-if (restoreLanguage && viewLanguage !=
comphelper::LibreOfficeKit::getLanguageTag())
-comphelper::LibreOfficeKit::setLanguageTag(viewLanguage);
-});
-
return SaveAs( rMedium );
}
else return false;
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-21.06.29-1'
Tag 'co-21.06.29-1' created by Andras Timar at 2022-05-18 08:39 + co-21.06.29-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.29-1'
Tag 'co-21.06.29-1' created by Andras Timar at 2022-05-18 08:39 + co-21.06.29-1 Changes since cp-21.06.28-1-33: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.29-1'
Tag 'co-21.06.29-1' created by Andras Timar at 2022-05-18 08:39 + co-21.06.29-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sfx2/source
sfx2/source/doc/objstor.cxx | 31 ---
1 file changed, 31 deletions(-)
New commits:
commit 900891c3b42e80e8d3970fd5fc02b67022ae3795
Author: Andras Timar
AuthorDate: Mon May 16 15:55:35 2022 +0200
Commit: Andras Timar
CommitDate: Wed May 18 10:38:31 2022 +0200
Revert "sw: restore UI language to en while saving"
This reverts commit f4ef1e3e580f7a590496d62aaa3dc7e092510a9c.
Reason: T35383 Writer: Page breaks saved in German UI/locale turn into line
breaks
Change-Id: Iea7c41b361beb0bc6f455e72ab48cef3604305d6
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 238369b746e6..7ccee4f3a970 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -91,7 +91,6 @@
#include
#include
#include
-#include
#include
#include
@@ -3169,11 +3168,6 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
return false;
}
-namespace
-{
-static LanguageTag g_defaultLanguageTag("en-US", true);
-}
-
bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
{
uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();
@@ -3196,31 +3190,6 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium
)
pImpl->aBasicManager.storeLibrariesToStorage( xStorage );
}
#endif
-
-// Because XMLTextFieldExport::ExportFieldDeclarations (called from
SwXMLExport)
-// calls SwXTextFieldMasters::getByName, which in turn maps property
names by
-// calling SwStyleNameMapper::GetTextUINameArray, which uses
-// SvtSysLocale().GetUILanguageTag() to do the mapping, saving
indirectly depends
-// on the UI language. This is an unfortunate depenency.
-// Here we restore to English
-const auto viewLanguage = comphelper::LibreOfficeKit::getLanguageTag();
-
-// Use the default language for saving and restore later if necessary.
-bool restoreLanguage = false;
-if (comphelper::LibreOfficeKit::isActive() && viewLanguage !=
g_defaultLanguageTag)
-{
-restoreLanguage = true;
-comphelper::LibreOfficeKit::setLanguageTag(g_defaultLanguageTag);
-}
-
-// Restore the view's original language automatically and as necessary.
-const ::comphelper::ScopeGuard aGuard(
-[&viewLanguage, restoreLanguage]()
-{
-if (restoreLanguage && viewLanguage !=
comphelper::LibreOfficeKit::getLanguageTag())
-comphelper::LibreOfficeKit::setLanguageTag(viewLanguage);
-});
-
return SaveAs( rMedium );
}
else return false;
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.29-1'
Tag 'cp-21.06.29-1' created by Andras Timar at 2022-05-16 13:56 + cp-21.06.29-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.29-1'
Tag 'cp-21.06.29-1' created by Andras Timar at 2022-05-16 13:56 + cp-21.06.29-1 Changes since cp-21.06.28-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.29-1'
Tag 'cp-21.06.29-1' created by Andras Timar at 2022-05-16 13:56 + cp-21.06.29-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c5094dfb71bdd532038850f2e7c68c160b9175a Author: Andras Timar AuthorDate: Mon May 16 15:54:36 2022 +0200 Commit: Andras Timar CommitDate: Mon May 16 15:54:41 2022 +0200 Bump version to 21.06.29.1 Change-Id: If0e308b896374ba1dc0366b8992f379e86148c62 diff --git a/configure.ac b/configure.ac index 99951bcb1bca..db08a4da9bb6 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.28.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.29.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: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb90a63846c2898974c5345a369a049ce0a81772 Author: Andras Timar AuthorDate: Tue May 10 22:35:28 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue May 10 22:35:28 2022 +0200 Update git submodules * Update translations from branch 'master' to 542c2f1192e848ca6ccf4f89b770774f7fbc6508 - sl: typo fix Change-Id: Ib2330886ca3a0072543e017deda7a78985602190 diff --git a/translations b/translations index df1f1ea62f4f..542c2f1192e8 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit df1f1ea62f4f5c39d4800a59814baace6363e8e1 +Subproject commit 542c2f1192e848ca6ccf4f89b770774f7fbc6508
[Libreoffice-commits] translations.git: source/sl
source/sl/helpcontent2/source/text/sbasic/shared.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 542c2f1192e848ca6ccf4f89b770774f7fbc6508 Author: Andras Timar AuthorDate: Tue May 10 22:35:21 2022 +0200 Commit: Andras Timar CommitDate: Tue May 10 22:35:21 2022 +0200 sl: typo fix Change-Id: Ib2330886ca3a0072543e017deda7a78985602190 diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po b/source/sl/helpcontent2/source/text/sbasic/shared.po index bf12da63091..4e9204a2b1e 100644 --- a/source/sl/helpcontent2/source/text/sbasic/shared.po +++ b/source/sl/helpcontent2/source/text/sbasic/shared.po @@ -33111,7 +33111,7 @@ msgctxt "" "par_id3150451\n" "help.text" msgid "arg0, arg1 …: The Function optional parameters given as positional arguments." -msgstr "arg0, arg1 ... : neobvezni parametri funkcije Function, podani kot položajni argumenti." +msgstr "arg0, arg1 ... : neobvezni parametri funkcije Function, podani kot položajni argumenti." #: CallByName.xhp msgctxt ""
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-61'
Tag 'cp-6.4-61' created by Andras Timar at 2022-05-04 11:43 + cp-6.4-61 Changes since cp-6.4-60-4: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-61'
Tag 'cp-6.4-61' created by Andras Timar at 2022-05-04 11:43 + cp-6.4-61 Changes since cp-6.4-branch-point-11: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-61'
Tag 'cp-6.4-61' created by Andras Timar at 2022-05-04 11:43 + cp-6.4-61 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
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9eaf70ab2512fab4504d5133a37b101b010b0c34 Author: Andras Timar AuthorDate: Wed May 4 13:40:11 2022 +0200 Commit: Andras Timar CommitDate: Wed May 4 13:40:11 2022 +0200 Bump version to 6.4-61 Change-Id: Idda039c0deb2f37835a67069c2325e21622d2f0b diff --git a/configure.ac b/configure.ac index c318a619bdbd..1ecad82f17c6 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.60],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.61],[],[],[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-21.06.28-1'
Tag 'cp-21.06.28-1' created by Andras Timar at 2022-05-02 14:10 + cp-21.06.28-1 Changes since cp-21.06.27-1-7: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.28-1'
Tag 'cp-21.06.28-1' created by Andras Timar at 2022-05-02 14:10 + cp-21.06.28-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.28-1'
Tag 'cp-21.06.28-1' created by Andras Timar at 2022-05-02 14:10 + cp-21.06.28-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f63c415e21453a558b894c141efe7a0431ff96d9 Author: Andras Timar AuthorDate: Mon May 2 16:09:09 2022 +0200 Commit: Andras Timar CommitDate: Mon May 2 16:09:20 2022 +0200 Bump package version to 21.06.28.1 Change-Id: I9c6a3393b1c8d9bf8712099f7517e79da501c2ed diff --git a/configure.ac b/configure.ac index 93c0932db850..99951bcb1bca 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.27.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.28.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-22.05' - 2 commits - distro-configs/CPAndroidBranding.conf
distro-configs/CPAndroidBranding.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d759da417617a51df6a6320fe089382b05062fb Author: Andras Timar AuthorDate: Tue Apr 5 14:53:48 2022 +0200 Commit: Andras Timar CommitDate: Mon Apr 25 11:04:15 2022 +0200 add a few more languages to Android build again Change-Id: I452790635068b49c8b4fb9f1a60d8296ccd36fa1 diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf index bae1d088dc1e..617ddb98fa9c 100644 --- a/distro-configs/CPAndroidBranding.conf +++ b/distro-configs/CPAndroidBranding.conf @@ -7,7 +7,7 @@ --with-vendor=Collabora --disable-scripting-beanshell --disable-scripting-javascript ---with-lang=ar cs de en-US es fr he hu it nl pl pt-BR sk sl zh-CN zh-TW +--with-lang=ar cs da de el en-US es fr he hu is it ja ko nb nl nn pl pt pt-BR ru sk sl sv tr zh-CN zh-TW --with-myspell-dicts --enable-pdfimport --enable-release-build commit abb2afd7a4e26a15c112187a18a18557736cca58 Author: Andras Timar AuthorDate: Mon Apr 4 15:01:44 2022 +0200 Commit: Andras Timar CommitDate: Mon Apr 25 11:04:08 2022 +0200 add a few more languages to Android build Change-Id: If505c84658504af64a70797ec33fcd4b707a5255 diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf index f34f642fdf5d..bae1d088dc1e 100644 --- a/distro-configs/CPAndroidBranding.conf +++ b/distro-configs/CPAndroidBranding.conf @@ -7,7 +7,7 @@ --with-vendor=Collabora --disable-scripting-beanshell --disable-scripting-javascript ---with-lang=de en-US es fr pt-BR zh-CN zh-TW +--with-lang=ar cs de en-US es fr he hu it nl pl pt-BR sk sl zh-CN zh-TW --with-myspell-dicts --enable-pdfimport --enable-release-build
Re: About libtiff
Hello Julien,
On Tue, Apr 19, 2022 at 11:30 AM Julien Nabet wrote:
> Hello,
>
> I noticed some bugs about dealing with TIFF images (see
> https://bugs.documentfoundation.org/show_bug.cgi?id=126152 for the meta).
>
> According to https://en.wikipedia.org/wiki/TIFF, TIFF is quite complex, I
> quote:
>
> "TIFF is a complex format, defining many tags of which typically only a
> few are used in each file. This led to implementations supporting very
> varying subsets of the format, a situation that gave rise to the joke that
> TIFF stands for *Thousands of Incompatible File Formats*.".
>
> So in https://gerrit.libreoffice.org/c/core/+/133108, I wondered if we
> could use Libtiff. Of course as Tomaž indicated it'll need lots of work.
> However Mike pointed out Luboš' commit about Webp to take example
>
>
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=60eaa424c5e213f31227008e1ed66a646491a360
> ("support for the WebP image format (tdf#114532
> )") which can
> be a start.
>
> But before this, is libtiff license compatible?
>
> I mean, I retrieved source code of libtiff and m4/acinclude.m4 indicates
> (from line 192):
>
> dnl This program is free software; you can redistribute it and/or modify
> it
> dnl under the terms of the GNU General Public License as published by the
> dnl Free Software Foundation; either version 2 of the License, or (at
> your
> dnl option) any later version.
>
> If I remember well, GPL isn't sufficient, we also need LGPL, don't we?
>
>
You quoted the license of GNU Autoconf. Libtiff has a BSD-like licence.
https://gitlab.com/libtiff/libtiff/-/blob/master/COPYRIGHT
Best regards,
Andras
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.27-1'
Tag 'cp-21.06.27-1' created by Andras Timar at 2022-04-19 08:25 + cp-21.06.27-1 Changes since cp-21.06.26-1-7: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.27-1'
Tag 'cp-21.06.27-1' created by Andras Timar at 2022-04-19 08:25 + cp-21.06.27-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.27-1'
Tag 'cp-21.06.27-1' created by Andras Timar at 2022-04-19 08:25 + cp-21.06.27-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
Rebased ref, commits from common ancestor: commit 145f48b92995599faffc6adf599d958ff50b8bc5 Author: Andras Timar AuthorDate: Tue Apr 19 10:24:36 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 19 10:25:10 2022 +0200 Bump version to 21.06.27.1 Change-Id: I35c4f6ddb879ec685a1b67d5a7d9107697f593e4 diff --git a/configure.ac b/configure.ac index 8cefe8bd7e3a..93c0932db850 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.26.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.27.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
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5b43869be3d6338eb105fbfeed401c915b108aa6 Author: Andras Timar AuthorDate: Tue Apr 19 10:24:36 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 19 10:24:36 2022 +0200 Bump version to 21.11.27.1 Change-Id: I35c4f6ddb879ec685a1b67d5a7d9107697f593e4 diff --git a/configure.ac b/configure.ac index 8cefe8bd7e3a..93c0932db850 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.26.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.27.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-22.05' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 --- 1 file changed, 3 deletions(-) New commits: commit 40aad658dddad5ad03e0f84403582ef64ce7fd5b Author: Andras Timar AuthorDate: Tue Apr 12 13:21:51 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 12 13:21:51 2022 +0200 [cp] This label is too long for Online context menus (2nd) Change-Id: I228bcd2c40c182dba5baab0f93cee3c1ebf39cb5 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index a51ab13d077c..15924fc1f06e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4134,9 +4134,6 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 Clone Formatting - - Clone Formatting (double click for multi-selection) - 9
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 --- 1 file changed, 3 deletions(-) New commits: commit 9f54e68fd58ac8bfc9f7ae3e88574de22d980fb9 Author: Andras Timar AuthorDate: Mon Apr 11 15:07:23 2022 +0200 Commit: Andras Timar CommitDate: Mon Apr 11 15:08:38 2022 +0200 [cp] This label is too long for Online context menus https://github.com/CollaboraOnline/online/issues/4369 Change-Id: I15193f0c78ae1fa44e9ddea00083b09da7fbbddf diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index ffc66b25c054..3b960d95c58f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -2959,9 +2959,6 @@ Clone Formatting - - Clone Formatting (double click and Ctrl or Cmd to alter behavior) - 9
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 --- 1 file changed, 3 deletions(-) New commits: commit a0b053dbd7ce2d0d3713e750ad20c0a12bfd8c88 Author: Andras Timar AuthorDate: Mon Apr 11 15:07:23 2022 +0200 Commit: Andras Timar CommitDate: Mon Apr 11 15:07:27 2022 +0200 [cp] This label is too long for Online context menus https://github.com/CollaboraOnline/online/issues/4369 Change-Id: I15193f0c78ae1fa44e9ddea00083b09da7fbbddf diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 2aea98007e00..4bcd51c4e902 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -2920,9 +2920,6 @@ Clone Formatting - - Clone Formatting (double click and Ctrl or Cmd to alter behavior) - 9
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.1.8.1.M1'
Tag 'mimo-7.1.8.1.M1' created by Andras Timar at 2022-04-07 09:52 + mimo-7.1.8.1.M1 Changes since mimo-7.1.7.2.M1-19: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3a12ffe2caf5b299baddfe118942bf03af0271b Author: Andras Timar AuthorDate: Thu Apr 7 11:52:06 2022 +0200 Commit: Andras Timar CommitDate: Thu Apr 7 11:52:06 2022 +0200 Bump the version number to 7.1.8.1.M1 Change-Id: I6d3043395ae6cafce8cdc21d468d5800ee690485 diff --git a/configure.ac b/configure.ac index 75b0a0e0828a..dd2a9e9eb0e4 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.1.7.2.M2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.1.8.1.M1],[],[],[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/cp-21.06.26-1'
Tag 'cp-21.06.26-1' created by Andras Timar at 2022-04-06 20:14 + cp-21.06.26-1 Changes since cp-21.06.25-1-3: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.26-1'
Tag 'cp-21.06.26-1' created by Andras Timar at 2022-04-06 20:14 + cp-21.06.26-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.26-1'
Tag 'cp-21.06.26-1' created by Andras Timar at 2022-04-06 20:14 + cp-21.06.26-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 524dda8d3e7e2c35d15500e0da47682f2208c027 Author: Andras Timar AuthorDate: Wed Apr 6 22:08:40 2022 +0200 Commit: Andras Timar CommitDate: Wed Apr 6 22:08:40 2022 +0200 Bump version to 21.06.26.1 Change-Id: Ib342ce38a00855a057991568eea464a299789824 diff --git a/configure.ac b/configure.ac index ed53a71a5c7c..8cefe8bd7e3a 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.25.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.26.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-60'
Tag 'cp-6.4-60' created by Andras Timar at 2022-04-06 08:53 + cp-6.4-60 Changes since cp-6.4-59-13: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-60'
Tag 'cp-6.4-60' created by Andras Timar at 2022-04-06 08:53 + cp-6.4-60 Changes since cp-6.4-branch-point-11: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-60'
Tag 'cp-6.4-60' created by Andras Timar at 2022-04-06 08:53 + cp-6.4-60 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' - 7 commits - configure.ac download.lst external/nss external/zlib fpicker/source hwpfilter/source svtools/source vcl/source
configure.ac |8 ++--
download.lst |4 ++--
external/nss/ExternalProject_nss.mk |3 ++-
external/zlib/UnpackedTarball_zlib.mk|4
external/zlib/ubsan.patch| 11 ---
fpicker/source/office/fileview.cxx | 10 +++---
hwpfilter/source/hwpread.cxx |1 +
svtools/source/dialogs/ServerDetailsControls.cxx |2 ++
vcl/source/outdev/hatch.cxx |7 +++
9 files changed, 27 insertions(+), 23 deletions(-)
New commits:
commit 2861fcac6dd80b6e84e6853c2a47fe371b75e3a0
Author: Andras Timar
AuthorDate: Wed Apr 6 10:52:24 2022 +0200
Commit: Andras Timar
CommitDate: Wed Apr 6 10:52:24 2022 +0200
Bump version to 6.4-60
Change-Id: I41359b8ea96fef0fc22c8fc5c8b6f461ffaca68a
diff --git a/configure.ac b/configure.ac
index 0095852d7459..c318a619bdbd 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.59],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.60],[],[],[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 13809b9f0f2f985562553bdbd1c1f5a81fb064d8
Author: Michael Stahl
AuthorDate: Thu Mar 31 20:33:02 2022 +0200
Commit: Andras Timar
CommitDate: Wed Apr 6 10:49:17 2022 +0200
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
diff --git a/configure.ac b/configure.ac
index a530bc311e67..0095852d7459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8275,7 +8275,11 @@ else
SYSTEM_ZLIB=
BUILD_TYPE="$BUILD_TYPE ZLIB"
ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
-ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+if test "$COM" = "MSC"; then
+ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib"
+else
+ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib"
+fi
fi
AC_SUBST(ZLIB_CFLAGS)
AC_SUBST(ZLIB_LIBS)
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index 49726ff224d4..7bcafb581479 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -26,9 +26,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
MOZ_DEBUG_FLAGS=" " \
OPT_CODE_SIZE=0) \
OS_TARGET=WIN95 \
+ USE_SYSTEM_ZLIB=1 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
- XCFLAGS="-arch:SSE $(SOLARINC)" \
+ XCFLAGS="-arch:SSE $(SOLARINC) $(ZLIB_CFLAGS)" \
$(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
NSS_DISABLE_GTESTS=1 \
commit e306f209126ebf3ff6c97dbf15577ffb3de405af
Author: Michael Stahl
AuthorDate: Thu Mar 31 12:13:23 2022 +0200
Commit: Andras Timar
CommitDate: Wed Apr 6 10:49:13 2022 +0200
zlib: upgrade to release 1.2.12
Fixes CVE-2018-25032
external/zlib/ubsan.patch: remove, fixed upstream
Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191
Reviewed-by: Thorsten Behrens
(cherry picked from commit b91ebecaaa1582a7cbeda519eb6097a6a866135f)
diff --git a/download.lst b/download.lst
index d24e8b661a01..3771c13fdfba 100644
--- a/download.lst
+++ b/download.lst
@@ -275,8 +275,8 @@ export WPS_VERSION_MICRO := 10
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-export ZLIB_SHA256SUM :=
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
-export ZLIB_TARBALL := zlib-1.2.11.tar.xz
+export ZLIB_SHA256SUM :=
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 2 commits - download.lst external/curl external/expat
download.lst |8
external/curl/CVE-2017-1000254.patch | 50 ---
external/curl/CVE-2017-8816.patch | 67 -
external/curl/CVE-2018-105.patch | 36 --
external/curl/CVE-2018-107.patch | 110
external/curl/CVE-2018-1000120.patch | 67 -
external/curl/CVE-2018-14618.patch| 66 -
external/curl/CVE-2018-16890.patch| 39 ---
external/curl/CVE-2019-3822.patch | 35 --
external/curl/ExternalPackage_curl.mk |4
external/curl/ExternalProject_curl.mk | 30 +-
external/curl/UnpackedTarball_curl.mk | 21 -
external/curl/clang-cl.patch.0| 11
external/curl/curl-7.26.0_win-proxy.patch | 49 +--
external/curl/curl-msvc-disable-protocols.patch.1 | 11
external/curl/curl-msvc-schannel.patch.1 | 22 -
external/curl/curl-msvc.patch.1 | 48 +--
external/curl/curl-osx.patch.1| 285 --
external/curl/curl-xp.patch.1 | 12
external/curl/zlib.patch.0| 100 +++
external/expat/expat-winapi.patch | 14 +
21 files changed, 213 insertions(+), 872 deletions(-)
New commits:
commit 3c59e06756cb78c1cba5dfd64c2416c05606a919
Author: Andras Timar
AuthorDate: Wed May 23 14:10:08 2018 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 5 22:52:48 2022 +0200
curl: upgrade to release 7.60.0
Revert also these commits:
aa0f44de5b260b2b2a39bdd2de9445d72ab14265
ed497921314ebd41fce3483c92ca433b502628ca
06697501dff33996426f1ebb5ba42039193a632f
860ff5ee216d80211bc19b3879d20d7981923c1a
5793da78b48fee31a929c3c81709f3bab526d79b
Change-Id: Ic8510b424f52c059f979e26441e67ec15b332933
diff --git a/download.lst b/download.lst
index e14c0ecef12f..cbb383504ed8 100644
--- a/download.lst
+++ b/download.lst
@@ -30,8 +30,8 @@ export CPPUNIT_SHA256SUM :=
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
export CT2N_SHA256SUM :=
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
export CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM :=
a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae
-export CURL_TARBALL := curl-7.52.1.tar.gz
+export CURL_SHA256SUM :=
e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5
+export CURL_TARBALL := curl-7.60.0.tar.gz
export EBOOK_SHA256SUM :=
b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850
export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
export EPOXY_SHA256SUM :=
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
diff --git a/external/curl/CVE-2017-1000254.patch
b/external/curl/CVE-2017-1000254.patch
deleted file mode 100644
index 2e2af20f7258..
--- a/external/curl/CVE-2017-1000254.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 29b251362e1839d7094993edbed8f9467069773f Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg
-Date: Mon, 25 Sep 2017 00:35:22 +0200
-Subject: [PATCH] FTP: zero terminate the entry path even on bad input
-
-... a single double quote could leave the entry path buffer without a zero
-terminating byte. CVE-2017-1000254
-
-Test 1152 added to verify.
-
-Reported-by: Max Dymond
-Bug: https://curl.haxx.se/docs/adv_20171004.html
- lib/ftp.c | 7 --
- tests/data/Makefile.inc | 1 +
- tests/data/test1152 | 61 +
- 3 files changed, 67 insertions(+), 2 deletions(-)
- create mode 100644 tests/data/test1152
-
-diff -urN curl.org/lib/ftp.c curl/lib/ftp.c
curl.org/lib/ftp.c 2016-12-19 09:15:11.0 +0100
-+++ curl/lib/ftp.c 2018-09-10 05:52:32.148633155 +0200
-@@ -2825,6 +2825,7 @@
- char *ptr=&data->state.buffer[4]; /* start on the first letter */
- char *dir;
- char *store;
-+bool entry_extracted = FALSE;
-
- dir = malloc(nread + 1);
- if(!dir)
-@@ -2856,7 +2857,7 @@
- }
- else {
- /* end of path */
--*store = '\0'; /* zero terminate */
-+entry_extracted = TRUE;
- break; /* get out of this loop */
- }
- }
-@@ -2865,7 +2866,9 @@
- store++;
- ptr++;
- }
--
-+ *store = '\0'; /* zero terminate */
-+}
-+if(entry_extracted) {
- /* If the path name does not look like an absolute path (i.e.: it
- does not start with a '/'), we probably need some
server-dependent
- adjustments. For example, this is the case when connecting to
diff --git a/external/curl/CVE-2017-8816.patch
b/external/curl/CVE-2017-8816
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.25-1'
Tag 'cp-21.06.25-1' created by Andras Timar at 2022-04-05 20:18 + cp-21.06.25-1 Changes since cp-21.06.24-1-2: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.25-1'
Tag 'cp-21.06.25-1' created by Andras Timar at 2022-04-05 20:18 + cp-21.06.25-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.25-1'
Tag 'cp-21.06.25-1' created by Andras Timar at 2022-04-05 20:18 + cp-21.06.25-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e90143624dbadeff0f139c3372b09848f83d6038 Author: Andras Timar AuthorDate: Tue Apr 5 22:18:22 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 5 22:18:22 2022 +0200 Bump version to 21.06.25.1 Change-Id: I4c5769ee5877ec8534ac28343a42e22610cd7348 diff --git a/configure.ac b/configure.ac index aa9206171e06..ed53a71a5c7c 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.24.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.25.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' - distro-configs/CPAndroidBranding.conf
distro-configs/CPAndroidBranding.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 716522af100e572069c6600115a480d2036a2051 Author: Andras Timar AuthorDate: Tue Apr 5 14:53:48 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 5 14:54:34 2022 +0200 add a few more languages to Android build again Change-Id: I452790635068b49c8b4fb9f1a60d8296ccd36fa1 diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf index bae1d088dc1e..617ddb98fa9c 100644 --- a/distro-configs/CPAndroidBranding.conf +++ b/distro-configs/CPAndroidBranding.conf @@ -7,7 +7,7 @@ --with-vendor=Collabora --disable-scripting-beanshell --disable-scripting-javascript ---with-lang=ar cs de en-US es fr he hu it nl pl pt-BR sk sl zh-CN zh-TW +--with-lang=ar cs da de el en-US es fr he hu is it ja ko nb nl nn pl pt pt-BR ru sk sl sv tr zh-CN zh-TW --with-myspell-dicts --enable-pdfimport --enable-release-build
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - 18 commits - configure.ac download.lst external/liborcus external/nss external/zlib include/sfx2 officecfg/registry sc/qa sc/source sfx2
configure.ac |8 download.lst |4 external/liborcus/UnpackedTarball_liborcus.mk | 13 external/liborcus/forcepoint-83.patch.1| 38 ++ external/liborcus/forcepoint-84.patch.1| 38 ++ external/liborcus/forcepoint-87.patch.1| 27 ++ external/liborcus/forcepoint-95.patch.1| 11 external/nss/ExternalProject_nss.mk|3 external/zlib/UnpackedTarball_zlib.mk |4 external/zlib/ubsan.patch | 11 include/sfx2/strings.hrc |2 include/sfx2/viewfrm.hxx |1 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 16 + sc/qa/unit/data/xlsx/tdf147014.xlsx|binary sc/source/filter/oox/worksheethelper.cxx | 24 + sc/source/filter/xml/xmlcelli.cxx |6 sfx2/source/view/viewfrm.cxx | 38 ++ svl/source/passwordcontainer/passwordcontainer.cxx | 170 + svl/source/passwordcontainer/passwordcontainer.hxx | 69 - sw/qa/core/data/rtf/fail/forcepoint-82.rtf | 28 ++ sw/source/core/layout/tabfrm.cxx | 42 +-- sw/source/core/text/itratr.cxx |2 sw/source/ui/config/optpage.cxx|6 uui/source/iahndl-authentication.cxx |5 vcl/source/helper/strhelper.cxx|3 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 26 files changed, 465 insertions(+), 106 deletions(-) New commits: commit 74831af03d7e794048849ed7c5b17cf622d09447 Author: Andras Timar AuthorDate: Tue Apr 5 13:42:34 2022 +0200 Commit: Andras Timar CommitDate: Tue Apr 5 13:42:34 2022 +0200 Bump version to 7.1.7.2.M2 Change-Id: I05998a6e72ff815322aba1e2059321d4401f4ea5 diff --git a/configure.ac b/configure.ac index aaef60bdf15f..75b0a0e0828a 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.1.7.2.M1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.1.7.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 commit 5d97c87b1f957eccb75ec20eb789ac0940f7d2c2 Author: Caolán McNamara AuthorDate: Sat Apr 2 20:20:10 2022 +0100 Commit: Andras Timar CommitDate: Tue Apr 5 13:41:45 2022 +0200 forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removed for SwBorderAttr which gets deleted during this call also includes... Related: forcepoint#100 we don't need pAttrs for the duration of the full scope similar to the case of commit 6b1eae0334ba8bad7656a859695551ce51b62f95 Date: Fri May 18 08:26:14 2001 + Fix #87058#: Locked boraderattribut the SwCache object cannot be deleted if its locked, leading to a leak, we don't need pAttrs for the entire scope here so we can defer to the end of the scope the reacquire the lock to set pAttrs and also includes... Related: forcepoint#100 don't reacquire after every release instead release when we have to, and only reacquire if necessary before use of pAttrs Change-Id: Ie52aab7e5933d76b0c055389798104e4d93f39e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132462 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index d639e4d18d74..6b4af2dba96c 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2021,8 +2021,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) pAccess.reset(); m_bCalcLowers |= pLayout->Resize( pLayout->GetBrowseWidthByTabFrame( *this ) ); -pAccess = std::make_unique(SwFrame::GetCache(), this); -pAttrs = pAccess->Get(); } setFramePrintAreaValid(false); @@ -2057,6 +2055,12 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) const tools::Long nOldPrtWidth = aRectFnSet.GetWidth(getFramePrintArea()); const tools::Long nOldFrameWidth = aRectFnSet.GetWidth(getFrameArea());
