Age | Commit message (Collapse) | Author |
|
With this, it's possible to use AttributePage.* keys in macros.
(cherry picked from commit a30f969432a451ade87b93e3077836a849b8f11b)
Change-Id: I3f0b1ea8fb6274e7c18511c2e80774205206a2ba
|
|
Change-Id: I53b5ddc26e77168c29ba1bcfd199b1accbc54d3a
|
|
Change-Id: I99b0bbd9c7bbf65cc25d88fea8177724a4a39a01
|
|
Restoring row restriction at 1000 rows.
This reverts commit c253dd3de5ee430855de7f3a0967a647222cc70c.
|
|
Change-Id: I4127e6dc2aa89ed6df07d0908340840f36b8fc43
|
|
Regression from:
83d51e5e52688c4c9bc0ad70a511458bb06a242d
Partly revert the commit causes this regression.
I checked the related bugs (tdf#78590,tdf#80748)
intended to be fixed by this commit and reverting
this part does not bring back the corruption.
I guess something changed in frames' and text boxes'
import in the meantime, because this MergeMarks::IGNORE
is useless now.
Change-Id: If17776e8628561961c7ce2a2994e3fc609f75639
Reviewed-on: https://gerrit.libreoffice.org/30351
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
|
Positioning relative to left or right margin in MS Word
works the same as the positioning relative to left or right
page border in LO Writer.
Change-Id: I476a5e9e76f766b7fb7f1c7f4a068af8bb3c8813
Reviewed-on: https://gerrit.libreoffice.org/30376
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
|
- handle it in SwTextShell (for normal Writer text)
- simple icon in the galaxy theme
(cherry picked from commit d378cd2f766eeb1fd1c98f62c9ae6b5b59fd00f1)
Change-Id: Ib8f11dbca28b19a2fc0411c92d9f0b4b052277bb
|
|
there might be other variants out there in practice, but this
works for default encrypted doc of word 2013
(cherry picked from commit 4f07175cd03bf0fa42992a06d51aed5b421adcf2)
contains...
rework things in light of now available documentation
(cherry picked from commit 6ac3fb584409912d7a4e944a643bc9180bc03015)
Change-Id: I995a0437d4001d63e1c3a821e00c05a2af429356
68c1d9489292e63f709bfbc990ffa5ad7d0f827a
|
|
there might be other variants out there in practice, but this
works for default encrypted xls of excel 2013
(cherry picked from commit 1473ce030314027c01c98f513407ed0897328585)
contains...
be more c++y
(cherry picked from commit fcf7f503b64b2cf7dbef019fb43dde033e3538e8)
hash len is 20 for xls cryptoapi configuration
(cherry picked from commit 491884350ce74f36044b3348bd66356ad1c234af)
clarify hash lengths a bit more
(cherry picked from commit 8db1b13e721683d0263925c8e0300dd86a022814)
hash len isn't going to change depending on who implements it
(cherry picked from commit fcc846e8f29839eaace7e1d28746abea8f4b598a)
move some useful header information to mscodec for reuse
(cherry picked from commit fc514cbf30be1613fdf4d4b7c12cbd55ca08b9b0)
rework things in light of now available documentation
(cherry picked from commit 3fabbd0a22219464545f933fc28c869a6fa89546)
split MSCodec_Std97 into a baseclass MSCodec97
(cherry picked from commit 06916c839b16866b47235306d2db50850df0ad7c)
6e06b8578959b8147043179db57e875b1d98d57d
66cea4b9efb82d29e6c052ac11a6f2eaca823ce0
ee585cba4acad74c11d083085153e2af96c8894f
c7adf3ed3c8279cc93a06975d6fb337210d1af87
f5f75e27191017a8c6a3929e2a70d21840f157c6
a3c41a048169c78684800def94e53fc9f3201e30
91c0e1d1d95fbd1c68966650e7ac7d23276bcbe3
Change-Id: I673b00e111a734bc626ba3d3f6ecf9692f1ce7db
|
|
Now that we store formula results without recalculating, the implicit
logic that adds files of external references to the LinkManager is not
triggered, explicitly force it during import.
Change-Id: Id867d2fa2b39841fb4c8e90941814457c8db431d
(cherry picked from commit 8464ea6961b9cc54af9c11cce1b80ed7e0cc77e2)
Reviewed-on: https://gerrit.libreoffice.org/30277
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ef4051a295b76a5398e6c4a64bc0f8e1322291c7)
|
|
Revert commit dcea8ba3b4fc347e7b6d9e0d5ec2fd99bd77ce6f, and do the
opposite. The added "titlePage" check makes no sense, because in that
case there is already an explicit first-page style in the PageDesc, and
overriding that cannot be right.
The test added in that commit still succeeds, which suggests that the
root cause of that bug was elsewhere and was fixed in the meantime.
Change-Id: I9b21b6dc115be28cb0ee3360615c538d4cfee3cb
(cherry picked from commit 36e390eaa55ae302dc5a64fa7098ec43e2009748)
Reviewed-on: https://gerrit.libreoffice.org/30276
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1bfa382b4af649ff2b56b988d89bada156e29078)
|
|
following up on 8b5f8c26f007c8e67bc46b1b09340cae660d0b8b "Avoid crash with empty
Chart document", when you then close the Writer doc (discarding the changes), it
crashes in a chart::sidebar::ChartSidebarModifyListener::disposing call whose
mpParent (that was a ChartElementsPanel) is already destroyed. The problem is
that the ChartElementsPanel ctor creates an mxListener pointing to this, then
calls Initialize, which calls xBroadcaster->addModifyListener(mxListener) and
then, during updateData, throws a RuntimeException when xDiagram is null in
getChartType, causing the ChartElementsPanel object to immediately be destroyed,
but the listener still registered. This apparently needs fixing independently
of the immediate problem. (The immediate problem is a regression introduced
with d7748842e96536daeb0c638c6f8d01d99b9a3e08 "hide grid and axes options in
chart elements if not supported, tdf#94297".)
Change-Id: I2fe4f2a59600664f6210456c65e033f9453f4cc9
(cherry picked from commit 429e4dc671f03e0c4d50e8f8aa055f4aaca761da)
Reviewed-on: https://gerrit.libreoffice.org/30146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 4bbd59e113749bf8e9eda7c25683b99f34d6866e)
|
|
In a fresh Writer document, "Insert - Object - OLE Object... - Create new -
LibreOffice 5.3 Chart - OK", then left-clicking into the empty Chart are, caused
an unhandled (or rather, handled by desktop's FatalError) RuntimeException since
749a0845500d69f99bf1901bab82361f67b5e4f6 "don't show area and line panel in pie
chart Chart selection, tdf#94320".
(cherry picked from commit 8b5f8c26f007c8e67bc46b1b09340cae660d0b8b plus
c5feb9ad79c9c830ca824e29277ff41c5cc24e7d "Minor improvement of previous commit")
Change-Id: I7ff53a84e4b06b20409d09e6010bac80e5a7c4b2
Reviewed-on: https://gerrit.libreoffice.org/30137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 1af159c20c7e3b4b27251cf5736d64c217ce7565)
|
|
MS Word can page-break inside a table at any row
(using paragraph styles from the first column).
Thus a table can be split across many pages.
Writer can't because it ignores all page-breaks while inside a table,
although the entire table itself can specify starting on a new page.
This imported .doc patch checks to see if the very first paragraph style
in a table is set with a page-break, and if so, then transfers
that setting to the table itself. That at least mimics the most
common layout scenario.
Cherry pick from f5f51cb93d11731c64dfd68044144100f5fc4b28
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Change-Id: I25d99c812281e3654c44f21c2b6030a820917890
Reviewed-on: https://gerrit.libreoffice.org/30228
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 55840d90c43d0ba6db4a9cda4af648df0776749b)
|
|
Change-Id: I2d9556d7f233878453383a8b3ed588f86fb01a78
Reviewed-on: https://gerrit.libreoffice.org/30274
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
|
|
The VCL backend is now shown on the About dialog.
Reviewed-on: https://gerrit.libreoffice.org/29798
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 6b5b773488a4ab77b5c18d82e663e68692f14b33)
Change-Id: I331960ec5352d8a7274870713a554c3fe4044db4
Reviewed-on: https://gerrit.libreoffice.org/30273
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
|
|
Change-Id: I8a1bb22bd0be9717a56a90732b17c4ed8f230bf3
Reviewed-on: https://gerrit.libreoffice.org/30254
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
|
|
Make custom shape export more robust. In case of the test
document, WriteCustomGeometry is called, but this call
does not export anything, and so we get a shape without
any geometry in the DOCX file, which causes problem to MS Word.
Reviewed-on: https://gerrit.libreoffice.org/30241
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit f7c61b08d526c79ecd1522dff79386059b6125e0)
Change-Id: Ie7a4e2b8a18bfddaeeb81425ae5f1de04140d43f
|
|
Project: dictionaries 2080473f3c049986c98e41715eeffe5ef3a9aaa0
Update pt_PT dictionary to version 16.10.1.2
Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292
Reviewed-on: https://gerrit.libreoffice.org/29511
Reviewed-by: Tiago Santos <tiagofsantos81@sapo.pt>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Project: translations 9a12ac3c0da8fa2bc08a05d6fc8c4ce426cdfac6
Update from Pootle
added directories in pootle but not in branch
Change-Id: Iaacf1920bf0f252efdbf8504d34625609703284d
|
|
Change-Id: I494fe3abcd3827c9604fffff7f26e4ccd96c5600
(cherry picked from commit 38dadfbc3df41edd3719df0eeda7e8102fcc5818)
(cherry picked from commit 3777a393b44bafc4168efaaefccfe00c64a810b7)
|
|
Previous impl. had an un-necessary timeout to update the screen constantly.
Change-Id: I28ba50166530d516d299b9c873cf59577043bf82
Reviewed-on: https://gerrit.libreoffice.org/29392
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 1498c4f631e9c90b11dbdb18e8b094b90e143466)
Reviewed-on: https://gerrit.libreoffice.org/29674
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 47ba511bf4fcad8502d3501bc16b07621e2ae6d8)
|
|
(cherry picked from commit 1c9096dad7dc2ee25d9ebe16ab02d5caba5f8a79)
Change-Id: I2268d8b74f187d07f161f42cc9530be3ebbc86d0
Reviewed-on: https://gerrit.libreoffice.org/29796
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 112f4bbea029d71ad35873d7e3585c8e1c01460d)
|
|
(cherry picked from commit 48d0affa114d6838c0e99f3f3588dd611a4a2b72)
Backported.
Call to InsertTextUserInput() changed to InsertText()
Change-Id: I29906de6a4075b7de82bd6e16560b56b9b648e91
Reviewed-on: https://gerrit.libreoffice.org/29759
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 3a96b9da2a99faa695eb8579a543aeb618d859d8)
|
|
There are at least 2 different versions libgcrypt.so.20 and
libgcrypt.so.11 in use, and it's a private dependency of libexslt
anyway, so filter this out of LIBEXSLTLIBS.
Change-Id: Iafc33ef5ead2a86bedb4d5e485f6a16eb0544686
(cherry picked from commit 69dcc7adae5c531b4da8c099bd1e2f99b851ebcd)
Reviewed-on: https://gerrit.libreoffice.org/29677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit dea5ac15555ce2cbc8866f0511ed9d26156c9928)
|
|
... when handling name token. This can happen when importing BIFF .xls and the
original range is not present in the document. The document is broken, but such
formula can continue to work if the range expression was not actually executed,
for example IF(TRUE(),then_good,else_bad_range) where else_bad_range is #NAME?
error.
(cherry picked from commit d3645961d98ce9f0cfb1ef7f0aba7bf020b90945)
Change-Id: I823ac89115418cf5069b2baf5c5de2c814319ae7
Reviewed-on: https://gerrit.libreoffice.org/29795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit f81b2592cd93dac2cb78fdb22bf661d04bdef25f)
|
|
If the external cell referenced is a formula result of type string that
string needs to be re-interned for the reference cache as well.
Change-Id: Iea3c3d777dede2ad6ba0b084533af964da991ca6
(cherry picked from commit 351164ea2c70923e47d5f01f3934c73cfc5839a9)
Reviewed-on: https://gerrit.libreoffice.org/29695
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit dfcf0bbcc51f50dfa93ac74623a069c3b527527a)
|
|
Change-Id: I0c5f943ed0d1a607ef86a26602f101f361b0aa2d
(cherry picked from commit 29fe57afd79c96c5ff251c2468ababda5e506564)
(cherry picked from commit 6a6cc4047e5284e5907bd488ec23660d0a923373)
|
|
... so area broadcasters can be "adapted" (though not changed) and
broadcast a change to invalidate listening lookup caches.
This is the delete row part of the bug scenario.
(cherry picked from commit 866eb4a7f93414932b8669d1a6afe0611655dfb4)
tdf#101562 inserting within an entire col/row reference needs to flag change
This is the insert part (e.g. Undo) of the bug scenario.
(cherry picked from commit 180fe3e991432a5ab1ef573686ff9b35c732756b)
87060bd9f0ad6d58a11308e58e7ce56875327c52
Change-Id: Ie6072a6b8e7967faa135a3c4d0a9024b6afcd69c
Reviewed-on: https://gerrit.libreoffice.org/29596
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 84a8aa8b28599db4ef452416e930690949217d2c)
|
|
Change-Id: Icfa7debe06f6dfae3efcbd9d878d3b2d5aecf92f
Reviewed-on: https://gerrit.libreoffice.org/30169
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
|
|
In case there are no arguments provided to .uno:DeleteAuthor lets
use the author of the active comment window.
Change-Id: I761824f3d9bf90584a99be1015a52d5ddae7edde
|
|
With this, 'make -sr CppunitTest_desktop_lib
CPPUNIT_TEST_NAME="DesktopLOKTest::testPaintPartTile
DesktopLOKTest::testWriterCommentInsertCursor" VALGRIND=memcheck'
finishes with 'ERROR SUMMARY: 0 errors from 0 contexts'.
The problem is that in sw/sc/sd code it's enough to make sure that the
on-stack ViewCallback instances are destroyed after the loaded
component, but in desktop/ code also the emit-callbacks-on-idle code is
under test, so we need to make sure first the LOK document wrapper is
destroyed, and only after that the ViewCallback instances are destroyed.
Change-Id: Ie8361233461d00fd252da929fb912a1a0b835c30
Reviewed-on: https://gerrit.libreoffice.org/30072
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ef7ab996d8e4479b1944f7eaf506a506647a90dd)
|
|
This reverts commit cdf08b3aa74bb32ea18b583a9c0c41b91d7819ac. It breaks
'make -sr CppunitTest_desktop_lib
CPPUNIT_TEST_NAME="DesktopLOKTest::testPaintPartTile
DesktopLOKTest::testWriterCommentInsertCursor" VALGRIND=memcheck' (it is
terminated by SIGSEGV), and also it's the reason why sometimes the
lo_ubsan buildbot fails, see e.g.
<http://ci.libreoffice.org/job/lo_ubsan/329/console>.
This has to be re-introduced once I find a way to process all binding
updates at once without side-effects.
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
sfx2/source/control/bindings.cxx
(cherry picked from commit b86b78e0ad9bb1e6ed2e22a0fca18cad8d19ded1)
Change-Id: Id6c49b9b31095ef1a1a8c1cd92cbae5deb316500
|
|
The LOK callback objects registered are on-stack objects, so we must be
sure that references no longer used after we return.
Process idle events, so that desktop::CallbackHandler::flush() won't try
to use the reference after return.
Change-Id: I65d324cb9cef4fd1776d0f610d8d096717e0e833
Reviewed-on: https://gerrit.libreoffice.org/30034
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 0c34cd41c65973f8ff0e78c76cd6ad52ef89bc4a)
|
|
Avoid crash when execute .uno:EditAnnotation with missing
arguments
Change-Id: Iaee8694b7481933f3672a3847264a49a6503b82e
Reviewed-on: https://gerrit.libreoffice.org/30116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
|
|
Change-Id: Ifd49fb3fce2b49a70db6be99e20590323e3dc518
Reviewed-on: https://gerrit.libreoffice.org/30105
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
On edit mode starts/ends, when a note is hidden, tiles, only the note
tail belongs to, are not invalidated.
Change-Id: I69487f428a121fc05da99d3b06786afd4f834766
Reviewed-on: https://gerrit.libreoffice.org/30094
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
Change-Id: Ia904b6bbe82c395299b269ddbde523d19bf486bc
Reviewed-on: https://gerrit.libreoffice.org/30093
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
Change-Id: Ia8efcee6fbeb75dd712d3ac480e355c2972875f3
Reviewed-on: https://gerrit.libreoffice.org/30092
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
Change-Id: Ief6f39400381764a5f41812a045ff2477aaecaeb
|
|
Change-Id: I200dff44b457a1632d99619981e237de73a2a8df
|
|
For instance, column / row label tokens don't work correctly in
grouped cells with the current implementation.
Change-Id: Idf86312ef15fbfd4382aa90ee6d131c671a80683
|
|
growing.
That could occur because of the call to SetDefaultItem later.
We end up with wrong start/end edit columns and the changes
to the output area performed by the inner call to EditGrowX are
useless since they are discarded by the outer call.
In the inner call the output area is not the new one computed by the
outer call, on the contrary the data field `nEditStartCol` and
`nEditEndCol` have been already modified, so the inner call would
modify them using the wrong output area width.
Maybe the call to SetDefaultItem should be performed in another place,
anyway the outer call takes into account the correct horizontal adjust
when computing the new start/end edit columns and the new left/right
output area.
Change-Id: I56d038f33ab9d1933c4c6cd1db6d9cd012fb6db1
Reviewed-on: https://gerrit.libreoffice.org/29741
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
What's new:
1) RectangleAndPart handles "EMPTY" payloads
2) LOK_CALLBACK_INVALIDATE_TILES msg type with "EMPTY" payload are
handled in CallbackFlushHandler::queue
3) gtktiledviewer handles "EMPTY" LOK_CALLBACK_INVALIDATE_TILES msg
even if the part number is included in the payload
Change-Id: I21f4a71ec875d24f4bbd100e4aacf8437d745ae4
Reviewed-on: https://gerrit.libreoffice.org/29822
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
What's new:
1) when an edit view is killed, the area which was used by the edit
view is invalidated for both own window and other view windows after
the edit view has been destroyed;
2) when an edit view is created or its out area is expanded, the
windows of other views are invalidated too;
3) when a vertical scroll occurs in the edit view area the windows of
other view are invalidated too;
4) same methods renaming since now we add/remove windows not edit
views.
Change-Id: Iac54f5b182c9562f08bb724f9ddde1c26cffa2e7
Reviewed-on: https://gerrit.libreoffice.org/29740
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
Change-Id: Id606f0b71e1314778cf5ea814977bb9f4eb8bafb
|
|
Thought it wouldt have an effect on icons displayed for LO-edited/able
documents, but not. Still, probably doesn't hurt. More properly native
macOS applications seem to have CFBundleTypeIconFile things in their
Info.plist and not UTTypeIconFile, so probably it is the right way to
go.
It would be lovely to have a good understanding of how macOS
Info.plist, file types, document icons and previews in Finder, file
system metadata, etc actually work. At least Info.plist seemed to be a
mess of backward compatible stuff last time I tried to understand
documentation.
Change-Id: I2a141adb4bdb202a372a55aed91a1761464fcc2e
|
|
So don't then unless we are on the main thread.
Change-Id: I6ba52ed7db5d73a4c1c6acf10bdf254a6f959da8
|
|
Finally. It has been documented as deprecated for years, after all.
Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d
|