Bump version to 21.06.30.1
Change-Id: I5a7f5cd0dfcfabcc50a60d5895ffa7ae3bfaf1a3
Change-Id: I5a7f5cd0dfcfabcc50a60d5895ffa7ae3bfaf1a3
comments: reassign ID when copy comment
reassigning new ID will make all the comments have unique IDs
this will also ensure there is no mixup when working with comments ID
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I94b433130c68354ab94d4d6e9b86751038b31af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134686
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
reassigning new ID will make all the comments have unique IDs
this will also ensure there is no mixup when working with comments ID
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: I94b433130c68354ab94d4d6e9b86751038b31af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134686
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Revert "lok: sidebar: avoid async call to switch context"
Async call was introduced so we will not switch panels multiple times
in a row, but only one time. That patch was bad for performance.
This reverts commit 55f65c4d6cf7d1f68fe9c39c42431e6a15d903e6.
Change-Id: I710d9c4bf0881750ca763d53cd1928068721cc82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134821
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Async call was introduced so we will not switch panels multiple times
in a row, but only one time. That patch was bad for performance.
This reverts commit 55f65c4d6cf7d1f68fe9c39c42431e6a15d903e6.
Change-Id: I710d9c4bf0881750ca763d53cd1928068721cc82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134821
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Include <memory> for std::unique_ptr
Change-Id: Ife038559e03ace7ceebe02a95cb89689cd699135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134810
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Change-Id: Ife038559e03ace7ceebe02a95cb89689cd699135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134810
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
external/python3: Clang 13 trunk implements --print-multiarch now
...since
<https://github.com/llvm/llvm-project/commit/a921d2d2fb46b898794091e7410426c518a4f0cc>
"[Driver] Add -print-multiarch", which causes an issue when building
ExternalProject_python3 on macOS:
> checking build system type... x86_64-apple-darwin19.6.0
> checking host system type... x86_64-apple-darwin19.6.0
[...]
> checking for the platform triplet based on compiler characteristics... darwin
configure: error: internal configure error for the platform triplet, please file a bug report
> make[1]: *** [/Users/stephan/Software/lo/core/external/python3/ExternalProject_python3.mk:80: /Users/stephan/Software/lo/core/workdir/ExternalProject/python3/build] Error 1
as workdir/UnpackedTarball/python3/configure.ac computes PLATFORM_TRIPLET as
"darwin", and instead of computing MULTIARCH as empty (as `$CC
--print-multiarch` used to just print
> clang: error: unsupported option '--print-multiarch'
> clang: error: no input files
to stderr), it now computes it as e.g. "x86_64-apple-darwin19.6.0" (or whatever
-target is explicitly set to in $CC), so the check that they have equal values
if they are bot nonempty fails now when building against Clang 13 trunk. (This
is not yet an issue with any Apple Clang version, though.)
Until this is eventually fixed upstream at <https://github.com/python/cpython>,
just keep pretending that `clang --print-multiarch` would cause no stdout output
on macOS when determining MULTIARCH.
Change-Id: Ic1b27c6791b327d5709a9d61a6d675c3fa8989bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134809
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
...since
<https://github.com/llvm/llvm-project/commit/a921d2d2fb46b898794091e7410426c518a4f0cc>
"[Driver] Add -print-multiarch", which causes an issue when building
ExternalProject_python3 on macOS:
> checking build system type... x86_64-apple-darwin19.6.0
> checking host system type... x86_64-apple-darwin19.6.0
[...]
> checking for the platform triplet based on compiler characteristics... darwin
configure: error: internal configure error for the platform triplet, please file a bug report
> make[1]: *** [/Users/stephan/Software/lo/core/external/python3/ExternalProject_python3.mk:80: /Users/stephan/Software/lo/core/workdir/ExternalProject/python3/build] Error 1
as workdir/UnpackedTarball/python3/configure.ac computes PLATFORM_TRIPLET as
"darwin", and instead of computing MULTIARCH as empty (as `$CC
--print-multiarch` used to just print
> clang: error: unsupported option '--print-multiarch'
> clang: error: no input files
to stderr), it now computes it as e.g. "x86_64-apple-darwin19.6.0" (or whatever
-target is explicitly set to in $CC), so the check that they have equal values
if they are bot nonempty fails now when building against Clang 13 trunk. (This
is not yet an issue with any Apple Clang version, though.)
Until this is eventually fixed upstream at <https://github.com/python/cpython>,
just keep pretending that `clang --print-multiarch` would cause no stdout output
on macOS when determining MULTIARCH.
Change-Id: Ic1b27c6791b327d5709a9d61a6d675c3fa8989bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134809
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
lok: sidebar: notebookbar: don't change view mode for other views
We should change view mode (notebookbar/toolbars) only for current view.
This prevents the closed sidebar from showing when other view joins the session.
Change-Id: Iaeec1bee0afab7552e223f17dd7afac27d288db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134690
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
We should change view mode (notebookbar/toolbars) only for current view.
This prevents the closed sidebar from showing when other view joins the session.
Change-Id: Iaeec1bee0afab7552e223f17dd7afac27d288db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134690
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
lok: sidebar: avoid async call to switch context
This makes us sure we don't trigger actions for other views
in LOK case.
We need to call Sync() after RequestCall() so it will be executed
synchronously.
Change-Id: I07af8d34cbbc6bb42e1b8eeef47a921fdc4bf5f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134689
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This makes us sure we don't trigger actions for other views
in LOK case.
We need to call Sync() after RequestCall() so it will be executed
synchronously.
Change-Id: I07af8d34cbbc6bb42e1b8eeef47a921fdc4bf5f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134689
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
jsdialog: introduce popup management
Popup windows are managed by vcl (some moving between parents
happens on show/hide popup).
We need to access correct popup window to correctly close
popup in LOK. So remember popup instances.
Change-Id: I9e1ba18ded5a1bf675f95bd7178043eebd9bbd5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134576
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Popup windows are managed by vcl (some moving between parents
happens on show/hide popup).
We need to access correct popup window to correctly close
popup in LOK. So remember popup instances.
Change-Id: I9e1ba18ded5a1bf675f95bd7178043eebd9bbd5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134576
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
jsdialog: close popup correctly
call popdown so we will mark popup as closed in DockingManager
this fixes crash when trying to open autofilter popup second time
Change-Id: I9f2db6fe284d9b9770c20dea4b8a4054524a998b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132619
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134575
call popdown so we will mark popup as closed in DockingManager
this fixes crash when trying to open autofilter popup second time
Change-Id: I9f2db6fe284d9b9770c20dea4b8a4054524a998b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132619
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134575
Related tdf#149072: avoid warning "misuse of method"
complete warning log:
<SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method
part of bt when opening attachment of tdf#149072
0 SwTextFormatColl::GetAssignedOutlineStyleLevel() const (this=0x77064d0) at sw/source/core/doc/fmtcol.cxx:608
1 0x00007f8a52aa7941 in sw::(anonymous namespace)::HeaderCheck::check(SwNode*) (this=0xa457630, pCurrent=0x7705e98) at sw/source/core/access/AccessibilityCheck.cxx:622
2 0x00007f8a52a9a6a3 in sw::AccessibilityCheck::check() (this=0x7ffe4a14ab10) at sw/source/core/access/AccessibilityCheck.cxx:947
3 0x00007f8a53ed2ad7 in SwDocShell::runAccessibilityCheck() (this=0x74ef0e0) at sw/source/uibase/app/docst.cxx:1559
4 0x00007f8a16e7fdec in ImpPDFTabDialog::OkHdl(weld::Button&) (this=0xa0e9990) at filter/source/pdf/impdialog.cxx:324
5 0x00007f8a16e7fb2d in ImpPDFTabDialog::LinkStubOkHdl(void*, weld::Button&) (instance=0xa0e9990, data=...) at filter/source/pdf/impdialog.cxx:317
Change-Id: I2ed50f14eff01babd47ada3831c0a051fc767dbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134312
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 86050db1b0c15651335d1b0bf89ee8f6409dee1d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134498
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
complete warning log:
<SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method
part of bt when opening attachment of tdf#149072
0 SwTextFormatColl::GetAssignedOutlineStyleLevel() const (this=0x77064d0) at sw/source/core/doc/fmtcol.cxx:608
1 0x00007f8a52aa7941 in sw::(anonymous namespace)::HeaderCheck::check(SwNode*) (this=0xa457630, pCurrent=0x7705e98) at sw/source/core/access/AccessibilityCheck.cxx:622
2 0x00007f8a52a9a6a3 in sw::AccessibilityCheck::check() (this=0x7ffe4a14ab10) at sw/source/core/access/AccessibilityCheck.cxx:947
3 0x00007f8a53ed2ad7 in SwDocShell::runAccessibilityCheck() (this=0x74ef0e0) at sw/source/uibase/app/docst.cxx:1559
4 0x00007f8a16e7fdec in ImpPDFTabDialog::OkHdl(weld::Button&) (this=0xa0e9990) at filter/source/pdf/impdialog.cxx:324
5 0x00007f8a16e7fb2d in ImpPDFTabDialog::LinkStubOkHdl(void*, weld::Button&) (instance=0xa0e9990, data=...) at filter/source/pdf/impdialog.cxx:317
Change-Id: I2ed50f14eff01babd47ada3831c0a051fc767dbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134312
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 86050db1b0c15651335d1b0bf89ee8f6409dee1d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134498
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
tdf#149072: fix export PDF with PDF/UA in GUI after Index language was set
Regression of a1f9fea520f5b3f5d54a284886aa531693f32e7a
Make accessibility check dialog async
First add of m_xDialog->response(RET_OK) fixes the bug
the second one is just here to have same behaviour as before the quoted patch
Change-Id: Ib24459e4e946b83172271a9097930e5977e676be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134311
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 4d3a9d4ffec4bf9765f965d92c163c94201a3c9a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134497
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Regression of a1f9fea520f5b3f5d54a284886aa531693f32e7a
Make accessibility check dialog async
First add of m_xDialog->response(RET_OK) fixes the bug
the second one is just here to have same behaviour as before the quoted patch
Change-Id: Ib24459e4e946b83172271a9097930e5977e676be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134311
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 4d3a9d4ffec4bf9765f965d92c163c94201a3c9a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134497
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
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
This reverts commit f4ef1e3e580f7a590496d62aaa3dc7e092510a9c.
Reason: T35383 Writer: Page breaks saved in German UI/locale turn into line breaks
Change-Id: Iea7c41b361beb0bc6f455e72ab48cef3604305d6
sw: disable forcepoint93-2.rtf, it loops in layout
Change-Id: I09b40521535cbbcfd07595e272cc530afeb22cf6
Change-Id: I09b40521535cbbcfd07595e272cc530afeb22cf6
ofz#46905 Null-dereference
Change-Id: I26427ee1e010ce79e40c550459d9f53598570a7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133291
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5f1d341779b9a773e3147542f6b80d4b3547bb43)
Change-Id: I26427ee1e010ce79e40c550459d9f53598570a7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133291
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5f1d341779b9a773e3147542f6b80d4b3547bb43)
ofz#46526 Abrt
Change-Id: Iaec536b0989c4ec11b39b1534c7798e46715d7a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132710
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 67851564d74bc8108e4802abfeb4fb88f4adf71d)
Change-Id: Iaec536b0989c4ec11b39b1534c7798e46715d7a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132710
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 67851564d74bc8108e4802abfeb4fb88f4adf71d)
forcepoint#104 sw: do not delete fieldmark chars in MoveNodeRange()
The problem is that SwXTextTableCursor::mergeRange() wants to move some
nodes, and the deleteMarks() deletes a fieldmark creating a SaveBookmark
but it contains the positions relative to the CH_TXT_ATR_FIELD* still in
the text, while deleting the fieldmark of course removes these.
The SaveBookmark would need to adjust the indexes and store the
separator position too and the vector would need to be restored in
reverse order.
But every time the SaveBookmarks are created, they are restored as well,
so it looks simpler to just suppress deleting the CH_TXT_ATR_FIELD* in
this case, and inserting them too (latter is already done when copying
text).
Change-Id: I690c6432a38eab6dec10adff74e638f0e52cca55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132531
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5d41c2461642364b7159398024acccbee12f6e3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132589
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
The problem is that SwXTextTableCursor::mergeRange() wants to move some
nodes, and the deleteMarks() deletes a fieldmark creating a SaveBookmark
but it contains the positions relative to the CH_TXT_ATR_FIELD* still in
the text, while deleting the fieldmark of course removes these.
The SaveBookmark would need to adjust the indexes and store the
separator position too and the vector would need to be restored in
reverse order.
But every time the SaveBookmarks are created, they are restored as well,
so it looks simpler to just suppress deleting the CH_TXT_ATR_FIELD* in
this case, and inserting them too (latter is already done when copying
text).
Change-Id: I690c6432a38eab6dec10adff74e638f0e52cca55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132531
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5d41c2461642364b7159398024acccbee12f6e3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132589
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
forcepoint#102 refetch pPara if it might have been destroyed
by SwTextFly::Relax
READ of size 8 at 0x616006d9ab08 thread T0
#0 0x7f5c56a0fbe5 in Size::Height() const include/tools/gen.hxx:213:52
#1 0x7f5c56a0fb98 in Size::getHeight() const include/tools/gen.hxx:219:55
#2 0x7f5c56a040f0 in SwRect::IsEmpty() const sw/inc/swrect.hxx:306:21
#3 0x7f5c56dbb018 in SwRect::HasArea() const sw/inc/swrect.hxx:302:13
#4 0x7f5c58571d04 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2986:45
0x616006d9ab08 is located 136 bytes inside of 608-byte region [0x616006d9aa80,0x616006d9ace0)
freed by thread T0 here:
#0 0x4fe1f7 in operator delete(void*) (instdir/program/soffice.bin+0x4fe1f7)
#1 0x7f5c584602c5 in SwParaPortion::~SwParaPortion() sw/source/core/text/porlay.cxx:2557:1
#2 0x7f5c5850b997 in std::default_delete<SwParaPortion>::operator()(SwParaPortion*) const /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:85:2
#3 0x7f5c5850b826 in std::__uniq_ptr_impl<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:182:4
#4 0x7f5c5850b630 in std::unique_ptr<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:456:7
#5 0x7f5c5850960d in SwTextLine::SetPara(SwParaPortion*, bool) sw/source/core/text/txtcache.hxx:45:17
#6 0x7f5c58509e7d in SwTextFrame::ClearPara() sw/source/core/text/txtcache.cxx:113:24
#7 0x7f5c5855606e in SwTextFrame::Init() sw/source/core/text/txtfrm.cxx:758:9
#8 0x7f5c585735c4 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:3090:17
#9 0x7f5c57ecafb4 in lcl_NotifyContent(SdrObject const*, SwContentFrame*, SwRect const&, PrepareHint) sw/source/core/layout/frmtool.cxx:3367:15
#10 0x7f5c57ec968b in Notify_Background(SdrObject const*, SwPageFrame*, SwRect const&, PrepareHint, bool) sw/source/core/layout/frmtool.cxx:3443:9
#11 0x7f5c57958669 in lcl_NotifyBackgroundOfObj(SwDrawContact const&, SdrObject const&, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:951:13
#12 0x7f5c579556bc in SwDrawContact::Changed_(SdrObject const&, SdrUserCallType, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:1233:21
#13 0x7f5c57953b8d in SwDrawContact::Changed(SdrObject const&, SdrUserCallType, tools::Rectangle const&) sw/source/core/draw/dcontact.cxx:1009:5
#14 0x7f5c96008baf in SdrObject::SendUserCall(SdrUserCallType, tools::Rectangle const&) const svx/source/svdraw/svdobj.cxx:2767:22
#15 0x7f5c9601befa in SdrObject::Resize(Point const&, Fraction const&, Fraction const&, bool) svx/source/svdraw/svdobj.cxx:1561:5
#16 0x7f5c57da650c in SwAnchoredDrawObject::GetObjBoundRect() const sw/source/core/layout/anchoreddrawobject.cxx:733:22
#17 0x7f5c57dae236 in SwAnchoredObject::GetObjRectWithSpaces() const sw/source/core/layout/anchoredobject.cxx:569:31
#18 0x7f5c5853c39e in SwTextFly::InitAnchoredObjList() sw/source/core/text/txtfly.cxx:900:48
#19 0x7f5c58537b0c in SwTextFly::GetAnchoredObjList() const sw/source/core/inc/txtfly.hxx:311:44
#20 0x7f5c58532a5d in SwTextFly::ForEach(SwRect const&, SwRect*, bool) const sw/source/core/text/txtfly.cxx:1067:56
#21 0x7f5c58533eec in SwTextFly::IsAnyFrame() const sw/source/core/text/txtfly.cxx:405:12
#22 0x7f5c5832ccbe in SwTextFly::Relax() sw/source/core/inc/txtfly.hxx:337:17
#23 0x7f5c58571af5 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2976:48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132480
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f49d218a671df5f7a956ccb219dc46a5c8d0a53c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132485
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c4ebab83edb8fe70282f6467700a56c3aff6c1b)
Change-Id: Ibd0d4af69d2a8d74ad538afba7da53c864fa27b6
by SwTextFly::Relax
READ of size 8 at 0x616006d9ab08 thread T0
#0 0x7f5c56a0fbe5 in Size::Height() const include/tools/gen.hxx:213:52
#1 0x7f5c56a0fb98 in Size::getHeight() const include/tools/gen.hxx:219:55
#2 0x7f5c56a040f0 in SwRect::IsEmpty() const sw/inc/swrect.hxx:306:21
#3 0x7f5c56dbb018 in SwRect::HasArea() const sw/inc/swrect.hxx:302:13
#4 0x7f5c58571d04 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2986:45
0x616006d9ab08 is located 136 bytes inside of 608-byte region [0x616006d9aa80,0x616006d9ace0)
freed by thread T0 here:
#0 0x4fe1f7 in operator delete(void*) (instdir/program/soffice.bin+0x4fe1f7)
#1 0x7f5c584602c5 in SwParaPortion::~SwParaPortion() sw/source/core/text/porlay.cxx:2557:1
#2 0x7f5c5850b997 in std::default_delete<SwParaPortion>::operator()(SwParaPortion*) const /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:85:2
#3 0x7f5c5850b826 in std::__uniq_ptr_impl<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:182:4
#4 0x7f5c5850b630 in std::unique_ptr<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:456:7
#5 0x7f5c5850960d in SwTextLine::SetPara(SwParaPortion*, bool) sw/source/core/text/txtcache.hxx:45:17
#6 0x7f5c58509e7d in SwTextFrame::ClearPara() sw/source/core/text/txtcache.cxx:113:24
#7 0x7f5c5855606e in SwTextFrame::Init() sw/source/core/text/txtfrm.cxx:758:9
#8 0x7f5c585735c4 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:3090:17
#9 0x7f5c57ecafb4 in lcl_NotifyContent(SdrObject const*, SwContentFrame*, SwRect const&, PrepareHint) sw/source/core/layout/frmtool.cxx:3367:15
#10 0x7f5c57ec968b in Notify_Background(SdrObject const*, SwPageFrame*, SwRect const&, PrepareHint, bool) sw/source/core/layout/frmtool.cxx:3443:9
#11 0x7f5c57958669 in lcl_NotifyBackgroundOfObj(SwDrawContact const&, SdrObject const&, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:951:13
#12 0x7f5c579556bc in SwDrawContact::Changed_(SdrObject const&, SdrUserCallType, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:1233:21
#13 0x7f5c57953b8d in SwDrawContact::Changed(SdrObject const&, SdrUserCallType, tools::Rectangle const&) sw/source/core/draw/dcontact.cxx:1009:5
#14 0x7f5c96008baf in SdrObject::SendUserCall(SdrUserCallType, tools::Rectangle const&) const svx/source/svdraw/svdobj.cxx:2767:22
#15 0x7f5c9601befa in SdrObject::Resize(Point const&, Fraction const&, Fraction const&, bool) svx/source/svdraw/svdobj.cxx:1561:5
#16 0x7f5c57da650c in SwAnchoredDrawObject::GetObjBoundRect() const sw/source/core/layout/anchoreddrawobject.cxx:733:22
#17 0x7f5c57dae236 in SwAnchoredObject::GetObjRectWithSpaces() const sw/source/core/layout/anchoredobject.cxx:569:31
#18 0x7f5c5853c39e in SwTextFly::InitAnchoredObjList() sw/source/core/text/txtfly.cxx:900:48
#19 0x7f5c58537b0c in SwTextFly::GetAnchoredObjList() const sw/source/core/inc/txtfly.hxx:311:44
#20 0x7f5c58532a5d in SwTextFly::ForEach(SwRect const&, SwRect*, bool) const sw/source/core/text/txtfly.cxx:1067:56
#21 0x7f5c58533eec in SwTextFly::IsAnyFrame() const sw/source/core/text/txtfly.cxx:405:12
#22 0x7f5c5832ccbe in SwTextFly::Relax() sw/source/core/inc/txtfly.hxx:337:17
#23 0x7f5c58571af5 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2976:48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132480
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f49d218a671df5f7a956ccb219dc46a5c8d0a53c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132485
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c4ebab83edb8fe70282f6467700a56c3aff6c1b)
Change-Id: Ibd0d4af69d2a8d74ad538afba7da53c864fa27b6
forcepoint#98 don't delete SwFrame flagged as IsDeleteForbidden
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029)
Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029)
Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
forcepoint#91 fix crash on layout of specific html
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit be04a8072e4af30ca6ead36aa92d5f380cd9feb9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132483
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 4abce69fca83f5c98bb1fc0678cc1ce9cedd4750)
Change-Id: I145649e18f382c67ea34290f44fa219b7926127f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit be04a8072e4af30ca6ead36aa92d5f380cd9feb9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132483
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 4abce69fca83f5c98bb1fc0678cc1ce9cedd4750)
Change-Id: I145649e18f382c67ea34290f44fa219b7926127f
forcepoint#99 SwTextFormatter unaware that FirstOfBorderMerge was deleted
READ of size 8 at 0x606000a49e50 thread T0
#0 0x7f7ab6214bf5 in SwPosSize::Height() const /home/caolan/LibreOffice/core-asan/sw/source/core/text/possiz.hxx:49:37
#1 0x7f7ab636c311 in SwTextFormatter::MergeCharacterBorder(SwLinePortion&, SwLinePortion const*, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:2807:43
#2 0x7f7ab636ae08 in SwTextFormatter::InsertPortion(SwTextFormatInfo&, SwLinePortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:354:13
#3 0x7f7ab6371db1 in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:709:9
#4 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9
#5 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44
#6 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23
#7 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5
#8 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17
#9 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17
0x606000a49e50 is located 16 bytes inside of 56-byte region [0x606000a49e40,0x606000a49e78)
freed by thread T0 here:
#0 0x4fe1f7 in operator delete(void*) (/home/caolan/LibreOffice/core-asan/instdir/program/soffice.bin+0x4fe1f7)
#1 0x7f7ab6486d35 in SwTextPortion::~SwTextPortion() /home/caolan/LibreOffice/core-asan/sw/source/core/text/portxt.hxx:26:7
#2 0x7f7ab63da0c9 in SwLineLayout::CalcLine(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/porlay.cxx:430:21
#3 0x7f7ab6435413 in SwMultiPortion::CalcSize(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:75:15
#4 0x7f7ab6457749 in SwTextFormatter::BuildMultiPortion(SwTextFormatInfo&, SwMultiPortion&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:2090:16
#5 0x7f7ab636f12c in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:550:21
#6 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9
#7 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44
#8 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23
#9 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5
#10 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17
#11 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17
similar seen in the past as:
commit 96acebb72211b4718eb3038c427df37b55b17b0b
Date: Tue May 14 01:49:03 2019 +0800
tdf#124937 reset m_pFirstOfBorderMerge before truncate.
commit ecd855794b22c0f7e6fb2f362b566c4d9c5f624a
Date: Mon Jan 15 22:29:31 2018 +0100
tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder()
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132439
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit b46baea4d1cce81c56ee0d82fbdc352921445fa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132380
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 0a34ac386187c5ca328aebc27851c2a2ff38f293)
Change-Id: Iad855f382a0daf50dac2537d4a91bfeaa9ff3799
READ of size 8 at 0x606000a49e50 thread T0
#0 0x7f7ab6214bf5 in SwPosSize::Height() const /home/caolan/LibreOffice/core-asan/sw/source/core/text/possiz.hxx:49:37
#1 0x7f7ab636c311 in SwTextFormatter::MergeCharacterBorder(SwLinePortion&, SwLinePortion const*, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:2807:43
#2 0x7f7ab636ae08 in SwTextFormatter::InsertPortion(SwTextFormatInfo&, SwLinePortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:354:13
#3 0x7f7ab6371db1 in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:709:9
#4 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9
#5 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44
#6 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23
#7 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5
#8 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17
#9 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17
0x606000a49e50 is located 16 bytes inside of 56-byte region [0x606000a49e40,0x606000a49e78)
freed by thread T0 here:
#0 0x4fe1f7 in operator delete(void*) (/home/caolan/LibreOffice/core-asan/instdir/program/soffice.bin+0x4fe1f7)
#1 0x7f7ab6486d35 in SwTextPortion::~SwTextPortion() /home/caolan/LibreOffice/core-asan/sw/source/core/text/portxt.hxx:26:7
#2 0x7f7ab63da0c9 in SwLineLayout::CalcLine(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/porlay.cxx:430:21
#3 0x7f7ab6435413 in SwMultiPortion::CalcSize(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:75:15
#4 0x7f7ab6457749 in SwTextFormatter::BuildMultiPortion(SwTextFormatInfo&, SwMultiPortion&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:2090:16
#5 0x7f7ab636f12c in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:550:21
#6 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9
#7 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44
#8 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23
#9 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5
#10 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17
#11 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17
similar seen in the past as:
commit 96acebb72211b4718eb3038c427df37b55b17b0b
Date: Tue May 14 01:49:03 2019 +0800
tdf#124937 reset m_pFirstOfBorderMerge before truncate.
commit ecd855794b22c0f7e6fb2f362b566c4d9c5f624a
Date: Mon Jan 15 22:29:31 2018 +0100
tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder()
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132439
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit b46baea4d1cce81c56ee0d82fbdc352921445fa7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132380
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 0a34ac386187c5ca328aebc27851c2a2ff38f293)
Change-Id: Iad855f382a0daf50dac2537d4a91bfeaa9ff3799
forcepoint#93 fix crash on layout of specific rtf
Change-Id: Id81729de2efd6f65f1b51bdb437ca21a260eaf6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133481
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5277b953b29845555cba8f867c9c750e8bc510a5)
Change-Id: Id81729de2efd6f65f1b51bdb437ca21a260eaf6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133481
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5277b953b29845555cba8f867c9c750e8bc510a5)
forcepoint#90 fix crash on layout of specific rtf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132046
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 416cb37acae460b6ae8b175b5c5caf1601f030d4)
Change-Id: I17c227ab278ed5a2cc60449d1d005212f00ded89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132046
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 416cb37acae460b6ae8b175b5c5caf1601f030d4)
Change-Id: I17c227ab278ed5a2cc60449d1d005212f00ded89
forcepoint#94 fix crash on layout of specific html
Change-Id: I1874a431d5af9d56248a695e08a2f95b5292ba9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132179
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3b6ea366796f7f7e04fb60b9394c91e4790b5c72)
Change-Id: I1874a431d5af9d56248a695e08a2f95b5292ba9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132179
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3b6ea366796f7f7e04fb60b9394c91e4790b5c72)
forcepoint#92 fix crash on layout of specific doc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132142
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132148
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 0d0cee5e48ca523f11540e9ae0ff022692fd9dca)
Change-Id: Id40d25d05d10d641d071cddd2e1c84594ac777a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132142
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132148
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 0d0cee5e48ca523f11540e9ae0ff022692fd9dca)
Change-Id: Id40d25d05d10d641d071cddd2e1c84594ac777a6
forcepoint#89 don't remove page with footnote continuation frame
in browse/html/web mode
Change-Id: Ic821dd7f2cc1f47305b5fe2ced16d5168aedc0b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132045
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit e672a8351df5e9fcbdafa34857a16f2bd547ebd6)
in browse/html/web mode
Change-Id: Ic821dd7f2cc1f47305b5fe2ced16d5168aedc0b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132045
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit e672a8351df5e9fcbdafa34857a16f2bd547ebd6)
forcepoint#96 sw: delete fieldmarks in DelFullPara()
The problem is that CorrAbs() will move any position of a fieldmark
that's in the deleted SwTextNodes to a different node that doesn't have
the CH_TXT_ATR_FIELD*.
Then it will inevitably crash later when it can't find its chars.
The other problem is that if there's only a CH_TXT_ATR_FIELDSEP in the
deleted nodes, that fieldmark would then be missing it.
Just delete fieldmarks with positions in deleted nodes, that should work
fine for the usual cases where DelFullPara() is called.
Change-Id: I8dfac9a315d74025dbe1ed5ccb95b7c9121fb569
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132379
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 542673c0d4c6a992113999101f2c1bf21e0c5c22)
The problem is that CorrAbs() will move any position of a fieldmark
that's in the deleted SwTextNodes to a different node that doesn't have
the CH_TXT_ATR_FIELD*.
Then it will inevitably crash later when it can't find its chars.
The other problem is that if there's only a CH_TXT_ATR_FIELDSEP in the
deleted nodes, that fieldmark would then be missing it.
Just delete fieldmarks with positions in deleted nodes, that should work
fine for the usual cases where DelFullPara() is called.
Change-Id: I8dfac9a315d74025dbe1ed5ccb95b7c9121fb569
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132379
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 542673c0d4c6a992113999101f2c1bf21e0c5c22)
sw: prevent footnote frame against delete while it's moved
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130439
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0)
sw: really prevent footnote frame against delete while it's moved
This reverts commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0
It turns out that checking a single column's IsMovingFootnotes() is not
enough - as frames can move both forwards and backwards the entire chain
of columns would need to be checked.
(Most callers of MoveLowerFootnotes() move forwards, but one place in
tabfrm.cxx moves from a follow to master.)
But it turns out that this is probably the wrong way in any case: most
likely the intention in FormatAnchorFrameAndItsPrevs() is to format
previous frames in the same layout environment, so if there is a section
or column inside a footnote then this upper should be formatted, while
if the footnote is inside a section or column this upper should not be
formatted; this should make calls during MoveFootnotes_() safe as it
should prevent the formatting of frames in the footnote boss moving a
footnote that is already being moved.
So tweak the fix in commit fa1bcc22921941b2cd8a0b32fe0d15655d12d607
a little to make it more general.
Also it was previously possible that for a section with columns,
both the section branch and the column branch was taken, which seems
supperfluous.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130544
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3f569ffc9238e6bf2915e78bf21c844ca5f1270d)
add a layout test to exercise UXTSOREL
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130493
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 10d46c0498b89350645cf45e744a528d3d8f1ac1)
use Bitstream Vera Sans for consistent results with LIBREOFFICE-UXTSOREL.rtf
instead of Palatino Linotype which will typically get substituted
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133460
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ff27c0e35ebfdbe998c372b7a36df8b5577e1fd4)
Change-Id: I39487640322339fe4d511e845d9c6bced2ba9dad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130439
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0)
sw: really prevent footnote frame against delete while it's moved
This reverts commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0
It turns out that checking a single column's IsMovingFootnotes() is not
enough - as frames can move both forwards and backwards the entire chain
of columns would need to be checked.
(Most callers of MoveLowerFootnotes() move forwards, but one place in
tabfrm.cxx moves from a follow to master.)
But it turns out that this is probably the wrong way in any case: most
likely the intention in FormatAnchorFrameAndItsPrevs() is to format
previous frames in the same layout environment, so if there is a section
or column inside a footnote then this upper should be formatted, while
if the footnote is inside a section or column this upper should not be
formatted; this should make calls during MoveFootnotes_() safe as it
should prevent the formatting of frames in the footnote boss moving a
footnote that is already being moved.
So tweak the fix in commit fa1bcc22921941b2cd8a0b32fe0d15655d12d607
a little to make it more general.
Also it was previously possible that for a section with columns,
both the section branch and the column branch was taken, which seems
supperfluous.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130544
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3f569ffc9238e6bf2915e78bf21c844ca5f1270d)
add a layout test to exercise UXTSOREL
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130493
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 10d46c0498b89350645cf45e744a528d3d8f1ac1)
use Bitstream Vera Sans for consistent results with LIBREOFFICE-UXTSOREL.rtf
instead of Palatino Linotype which will typically get substituted
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133460
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ff27c0e35ebfdbe998c372b7a36df8b5577e1fd4)
Change-Id: I39487640322339fe4d511e845d9c6bced2ba9dad
an inconsistent SwTextFormatInfo index, len, text length case
seen on loading sw/qa/python/testdocuments/TESTMETA.odt
maybe since:
commit 2f3684b2289a8c46dc6144064a452cc529400f28
Date: Tue Jul 31 16:00:02 2018 +0200
[API CHANGE] add some more asserts to the string functions
but probably an underlying issue since conversion from UniString
to OUString
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit eb7fbe1f3a37d89b97bd8976bdc006099578c204)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132860
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 177589cb4f8ef20ff84dbfc141b145b28e57be83)
Change-Id: If731163fbc5e05b813ccd21df65164fe476cba9a
seen on loading sw/qa/python/testdocuments/TESTMETA.odt
maybe since:
commit 2f3684b2289a8c46dc6144064a452cc529400f28
Date: Tue Jul 31 16:00:02 2018 +0200
[API CHANGE] add some more asserts to the string functions
but probably an underlying issue since conversion from UniString
to OUString
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit eb7fbe1f3a37d89b97bd8976bdc006099578c204)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132860
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 177589cb4f8ef20ff84dbfc141b145b28e57be83)
Change-Id: If731163fbc5e05b813ccd21df65164fe476cba9a
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 +0000
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 <michael.stahl@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 37f39a4156069ba5f099045ce93370507d9ba215)
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 +0000
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 <michael.stahl@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 37f39a4156069ba5f099045ce93370507d9ba215)
forcepoint#82 back() called on empty vector
Change-Id: I8017777a58f1fef41d1545899868e333c2184c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131867
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 848ba18f3196a2fc64d08573eb9d1aeda074e758)
Change-Id: I8017777a58f1fef41d1545899868e333c2184c5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131867
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 848ba18f3196a2fc64d08573eb9d1aeda074e758)
forcepoint#86 RES_TXTATR_UNKNOWN_CONTAINER item put at invalid index
RES_CHRATR_BEGIN is 1, presumably RES_TXTATR_UNKNOWN_CONTAINER should
be stored in the last index
Change-Id: Id37fff41cbbccbc26fe5ccce6027014af7362729
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132040
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit f5ff8e0feb218a001e2ce5ced9ec4e13f2bff73d)
RES_CHRATR_BEGIN is 1, presumably RES_TXTATR_UNKNOWN_CONTAINER should
be stored in the last index
Change-Id: Id37fff41cbbccbc26fe5ccce6027014af7362729
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132040
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit f5ff8e0feb218a001e2ce5ced9ec4e13f2bff73d)
forcepoint#85 Conditional jump or move depends on uninitialised value
==398461== by 0xCDC7960: (anonymous namespace)::CopyUntil(char16_t*&, char16_t const*&, char16_t, bool) (strhelper.cxx:88)
==398461== by 0xCDC839F: psp::WhitespaceToSpace(rtl::OUString const&, bool) (strhelper.cxx:294)
==398461== by 0xCB54980: vcl::PDFWriterImpl::setOutlineItemText(int, rtl::OUString const&) (pdfwriter_impl.cxx:9875)
==398461== by 0xCB547FF: vcl::PDFWriterImpl::createOutlineItem(int, rtl::OUString const&, int) (pdfwriter_impl.cxx:9851)
==398461== by 0xCAF39B0: vcl::PDFWriter::CreateOutlineItem(int, rtl::OUString const&, int) (pdfwriter.cxx:383)
==398461== by 0xCABD7C8: vcl::GlobalSyncData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:250)
==398461== by 0xCAC0628: vcl::PDFExtOutDevData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:616)
==398461== by 0x3D06EA0F: PDFExport::Export(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (pdfexport.cxx:1004)
Change-Id: I6bc086997851ee06531a4a9ae263e2b26edfba84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132036
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 9d5703aa0b7d11db3568a2e0aaa462fe2dd98867)
==398461== by 0xCDC7960: (anonymous namespace)::CopyUntil(char16_t*&, char16_t const*&, char16_t, bool) (strhelper.cxx:88)
==398461== by 0xCDC839F: psp::WhitespaceToSpace(rtl::OUString const&, bool) (strhelper.cxx:294)
==398461== by 0xCB54980: vcl::PDFWriterImpl::setOutlineItemText(int, rtl::OUString const&) (pdfwriter_impl.cxx:9875)
==398461== by 0xCB547FF: vcl::PDFWriterImpl::createOutlineItem(int, rtl::OUString const&, int) (pdfwriter_impl.cxx:9851)
==398461== by 0xCAF39B0: vcl::PDFWriter::CreateOutlineItem(int, rtl::OUString const&, int) (pdfwriter.cxx:383)
==398461== by 0xCABD7C8: vcl::GlobalSyncData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:250)
==398461== by 0xCAC0628: vcl::PDFExtOutDevData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:616)
==398461== by 0x3D06EA0F: PDFExport::Export(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (pdfexport.cxx:1004)
Change-Id: I6bc086997851ee06531a4a9ae263e2b26edfba84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132036
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 9d5703aa0b7d11db3568a2e0aaa462fe2dd98867)
sw: avoid EXCEPTION_INT_DIVIDE_BY_ZERO
Seen in
https://crashreport.libreoffice.org/stats/signature/SwBookmarkPortion::DoPaint(SwTextPaintInfo%20const%20&,rtl::OUString%20&,SwFont%20&,int%20&)
Introduced by 4ce8120f1e53f7b81e653b01d141643013bc69ab
"tdf#45589 sw: create and paint text portions for bookmarks"
Change-Id: I7d025878164e1f97b86f9d129af9ba93e93b6ba3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133562
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 7c8b9fa98f4c5f7f5620e797dbbe24081e252548)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133602
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit e2ee797ebba6ee52387cbbd662ee35d84943f0ce)
Seen in
https://crashreport.libreoffice.org/stats/signature/SwBookmarkPortion::DoPaint(SwTextPaintInfo%20const%20&,rtl::OUString%20&,SwFont%20&,int%20&)
Introduced by 4ce8120f1e53f7b81e653b01d141643013bc69ab
"tdf#45589 sw: create and paint text portions for bookmarks"
Change-Id: I7d025878164e1f97b86f9d129af9ba93e93b6ba3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133562
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 7c8b9fa98f4c5f7f5620e797dbbe24081e252548)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133602
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit e2ee797ebba6ee52387cbbd662ee35d84943f0ce)
nss: depend on zlib
Required on WNT since 1c748fefc3c5b42e3548a1a7f5017a579982005a, may
be needed on other platforms if using --without-system-zlib.
Change-Id: Ib8e544d81881f425d257514fc475e272ca2e53ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132648
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
(cherry picked from commit b11a5d3900e3c19e94833c1b1e5218288320c3e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132609
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 37340124d29f77683fdbe6a3e10c4d80f5d4a499)
Required on WNT since 1c748fefc3c5b42e3548a1a7f5017a579982005a, may
be needed on other platforms if using --without-system-zlib.
Change-Id: Ib8e544d81881f425d257514fc475e272ca2e53ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132648
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
(cherry picked from commit b11a5d3900e3c19e94833c1b1e5218288320c3e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132609
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 37340124d29f77683fdbe6a3e10c4d80f5d4a499)
curl: upgrade to release 7.83.1
Fixes CVE-2022-27774 CVE-2022-27775 CVE-2022-27776 CVE-2022-27781
plus 6 more CVEs that shouldn't affect LO.
Remove obsolete configure-eval-fix.patch.0.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134225
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 58a3bf5199818e30ef4207213f29692d81b519c6)
upgrade to curl-7.81.0
Change-Id: I0a34239bfb16bf19e25bf374c7f36c4cdf1776c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128783
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 40a84af1bdd7b3c414a8a78ca32b0951c03f9976)
Change-Id: Ifbd7ff5acf390df1d95d6b8be0dc7751e4753bbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134246
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f668663d63d5b0f37d4727b54585c3b67ab92162)
Fixes CVE-2022-27774 CVE-2022-27775 CVE-2022-27776 CVE-2022-27781
plus 6 more CVEs that shouldn't affect LO.
Remove obsolete configure-eval-fix.patch.0.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134225
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 58a3bf5199818e30ef4207213f29692d81b519c6)
upgrade to curl-7.81.0
Change-Id: I0a34239bfb16bf19e25bf374c7f36c4cdf1776c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128783
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 40a84af1bdd7b3c414a8a78ca32b0951c03f9976)
Change-Id: Ifbd7ff5acf390df1d95d6b8be0dc7751e4753bbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134246
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f668663d63d5b0f37d4727b54585c3b67ab92162)
upgrade curl to 7.79.1
includes:
CVE-2021-22945: clear the leftovers pointer when sending succeeds
CVE-2021-22946: do not ignore --ssl-reqd
CVE-2021-22947: reject STARTTLS server response pipelining
Change-Id: I0047bdaa7e6e3aed1317eb014d2051a4d5ac5964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a08d1dc4ee904428ef6f78208cc2508d3fc3717b)
includes:
CVE-2021-22945: clear the leftovers pointer when sending succeeds
CVE-2021-22946: do not ignore --ssl-reqd
CVE-2021-22947: reject STARTTLS server response pipelining
Change-Id: I0047bdaa7e6e3aed1317eb014d2051a4d5ac5964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a08d1dc4ee904428ef6f78208cc2508d3fc3717b)
libxml2: upgrade to release 2.9.14
Fixes CVE-2022-29824.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit f670422a01e7336ba8a554331f3781ec7f5c4e8c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133831
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit e2104950ccd738cde5865ace63af5b3501df7362)
Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df
Fixes CVE-2022-29824.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit f670422a01e7336ba8a554331f3781ec7f5c4e8c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133831
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit e2104950ccd738cde5865ace63af5b3501df7362)
Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df
lok-calc: new callback for print ranges
With this callback the lok clients can read and draw the print ranges on
each sheet of the Calc document.
Change-Id: Ie19351d4420e0f3d4191f6a354ce99ab830aede2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134375
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
With this callback the lok clients can read and draw the print ranges on
each sheet of the Calc document.
Change-Id: Ie19351d4420e0f3d4191f6a354ce99ab830aede2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134375
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
lok: respect zoom in calc tile rendering of EditView
Issue was that when using 150% zoom in LOK and editing
some textbox inside Calc spreadsheet - we didn't see
content of it (but tiles were invalidated).
In other view we have seen textbox in correct place
if zoom was 100%.
To fix that we need to pass zoom factor and use it.
Change-Id: Ib1cf49af02d0637e09ce68c5c2c41ffb3014c701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134288
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Issue was that when using 150% zoom in LOK and editing
some textbox inside Calc spreadsheet - we didn't see
content of it (but tiles were invalidated).
In other view we have seen textbox in correct place
if zoom was 100%.
To fix that we need to pass zoom factor and use it.
Change-Id: Ib1cf49af02d0637e09ce68c5c2c41ffb3014c701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134288
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Bump version to 21.06.29.1
Change-Id: If0e308b896374ba1dc0366b8992f379e86148c62
Change-Id: If0e308b896374ba1dc0366b8992f379e86148c62
Fix a problem with multiple tunneled dialogs in Online
If your Collabora Online installation uses VCL theming, and you have
two tunnelled dialogs open (with the second one being "logically" a
child of the first, even though I don't think the code in Online or
here in core necessarily has any such concepts), typing into a text
field of the second dialog is very hard. One has to keep clicking in
the field for each character typed. Core and Online are confused which
dialog should have focus, or something.
This change seems to help, but I definitely don't fully understand the
mechanisms. The change affects only LibreOfficeKit clients,
i.e. mainly Collabora Online.
Change-Id: I5337989f5ea57a72d83691653f554e7754667fe8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134108
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
If your Collabora Online installation uses VCL theming, and you have
two tunnelled dialogs open (with the second one being "logically" a
child of the first, even though I don't think the code in Online or
here in core necessarily has any such concepts), typing into a text
field of the second dialog is very hard. One has to keep clicking in
the field for each character typed. Core and Online are confused which
dialog should have focus, or something.
This change seems to help, but I definitely don't fully understand the
mechanisms. The change affects only LibreOfficeKit clients,
i.e. mainly Collabora Online.
Change-Id: I5337989f5ea57a72d83691653f554e7754667fe8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134108
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
tdf#149023 set property immediately on change
and not in an idle which may be triggered on losing focus and
arrive when a new shape is selected
Change-Id: I7cec8f1c9bf864cdb30516dece1ef9d6b689a94e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134211
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
and not in an idle which may be triggered on losing focus and
arrive when a new shape is selected
Change-Id: I7cec8f1c9bf864cdb30516dece1ef9d6b689a94e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134211
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
sw: fix crash in SwDrawShell::Execute()
Crashreport signature:
SwDrawShell::Execute(SfxRequest&) [clone .cold]
include/svx/svdhdl.hxx:194
SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool)
sfx2/source/control/dispatch.cxx:255
which is a bit tricky to read (probably due to LTO), but what happens
here is that the handle index is user input and we look at index up in a
list without error handling.
This is a problem since commit 7eed711a6115bf892c998cbd73a2c5b706c6f99d
(Extended MoveShapeHandle command for Anchors as well, 2021-05-24),
which assumed that handle indexes and the handle list can't get out of
sync.
Fix the problem similar to what commit
48beccf52413981d3d1c525a81a2c57048abe261 (sw: fix crash in
SwView::Execute(), 2021-09-03) did at SID_MOVE_SHAPE_HANDLE handler for
Writer images (this one is for Draw shapes).
This fix just makes sure we don't crash, there may be some deeper reason
why the handle index is out of sync with the handle list in the first
place.
Change-Id: I8f3a25d74082984cedce09362a690f24d7236ba6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134046
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Crashreport signature:
SwDrawShell::Execute(SfxRequest&) [clone .cold]
include/svx/svdhdl.hxx:194
SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool)
sfx2/source/control/dispatch.cxx:255
which is a bit tricky to read (probably due to LTO), but what happens
here is that the handle index is user input and we look at index up in a
list without error handling.
This is a problem since commit 7eed711a6115bf892c998cbd73a2c5b706c6f99d
(Extended MoveShapeHandle command for Anchors as well, 2021-05-24),
which assumed that handle indexes and the handle list can't get out of
sync.
Fix the problem similar to what commit
48beccf52413981d3d1c525a81a2c57048abe261 (sw: fix crash in
SwView::Execute(), 2021-09-03) did at SID_MOVE_SHAPE_HANDLE handler for
Writer images (this one is for Draw shapes).
This fix just makes sure we don't crash, there may be some deeper reason
why the handle index is out of sync with the handle list in the first
place.
Change-Id: I8f3a25d74082984cedce09362a690f24d7236ba6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134046
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
enable Skia on big-endian too
Without this the build will #error out, and despite the disclaimer
it reportedly works fine.
https://lists.freedesktop.org/archives/libreoffice/2022-May/088838.html
Change-Id: I0e87b31647fe5107bca9b58d8f4af5fc0c67cd65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134032
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit b06663135f9c7c08f5866a87a1fb0932df5af8bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134057
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Without this the build will #error out, and despite the disclaimer
it reportedly works fine.
https://lists.freedesktop.org/archives/libreoffice/2022-May/088838.html
Change-Id: I0e87b31647fe5107bca9b58d8f4af5fc0c67cd65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134032
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit b06663135f9c7c08f5866a87a1fb0932df5af8bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134057
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
sw: don't copy useless char escapement to next node on split
Unless autocorrect notices such a just-typed content, pressing enter at
the end of a paragraph which ends with superscript or subscript text
will carry over that formatting to the next paragraph, which is hardly
wanted by any user. Technically this is not copying: paragraph split
works by creating a next text node, moving all content & formatting to
this next node, then move part of the content back to the previous node,
which is all content in case of an enter at the end of a paragraph.
Copying character formatting over to the next text node makes sense:
e.g. paragraph alignment or boldness is probably something a user wants
to continue using in the next text node. But superscript is typically
created by autocorrect in English text for "1st" and similar input, this
is usually unwanted in the next paragraph.
Fix the problem by special-casing the RES_CHRATR_ESCAPEMENT case and
remove the matching SvxEscapementItem from the hints of the just created
next paragraph in case it's there.
A possible future improvement would be to support this when there are
other active (direct formatting) hints, in which case going via
SwDoc::ResetAttrs() is probably a better choice, but the effects of that
for undo and redlining is not clear.
(cherry picked from commit 71019ec15bd3fe15385443b68614fd2402e0040f)
Conflicts:
sw/qa/core/txtnode/txtnode.cxx
Change-Id: I57feb99d9a31f16c277eba44f464ab49936b65aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134043
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Unless autocorrect notices such a just-typed content, pressing enter at
the end of a paragraph which ends with superscript or subscript text
will carry over that formatting to the next paragraph, which is hardly
wanted by any user. Technically this is not copying: paragraph split
works by creating a next text node, moving all content & formatting to
this next node, then move part of the content back to the previous node,
which is all content in case of an enter at the end of a paragraph.
Copying character formatting over to the next text node makes sense:
e.g. paragraph alignment or boldness is probably something a user wants
to continue using in the next text node. But superscript is typically
created by autocorrect in English text for "1st" and similar input, this
is usually unwanted in the next paragraph.
Fix the problem by special-casing the RES_CHRATR_ESCAPEMENT case and
remove the matching SvxEscapementItem from the hints of the just created
next paragraph in case it's there.
A possible future improvement would be to support this when there are
other active (direct formatting) hints, in which case going via
SwDoc::ResetAttrs() is probably a better choice, but the effects of that
for undo and redlining is not clear.
(cherry picked from commit 71019ec15bd3fe15385443b68614fd2402e0040f)
Conflicts:
sw/qa/core/txtnode/txtnode.cxx
Change-Id: I57feb99d9a31f16c277eba44f464ab49936b65aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134043
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Bump package version to 21.06.28.1
Change-Id: I9c6a3393b1c8d9bf8712099f7517e79da501c2ed
Change-Id: I9c6a3393b1c8d9bf8712099f7517e79da501c2ed
tdf#148683 sw: fix crash on deleting text with redlining enabled, but hidden
Regression from commit 32902f66e7749b2d06d13f50416be5323a0c0ea9
(sw_redlinehide: make layout based Show/Hide mode the default,
2018-11-30), deleting some text in the middle of the paragraph with the
bugdoc results in an assertion failure in the SwDrawTextInfo ctor.
Normally this doesn't happen on text deletion as we already have a
mechanism for truncating no longer needed lines in
SwTextFrame::Format_(), though that only checks the length of the
current line.
Fix the problem by extending this mechanism to also check the remaining
lines: if change tracking is on and the total of all line lengths is
more than the string length of the text frame, then time to
re-calculate.
It seems this is not needed in practice when redlining is disabled,
though we might want to enable this for the non-redline case as well in
the future.
(cherry picked from commit 515bf5d4afa3a8ed413fd6f17f66fa98b6dbf29e)
Conflicts:
sw/qa/core/text/text.cxx
Change-Id: Iede03e11daceb3c2b614a301e21560b075a60c01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133692
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Regression from commit 32902f66e7749b2d06d13f50416be5323a0c0ea9
(sw_redlinehide: make layout based Show/Hide mode the default,
2018-11-30), deleting some text in the middle of the paragraph with the
bugdoc results in an assertion failure in the SwDrawTextInfo ctor.
Normally this doesn't happen on text deletion as we already have a
mechanism for truncating no longer needed lines in
SwTextFrame::Format_(), though that only checks the length of the
current line.
Fix the problem by extending this mechanism to also check the remaining
lines: if change tracking is on and the total of all line lengths is
more than the string length of the text frame, then time to
re-calculate.
It seems this is not needed in practice when redlining is disabled,
though we might want to enable this for the non-redline case as well in
the future.
(cherry picked from commit 515bf5d4afa3a8ed413fd6f17f66fa98b6dbf29e)
Conflicts:
sw/qa/core/text/text.cxx
Change-Id: Iede03e11daceb3c2b614a301e21560b075a60c01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133692
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
sw: restore UI language to en while saving
Because the XML writer used in sw invokes the
translation logic, which uses the UI language,
saving can fail in case there are multiple
views with different langauges. This restores
the default language before saving to avoid
such issues and to make sure the document
xml is generated in the default language.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Change-Id: Ibc0813de33cf7cf3528b0ff1d95560e799903fb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133676
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Because the XML writer used in sw invokes the
translation logic, which uses the UI language,
saving can fail in case there are multiple
views with different langauges. This restores
the default language before saving to avoid
such issues and to make sure the document
xml is generated in the default language.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Change-Id: Ibc0813de33cf7cf3528b0ff1d95560e799903fb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133676
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
svx: calculate object range before using it
Change-Id: I01f0176542e9d6f36a2f7bbc870a9e337705a5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133454
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I01f0176542e9d6f36a2f7bbc870a9e337705a5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133454
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
lok: don't render active textbox on all slides
when we render tiles for slide previews we use
viewid = 0 (first session)
so when first session edits any textbox and in other
session we request slide previews (eg. after new slide was added)
then we received tile with additional text from the first session
this is caused by:
commit bee4ff508a456a1552aacdf6fc838b8b7cffb9ec
desktop lok: avoid unnecessary setPart() in paintPartTile()
If possible, switch views, not parts, that way started Impress text
edits don't end as a side-effect.
but later there was a fix which doesn't trigger closing of texbox
editing when switching parts:
commit ce7bf351972bbfd64ca99e8d2fb4c5f77591c9e0
impress: don't exit textbox editing when new slide was added
so we don't need that in all cases...
to fix issue described above: still switch views instead of parts
when possible - but avoid views where editing is active
Change-Id: Ib6e66a85b9ca68d6e67e3d9cb17060aa42b85220
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133202
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
when we render tiles for slide previews we use
viewid = 0 (first session)
so when first session edits any textbox and in other
session we request slide previews (eg. after new slide was added)
then we received tile with additional text from the first session
this is caused by:
commit bee4ff508a456a1552aacdf6fc838b8b7cffb9ec
desktop lok: avoid unnecessary setPart() in paintPartTile()
If possible, switch views, not parts, that way started Impress text
edits don't end as a side-effect.
but later there was a fix which doesn't trigger closing of texbox
editing when switching parts:
commit ce7bf351972bbfd64ca99e8d2fb4c5f77591c9e0
impress: don't exit textbox editing when new slide was added
so we don't need that in all cases...
to fix issue described above: still switch views instead of parts
when possible - but avoid views where editing is active
Change-Id: Ib6e66a85b9ca68d6e67e3d9cb17060aa42b85220
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133202
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
lok: reset ui mode state when switch to notebookbar cancelled
We have to keep state in the register in sync with the view.
When we cancelled notebookbar usage we need to revert Default state
so next time we will be able to activate notebookbar.
Change-Id: Ie5f7d0160c9c22c6621aca73b2cdd7197f86ff78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130341
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
We have to keep state in the register in sync with the view.
When we cancelled notebookbar usage we need to revert Default state
so next time we will be able to activate notebookbar.
Change-Id: Ie5f7d0160c9c22c6621aca73b2cdd7197f86ff78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130341
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Make name dialog async
Including making the warning subdialog async
Signed-off-by: NickWingate <nick.wingate@collabora.com>
Change-Id: If3560a86ac349f0f6a5bc0ac19ba405ac4f04b36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131654
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Including making the warning subdialog async
Signed-off-by: NickWingate <nick.wingate@collabora.com>
Change-Id: If3560a86ac349f0f6a5bc0ac19ba405ac4f04b36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131654
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Fix regression in the iOS app (and possibly the Android and GTK apps)
The problem was caused by my remote font downloading changes. We need
to be more careful in lo_initialize() and libreofficekit_hook_2() to
distinguish whether the code is called from "normal" Online (with
"pre-initialisation" through lok_preinit_2()) or otherwise, for
instance the iOS app, where not pre-initialisation is done.
Sadly, this fix makes state handling in init.c even more complex with
one more static Boolean flag.
Change-Id: I2a8fa96740eb79725aa162cf7adc86d49a8ba603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133175
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
The problem was caused by my remote font downloading changes. We need
to be more careful in lo_initialize() and libreofficekit_hook_2() to
distinguish whether the code is called from "normal" Online (with
"pre-initialisation" through lok_preinit_2()) or otherwise, for
instance the iOS app, where not pre-initialisation is done.
Sadly, this fix makes state handling in init.c even more complex with
one more static Boolean flag.
Change-Id: I2a8fa96740eb79725aa162cf7adc86d49a8ba603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133175
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Bump version to 21.06.27.1
Change-Id: I35c4f6ddb879ec685a1b67d5a7d9107697f593e4
Change-Id: I35c4f6ddb879ec685a1b67d5a7d9107697f593e4
tdf#147861 sw ms export: DI_SUB_MASK must exclude FIXED now
This is a follow-up to
7.4 commit daef39352b008fc1f903fd8c09288ff5e772fa42
There is only one place in which DI_SUB_MASK is used,
so I'm just changing it to what it could have always been,
since it never was actually used to mask out DI_SUB_FIXED.
Otherwise, I might have made this a MASK2 or whatever.
The issue here is that AUTHOR was not being recognized
when it was paired with FIXED, so every FIXEDFLD was
ended up being considered as a date/time.
In practice, this didn't really change anything
because bWriteExpand already ignored any of
these areas of the code. It is only when I turn off
bWriteExpand as I implement fixes that I am seeing
the wrong field type being created.
And regardless, since the field is FIXED, the visible
content remains the same anyway (until someone in MS Word
refreshes the field with F9).
Both Author and date have the same field name ":Created"
so I couldn't super easily test this.
Change-Id: Icd2d0be2d3fbe24dc4763e0e25801569bcca471b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132660
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit e61eed211766f26a3896c1d912dc7349abbe823d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132698
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit 2e6acddd815bca6261634b69b015c6deead74b58)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132702
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This is a follow-up to
7.4 commit daef39352b008fc1f903fd8c09288ff5e772fa42
There is only one place in which DI_SUB_MASK is used,
so I'm just changing it to what it could have always been,
since it never was actually used to mask out DI_SUB_FIXED.
Otherwise, I might have made this a MASK2 or whatever.
The issue here is that AUTHOR was not being recognized
when it was paired with FIXED, so every FIXEDFLD was
ended up being considered as a date/time.
In practice, this didn't really change anything
because bWriteExpand already ignored any of
these areas of the code. It is only when I turn off
bWriteExpand as I implement fixes that I am seeing
the wrong field type being created.
And regardless, since the field is FIXED, the visible
content remains the same anyway (until someone in MS Word
refreshes the field with F9).
Both Author and date have the same field name ":Created"
so I couldn't super easily test this.
Change-Id: Icd2d0be2d3fbe24dc4763e0e25801569bcca471b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132660
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit e61eed211766f26a3896c1d912dc7349abbe823d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132698
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit 2e6acddd815bca6261634b69b015c6deead74b58)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132702
Reviewed-by: Andras Timar <andras.timar@collabora.com>
unit test: use temp copy in testInvalidEntrySave()
Use a temporary copy of the source file to run this test otherwise it
will execute a .uno:Save on the original document in the git tree!
Change-Id: I673aad64453e72a9140efcad2b0ff9c0ceabc038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132851
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Use a temporary copy of the source file to run this test otherwise it
will execute a .uno:Save on the original document in the git tree!
Change-Id: I673aad64453e72a9140efcad2b0ff9c0ceabc038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132851
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
sc: convert optimal width/height and normal width/height dialog to async
Signed-off-by: rash419 <rashesh.padia@collabora.com>
Change-Id: I96f6d90692d7767bdc276f753897bdc392c90411
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132919
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Signed-off-by: rash419 <rashesh.padia@collabora.com>
Change-Id: I96f6d90692d7767bdc276f753897bdc392c90411
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132919
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Follow-up fix to Collabora Online "addfont" handling: avoid assertion failure
Change-Id: Ib75954a39d515088dbd432d0aa0ca5893194ecc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132969
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Change-Id: Ib75954a39d515088dbd432d0aa0ca5893194ecc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132969
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
lok: unit test for invalid entry save
Unit test related to the fix
lok: avoid validation-dialog yield when saving
e0175ee821eaff56c4b8e0a1b7afa1cabe0ab593
The test ensures that the document is marked unmodified after save has
been executed in the middle of entering partial data to a validation
cell.
Change-Id: Idffd6d647034e128d0d800fe8e29efc333c03db6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132653
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Unit test related to the fix
lok: avoid validation-dialog yield when saving
e0175ee821eaff56c4b8e0a1b7afa1cabe0ab593
The test ensures that the document is marked unmodified after save has
been executed in the middle of entering partial data to a validation
cell.
Change-Id: Idffd6d647034e128d0d800fe8e29efc333c03db6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132653
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131250
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131250
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
[cp] This label is too long for Online context menus
https://github.com/CollaboraOnline/online/issues/4369
Change-Id: I15193f0c78ae1fa44e9ddea00083b09da7fbbddf
https://github.com/CollaboraOnline/online/issues/4369
Change-Id: I15193f0c78ae1fa44e9ddea00083b09da7fbbddf
Bump version to 21.06.26.1
Change-Id: Ib342ce38a00855a057991568eea464a299789824
Change-Id: Ib342ce38a00855a057991568eea464a299789824
lok: load template documents as regular documents
otherwise lok cannot save them directly because
libreoffice will try to open a save-as dialog
For odg, change the draw8_template type draw8
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I34b0ed03adcac89eaa926f8ae6c57e6f622a90f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132633
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
otherwise lok cannot save them directly because
libreoffice will try to open a save-as dialog
For odg, change the draw8_template type draw8
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I34b0ed03adcac89eaa926f8ae6c57e6f622a90f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132633
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
lok: avoid validation-dialog yield when saving
Disable error dialog box when about to save in lok mode as this
ultimately invokes SvpSalInstance::DoYield() when we want to save
immediately without committing any erroneous input in possibly a cell
with validation rules. After save is complete the user can continue
editing.
Change-Id: Iffa0766ad594db75f57158986c4e1d2646f71da4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132410
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Disable error dialog box when about to save in lok mode as this
ultimately invokes SvpSalInstance::DoYield() when we want to save
immediately without committing any erroneous input in possibly a cell
with validation rules. After save is complete the user can continue
editing.
Change-Id: Iffa0766ad594db75f57158986c4e1d2646f71da4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132410
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
lok: send status update for .uno:SplitCell
Change-Id: Ic972d3ff3334f4c3a507868a95ac955c9ffbc614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132585
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Change-Id: Ic972d3ff3334f4c3a507868a95ac955c9ffbc614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132585
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Bump version to 21.06.25.1
Change-Id: I4c5769ee5877ec8534ac28343a42e22610cd7348
Change-Id: I4c5769ee5877ec8534ac28343a42e22610cd7348
sw lok: fix missing cache invalidation in SwRedlineTable::Insert()
The trouble is that the FillRects() call in
SwRedlineTable::LOKRedlineNotification() builds a text portion list, but
that's not yet correct, and later we don't build a text portion list as
we already have one.
Fix this similar to the frame size problem by invalidating the cache
after we got our rectangles.
Change-Id: Ida759be418bc3706810d9774e060d06143893bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132521
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 81bcee9866661ee0558474467d83c0fa929e932c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132392
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
The trouble is that the FillRects() call in
SwRedlineTable::LOKRedlineNotification() builds a text portion list, but
that's not yet correct, and later we don't build a text portion list as
we already have one.
Fix this similar to the frame size problem by invalidating the cache
after we got our rectangles.
Change-Id: Ida759be418bc3706810d9774e060d06143893bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132521
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 81bcee9866661ee0558474467d83c0fa929e932c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132392
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
add a few more languages to Android build again
Change-Id: I452790635068b49c8b4fb9f1a60d8296ccd36fa1
Change-Id: I452790635068b49c8b4fb9f1a60d8296ccd36fa1
add a few more languages to Android build
Change-Id: If505c84658504af64a70797ec33fcd4b707a5255
Change-Id: If505c84658504af64a70797ec33fcd4b707a5255
nss: build with zlib module on WNT
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
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 <michael.stahl@allotropia.de>
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 <michael.stahl@allotropia.de>
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 <michael.stahl@allotropia.de>
(cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Change-Id: Id99cbf2b50a4ebf289dae6fc67e22e20afcda35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131976
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
add Initialization Vectors to password storage
old ones default to the current all zero case and continue to work
as before
Change-Id: I6fe3b02fafcce1b5e7133e77e76a5118177d77af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131974
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 192fa1e3bfc6269f2ebb91716471485a56074aea)
old ones default to the current all zero case and continue to work
as before
Change-Id: I6fe3b02fafcce1b5e7133e77e76a5118177d77af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131974
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 192fa1e3bfc6269f2ebb91716471485a56074aea)
make hash encoding match decoding
Seeing as old versions of the hash may be in the users config, add a
StorageVersion field to the office config Passwords section which
defaults to 0 to indicate the old hash is in use.
Try the old varient when StorageVersion is 0. When a new encoded master
password it set write StorageVersion of 1 to indicate a new hash is in
use and use the new style when StorageVersion is 1.
Change-Id: I3174c37a5891bfc849984e0ec5c2c392b9c6e7b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132080
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Seeing as old versions of the hash may be in the users config, add a
StorageVersion field to the office config Passwords section which
defaults to 0 to indicate the old hash is in use.
Try the old varient when StorageVersion is 0. When a new encoded master
password it set write StorageVersion of 1 to indicate a new hash is in
use and use the new style when StorageVersion is 1.
Change-Id: I3174c37a5891bfc849984e0ec5c2c392b9c6e7b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132080
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Bump version to 21.06.24.1
Change-Id: I080116876bbdfda4d9da7a36b0ca49135140a0b4
Change-Id: I080116876bbdfda4d9da7a36b0ca49135140a0b4
tdf#132557: PPTX import: Workaround for slide footer shape presets
It appears that placeholder shapes with service names:
- com.sun.star.presentation.TitleTextShape
- com.sun.star.presentation.DateTimeShape
- com.sun.star.presentation.FooterShape
- com.sun.star.presentation.SlideNumberShape
...
Are unable to have custom shapes in Impress. (i.e. can't be
ellipse, triangle etc.). These presets get specified in OOXML
with <a:prstGeom prst="ellipse"/> inside spPr (shape properties).
Therefore with similar results to the PPT import, a workaround
is applied where slide footers which have non default shapes
are imported with com.sun.star.drawing.CustomShapes service.
The layout/master footers are left as is since if they were to
be imported as CustomShapes they would appear on each slide
even if the slide had those footers enabled or not.
Change-Id: Ic8a8ab3f6dfb7367ecd2c619ce888bf77abef460
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129890
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
It appears that placeholder shapes with service names:
- com.sun.star.presentation.TitleTextShape
- com.sun.star.presentation.DateTimeShape
- com.sun.star.presentation.FooterShape
- com.sun.star.presentation.SlideNumberShape
...
Are unable to have custom shapes in Impress. (i.e. can't be
ellipse, triangle etc.). These presets get specified in OOXML
with <a:prstGeom prst="ellipse"/> inside spPr (shape properties).
Therefore with similar results to the PPT import, a workaround
is applied where slide footers which have non default shapes
are imported with com.sun.star.drawing.CustomShapes service.
The layout/master footers are left as is since if they were to
be imported as CustomShapes they would appear on each slide
even if the slide had those footers enabled or not.
Change-Id: Ic8a8ab3f6dfb7367ecd2c619ce888bf77abef460
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129890
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
tdf#147861 writerfilter: use GetFieldResult, not current DocProperty
Import DOCX and RTF DocProperty fields as "fixed" if the displayed
text does not match the File - Properties - Custom variable's content.
Otherwise LO will automatically update the field and show the wrong
contents (because MS Word requires the user to manually refresh via F9).
(cherry picked from commit c4cb1d1dd581a5f120d9cf8b1d4274ec38f3eabe)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: Id5d3d0794e81b13465c5e824f1e994f563e62c1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132347
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Import DOCX and RTF DocProperty fields as "fixed" if the displayed
text does not match the File - Properties - Custom variable's content.
Otherwise LO will automatically update the field and show the wrong
contents (because MS Word requires the user to manually refresh via F9).
(cherry picked from commit c4cb1d1dd581a5f120d9cf8b1d4274ec38f3eabe)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: Id5d3d0794e81b13465c5e824f1e994f563e62c1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132347
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
tdf#147861 ww8import: solve TODO: not fixed-field if equal
Do not mark the field as "fixed" if the displayed string
matches the internal variable. This allows changing the variable
within LO and having the field update to reflect that change,
which is the way that these fields are supposed to work
(although in MS Word they only update manually via F9
which is why some needed to be fixed in the first place).
(cherry picked from commit f5c2085e70c40370a790868d4683133a41e6599d)
Change-Id: Id359cbf0b48e63bddab3e45871326988467d7ddb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132346
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Do not mark the field as "fixed" if the displayed string
matches the internal variable. This allows changing the variable
within LO and having the field update to reflect that change,
which is the way that these fields are supposed to work
(although in MS Word they only update manually via F9
which is why some needed to be fixed in the first place).
(cherry picked from commit f5c2085e70c40370a790868d4683133a41e6599d)
Change-Id: Id359cbf0b48e63bddab3e45871326988467d7ddb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132346
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
tdf#147861 ww8export: DI_CUSTOM write fixed field, not plain txt
It looks like we just punt on fields, and try to avoid
round-tripping them as much as possible. And for good reason
since they are tough and poorly handled.
But since import of DI_CUSTOM has improved for DOC,
it would be nice to be able to round-trip it as well,
so that is what this allows.
It also opens the door to round-trip more field
situations as well.
This patch depends on the earlier related patch
that removes " (fixed)" from the FieldName.
RTF and DOCX also export OK, but import needs some love.
(cherry picked from commit 7974d5ef1446f106a5f7c45b76ea2728fe4b18ce)
Change-Id: I32d9aa1fea12763cc30a79bcfa6d1d1e19d2c619
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132345
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
It looks like we just punt on fields, and try to avoid
round-tripping them as much as possible. And for good reason
since they are tough and poorly handled.
But since import of DI_CUSTOM has improved for DOC,
it would be nice to be able to round-trip it as well,
so that is what this allows.
It also opens the door to round-trip more field
situations as well.
This patch depends on the earlier related patch
that removes " (fixed)" from the FieldName.
RTF and DOCX also export OK, but import needs some love.
(cherry picked from commit 7974d5ef1446f106a5f7c45b76ea2728fe4b18ce)
Change-Id: I32d9aa1fea12763cc30a79bcfa6d1d1e19d2c619
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132345
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
tdf#147861 ww8import: use GetFieldResult, not current DocProperty
In all the testing I could think of on DOCX and DOC examples
(and only a very few exist in the unit tests)
the actual value of the DocProperty was irrelevant to
what Word shows as the document loads.
It always takes the in-document, as-last-seen static text.
As a way to hack a fix using existing capabilities,
I marked as FIXEDFLD the unknown custom fields
that weren't handled separately.
That fixes what is displayed as the import value,
(which of course means that F9 will no longer
return a modification back to the DocProperty value).
It also means the (fixed) field is lost on export,
but a follow-up patch handles that for DOC/RTF/DOCX.
There were NO DI_CUSTOM examples in existing ww8 tests, but:
-ooxmlexport8: fdo74745.docx, fdo81486.docx
-ooxmlexport10: tdf92157.docx
and in these cases the plain text matched the variable anyway,
but a manual manipulation showed that LO is importing DOCX wrong
as well, so a similar import fix needs to happen for RTF/DOCX.
My fear is that there are some special-magic-associations
that worked properly the old way by accident that I will
break by marking them as fixed. No backporting please
since obviously very few people report bugs about fields.
(cherry picked from commit 377e6f7e8556516b6d1698c58857a5662e6f5660)
Conflicts:
sw/qa/extras/ww8export/ww8export3.cxx
Change-Id: I3f167eb3bd570b66ee829241bf9d31d557fc8749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132344
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
In all the testing I could think of on DOCX and DOC examples
(and only a very few exist in the unit tests)
the actual value of the DocProperty was irrelevant to
what Word shows as the document loads.
It always takes the in-document, as-last-seen static text.
As a way to hack a fix using existing capabilities,
I marked as FIXEDFLD the unknown custom fields
that weren't handled separately.
That fixes what is displayed as the import value,
(which of course means that F9 will no longer
return a modification back to the DocProperty value).
It also means the (fixed) field is lost on export,
but a follow-up patch handles that for DOC/RTF/DOCX.
There were NO DI_CUSTOM examples in existing ww8 tests, but:
-ooxmlexport8: fdo74745.docx, fdo81486.docx
-ooxmlexport10: tdf92157.docx
and in these cases the plain text matched the variable anyway,
but a manual manipulation showed that LO is importing DOCX wrong
as well, so a similar import fix needs to happen for RTF/DOCX.
My fear is that there are some special-magic-associations
that worked properly the old way by accident that I will
break by marking them as fixed. No backporting please
since obviously very few people report bugs about fields.
(cherry picked from commit 377e6f7e8556516b6d1698c58857a5662e6f5660)
Conflicts:
sw/qa/extras/ww8export/ww8export3.cxx
Change-Id: I3f167eb3bd570b66ee829241bf9d31d557fc8749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132344
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
related tdf#147861: cleanup + a function provides the name
This is not quite a NonFunctionalChange because it avoids
adding " (fixed)" to the name. But that is what I want
anyway for bug 147861, so this is an all-around good simplification.
Plus, the writerfilter loop doesn't need to run if an
inside clause will never be true anyway.
Putting this cleanup separately helps highlight the
actual fix and not clutter the real patches.
(cherry picked from commit a13faccd7e8c6503e96e9342a8615b4542b0601f)
Change-Id: I12f345cc92627398ad00fe32b64b98b54e5ed14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132343
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This is not quite a NonFunctionalChange because it avoids
adding " (fixed)" to the name. But that is what I want
anyway for bug 147861, so this is an all-around good simplification.
Plus, the writerfilter loop doesn't need to run if an
inside clause will never be true anyway.
Putting this cleanup separately helps highlight the
actual fix and not clutter the real patches.
(cherry picked from commit a13faccd7e8c6503e96e9342a8615b4542b0601f)
Change-Id: I12f345cc92627398ad00fe32b64b98b54e5ed14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132343
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
keep draw and impress sidebar page setup different in sidebar
in draw sidebar "Page" deck displayed title "Slide"
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Iea7c95bc8c7ef2054c04c6cae77a254c969e1156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132314
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
in draw sidebar "Page" deck displayed title "Slide"
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Iea7c95bc8c7ef2054c04c6cae77a254c969e1156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132314
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
sw: fix crash in SwAttrSet::CopyToModify()
Regression from commit 938a4d6624a78f3e272b3c4c07f314cb0c6db723
(tdf#128375 sw: fix copying RES_PARATR_LIST_AUTOFMT to different SwDoc,
2019-11-01), the problem is that we may get an autofmt pool item which
is set, but its style handle is empty. Assume that this is the same case
as having no autofmt at all.
(cherry picked from commit ddfafd9b67e6e61c144b29ac73bbafb413ddf03b)
Conflicts:
sw/Module_sw.mk
sw/source/core/attr/swatrset.cxx
[ Help backporting by also picking a single hunk from commit
1ad26c9fc237e00247f18fcc8ccc778fba88d1fd (loplugin:referencecasting add
check for new rtl::Reference operator, 2021-02-11) as well. ]
Change-Id: I87494fd04687d31201b4ec712cb0fb1ec7362b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132313
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Regression from commit 938a4d6624a78f3e272b3c4c07f314cb0c6db723
(tdf#128375 sw: fix copying RES_PARATR_LIST_AUTOFMT to different SwDoc,
2019-11-01), the problem is that we may get an autofmt pool item which
is set, but its style handle is empty. Assume that this is the same case
as having no autofmt at all.
(cherry picked from commit ddfafd9b67e6e61c144b29ac73bbafb413ddf03b)
Conflicts:
sw/Module_sw.mk
sw/source/core/attr/swatrset.cxx
[ Help backporting by also picking a single hunk from commit
1ad26c9fc237e00247f18fcc8ccc778fba88d1fd (loplugin:referencecasting add
check for new rtl::Reference operator, 2021-02-11) as well. ]
Change-Id: I87494fd04687d31201b4ec712cb0fb1ec7362b46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132313
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
lok: paste-undo: invalidate sheetgeometry
In case of copy/pasting of whole column(row) and its undo/redo may
result in column(row) width(height) changes. Hence a corresponding
sheet-geometry invalidation message needs to be sent to the lok
client(s).
Change-Id: I7aa471d9770fc21c567a3c6f5d5926df0fd5dacb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132015
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
In case of copy/pasting of whole column(row) and its undo/redo may
result in column(row) width(height) changes. Hence a corresponding
sheet-geometry invalidation message needs to be sent to the lok
client(s).
Change-Id: I7aa471d9770fc21c567a3c6f5d5926df0fd5dacb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132015
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Make slideshow touch gestures work again in the mobile apps
Need to s/lool/cool/ here, too.
Change-Id: Ib6762f196ca2b1c2e8735c6ff3e591164d34fb0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132202
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Need to s/lool/cool/ here, too.
Change-Id: Ib6762f196ca2b1c2e8735c6ff3e591164d34fb0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132202
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
configure.ac: add missing MAC_OS_X_VERSION_MAX_ALLOWED for macOS SDK 12.3
Support for macOS SDK 12.3 was backported to libreoffice-7-3 in
1d875592eb4a2ca78b94c959f1acbc3552db608f "Accept macOS SDK 12.3"
but MAC_OS_X_VERSION_MAX_ALLOWED was missing in the commit
because it was removed in master after
b0ab07ba89c88006932c68e0ca08dffcd0a4621e
"Always set MAC_OS_X_VERSION_MAX_ALLOWED =
MAC_OS_X_VERSION_MIN_REQUIRED"
Change-Id: Ic7d8581bebad12bfe7f23b06c24d3b8ea2fdde43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132104
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132198
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Support for macOS SDK 12.3 was backported to libreoffice-7-3 in
1d875592eb4a2ca78b94c959f1acbc3552db608f "Accept macOS SDK 12.3"
but MAC_OS_X_VERSION_MAX_ALLOWED was missing in the commit
because it was removed in master after
b0ab07ba89c88006932c68e0ca08dffcd0a4621e
"Always set MAC_OS_X_VERSION_MAX_ALLOWED =
MAC_OS_X_VERSION_MIN_REQUIRED"
Change-Id: Ic7d8581bebad12bfe7f23b06c24d3b8ea2fdde43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132104
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132198
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132197
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132197
Accept iOS SDK 15.4
Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132196
Tested-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132196
Tested-by: Tor Lillqvist <tml@collabora.com>
lok: use JsonWriter for annotations notification
This will unify received objects in LOK.
boost::property_tree used "string" for number values
we expect them to be a "number" type.
Change-Id: Ie90d7e2dd98bb371fc09878dcc6e96f4cdf73f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132054
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
This will unify received objects in LOK.
boost::property_tree used "string" for number values
we expect them to be a "number" type.
Change-Id: Ie90d7e2dd98bb371fc09878dcc6e96f4cdf73f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132054
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
Notebookbar style previews: use CJK or CTL fonts if needed
Change-Id: I4757cf7af16a11895ec0c6e71257f2b4f02cda68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132159
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I4757cf7af16a11895ec0c6e71257f2b4f02cda68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132159
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
sc: fix crash in SdrPageView::GetPageWindow()
From crashreport:
SIG Fatal signal received: SIGSEGV
SdrPageView::GetPageWindow(unsigned int) const
svx/source/svdraw/svdpagv.cxx:84
(anonymous namespace)::ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact(basegfx::B2DVector&, sdr::contact::ViewObjectContact const&) const
sc/source/ui/view/gridwin4.cxx:1397
sdr::contact::ViewObjectContact::getGridOffset() const
svx/source/sdr/contact/viewobjectcontact.cxx:463
sdr::contact::ViewObjectContact::getPrimitive2DSequence(sdr::contact::DisplayInfo const&) const
include/basegfx/tuple/b2dtuple.hxx:81
sdr::contact::ViewObjectContact::getObjectRange() const
svx/source/sdr/contact/viewobjectcontact.cxx:198
ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact()
didn't check if PageWindowCount() was non-zero.
Change-Id: I4a00b5b13a277d0805af3076150a952306908e53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132091
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
From crashreport:
SIG Fatal signal received: SIGSEGV
SdrPageView::GetPageWindow(unsigned int) const
svx/source/svdraw/svdpagv.cxx:84
(anonymous namespace)::ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact(basegfx::B2DVector&, sdr::contact::ViewObjectContact const&) const
sc/source/ui/view/gridwin4.cxx:1397
sdr::contact::ViewObjectContact::getGridOffset() const
svx/source/sdr/contact/viewobjectcontact.cxx:463
sdr::contact::ViewObjectContact::getPrimitive2DSequence(sdr::contact::DisplayInfo const&) const
include/basegfx/tuple/b2dtuple.hxx:81
sdr::contact::ViewObjectContact::getObjectRange() const
svx/source/sdr/contact/viewobjectcontact.cxx:198
ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact()
didn't check if PageWindowCount() was non-zero.
Change-Id: I4a00b5b13a277d0805af3076150a952306908e53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132091
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
make default selected table style to Default Table Style for only online
unfortunately when the table has a style sw/qa/uitest/writer_tests4/tdf115573.py fails
because tables that have pre-applied style resets the style of the elements in their cells
when a new row is inserted and the ui test above relies on that. For now this is LOK only
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I2f60376fc2d929498aef45259a5ef291922ccdcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132124
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
unfortunately when the table has a style sw/qa/uitest/writer_tests4/tdf115573.py fails
because tables that have pre-applied style resets the style of the elements in their cells
when a new row is inserted and the ui test above relies on that. For now this is LOK only
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I2f60376fc2d929498aef45259a5ef291922ccdcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132124
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
lok: unit-test: add comment unique id checks
Change-Id: I588484955ad3ad4c5ec3bfa9f5a844096c768ff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131725
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I588484955ad3ad4c5ec3bfa9f5a844096c768ff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131725
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
lok-comments: CopyOneCellFromClip: notify lok clients
Change-Id: I4b433c8f7123fe33f1b106cbf45216d2b0c73dba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131691
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I4b433c8f7123fe33f1b106cbf45216d2b0c73dba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131691
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
lok: CopyCellNotesHandler: use the cloned object
to get correct id for the new cell-note.
Change-Id: I4df492ad91faad5797ba513f9a3aa9abd2baf88f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131690
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
to get correct id for the new cell-note.
Change-Id: I4df492ad91faad5797ba513f9a3aa9abd2baf88f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131690
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
lok: ensure unique id for annotations
Problem:
When a cell containing comment is copied and pasted to another cell, the
cloned comment/annotation in the target cell has the same id as the
original one. The lok clients depend upon the id of each comment to
identify them and update coordinates when updates are requested through
.uno:ViewAnnotationsPosition. So the client does not have enough
information to distinguish between comments of same id.
Change-Id: Iebd7281113e0830826aff1bbdaae234bd5d5cd4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131689
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Problem:
When a cell containing comment is copied and pasted to another cell, the
cloned comment/annotation in the target cell has the same id as the
original one. The lok clients depend upon the id of each comment to
identify them and update coordinates when updates are requested through
.uno:ViewAnnotationsPosition. So the client does not have enough
information to distinguish between comments of same id.
Change-Id: Iebd7281113e0830826aff1bbdaae234bd5d5cd4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131689
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
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 <dennis.francis@collabora.com>
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/+/131965
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
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 <dennis.francis@collabora.com>
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/+/131965
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Bump version to 21.06.23.1
Change-Id: I1ac2f33ebd1823f13ee1b9e228dc1a78fbe1876a
Change-Id: I1ac2f33ebd1823f13ee1b9e228dc1a78fbe1876a
sw: change inserttable style option default to 1
Right now it is default to NONE in the list
if the user explicitly choses otherwise but that
does not align with inserttable option on the toolbar
there it is defaulted to "Default Table Style"
1 means "Default Table Style"
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I1db19f0292ac6775653b0db3f2860fea9e3b0adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131971
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Right now it is default to NONE in the list
if the user explicitly choses otherwise but that
does not align with inserttable option on the toolbar
there it is defaulted to "Default Table Style"
1 means "Default Table Style"
Signed-off-by: Mert Tumer <mert.tumer@collabora.com>
Change-Id: I1db19f0292ac6775653b0db3f2860fea9e3b0adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131971
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Trust the family name in the font file if necessary
Change-Id: I3598179bf85ba3acdaca6058982ba5bf81e68288
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131249
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I3598179bf85ba3acdaca6058982ba5bf81e68288
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131249
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>