Age | Commit message (Collapse) | Author |
|
Change-Id: I2b10b005a1f8ac9d4aa6af7516bca98e6dcd41c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165566
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Regression from 75706c003c3e224047e2f5b079aebde4e3d40d74
"tdf#146619 Remove unused #includes from C/C++ files"
See https://ci.libreoffice.org/job/lo_daily_tb_win/1718/console
Change-Id: I32f406aa44dfe37c472cf4de7805141daf37ab66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165738
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
shaves off 1-2% of the cost by stack-allocating some iterator objects
Change-Id: I509d4de6c59db086f112d83768a24c11dd5d0872
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165745
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
- erroneous code sample in code comment -retry delays
- fix when raising OSError exception - undefined variable
Change-Id: I2cae4e8b6bbb3153e79f290ae1d316aa22a86b4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165714
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Iee9a5caee53b522ed16d234c2bc06987264e23db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
Simplifies things by avoiding many repeated multiplications / divisions
by 100 during calculations.
Change-Id: Ib063d343549139c8d83e5b06570dc61f39ea0df6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165666
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: I5654d65097bf88b70cb85937de3ce111fa7e4345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165552
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
|
|
The command uno:Reload is missing from some of the Notebookbar UI variants (f.i. in Calc notebookbar_compact.ui has it, but the others do not).
This patch adds the uno:Reload command to all variants of the Tabbed UI in all LO apps.
Change-Id: Ic56a05a15bc52a51bc45435ca938a6879452189f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165675
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Rafael Lima <rafael.palma.lima@gmail.com>
|
|
Change-Id: Ic6416560bf3d404a57acc66cd4f375fe9bfc9c6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165743
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
problem:
when online created file using WOPI clients, creation dates were never set.
in online files are created using templates, even empty files are created using
an empty template
Change-Id: I3f022427745de7204faac9418620e2a87f9cf684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165711
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
Change-Id: Iaa7a84f5568b13f223e9a45c50c5a7de66e08f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165740
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Change-Id: I2271e31d2a57206954e166e71b16af092c11aab8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165741
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Change-Id: Icda197a9c1a20b245079c91a7a7b2301a5955b09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165736
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ie70851756d1a4272876b07fefb876d7e6f8d4d81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165287
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit 68422af88576a799b22e472c303ed924c360784b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165734
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
Change-Id: I7843e1e873c9272c8ad3eb4cad0b2ea48cafeb7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165638
Tested-by: Jenkins
Reviewed-by: Arnaud Versini <arnaud.versini@pm.me>
|
|
So user can use keyboard for selection.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ic7812c88110da9fbefe86d145f921e48360b4f34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165157
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165733
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
* Update helpcontent2 from branch 'master'
to c6fec27df9ba67681d6d1bea474557123c395d13
- Fix several "D'oh! you found a bug"
+ some refactor
Change-Id: I496d90ea26a41bd2ddb98af1e4e80b51322720e5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165708
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: Id8d94af9e03d0c8553d0a7949e4a9259159481cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165732
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
No need to go via Writer-specific macros here.
Change-Id: Iee66114a4cb8db712d932cc78f799809ad5e4341
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165730
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: Ia74e293ba140d7e204a2706b8e2827669bfdfb1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165541
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Change-Id: I4db608823faf4588e65e53fd099c9bc76bf39f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165539
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Change-Id: If006c5f0002b9d5981220efa22873bf0adb169bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165543
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Change-Id: Ic8b925a3ec55166a9d5da05827d2cb335943b665
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165542
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
This cleans up some unnecessary escaping both
inside and outside [] groups.
Change-Id: I5abcf0fce634f0d8809bf4d318f61b8c8f69a318
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165703
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Implement text scaling algorithm that is similar to MSO text
scaling for text boxes for the compatibility purpuse, so that the
Impress slides better match how the PP slides are layed out.
This also moves the implementation into EditEng, where it is
possible to better control how searching for the best scaling
factor is performed without doing additional irrelevant work or
trigger invalidations that should not be triggered.
An additional change is that the paragraph with no content at the
end are ignored, and are not taken into account when determining
the height of the content. This is done for compatibility reasons.
Fix horizontal spacing of tabs - the spacing shouldn't be scaled
and the tab shouldn't include the space at the beginning of the
line.
Change-Id: Ie37fa67f1cf300e915a4ebaef2a7f968bf6c5744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165441
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
- Read spacing in oox.
- Add spacing scaling as a property.
- Rename property "TextFitToSizeScale" to "TextFitToSizeFontScale"
- Add property "TextFitToSizeSpacingScale"
Change-Id: Icde575e55a3146169d86bb538a57adcf1fa228a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165633
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
* Update helpcontent2 from branch 'master'
to 336461782a58266eb90a0c96c6c48a5454fe6b7f
- Fix broken help link for File > Save > Encrypt with GPG key
Added a HID bookmark to text/shared/01/01070000.xhp so that pressing F1 when hovering over "Encrypt with GPG key" opens the correct help page. Added a link to the help page for "Encrypting Documents with OpenPGP".
Change-Id: I8ae984be20a1c60be03f3a535855fa6cab8194cc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165628
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
Change-Id: I3255d4a4b4435c092def3c5d17eea27c6f59c491
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165706
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
|
|
* Update helpcontent2 from branch 'master'
to 6d4d158dee9ef0d47e25b756df24150c7de42773
- tdf#107081 Update instructions for inserting objects from the Gallery
Updated text/shared/guide/gallery_insert.xhp to remove references to obsolete features and update instructions that no longer work. Expanded "Related Topics" section.
Deleted:
text/shared/guide/dragdrop_fromgallery.xhp
text/swriter/guide/insert_graphic_gallery.xhp
- because they cover the same subject matter as text/shared/guide/gallery_insert.xhp.
Updated AllLangHelp_shared.mk to remove reference to text/shared/guide/dragdrop_fromgallery.xhp.
Updated AllLangHelp_swriter.mk to remove reference to text/swriter/guide/insert_graphic_gallery.xhp.
Updated auxilliary/shared.tree to redirect any references to text/shared/guide/dragdrop_fromgallery.xhp to text/shared/guide/gallery_insert.xhp.
Updated auxilliary/writer.tree to redirect any references to text/swriter/guide/insert_graphic_gallery.xhp text/shared/guide/gallery_insert.xhp.
Changed any links to text/shared/guide/dragdrop_fromgallery.xhp in the following files to links to to text/shared/guide/gallery_insert.xhp:
text/sdraw/guide/graphic_insert.xhp
text/sdraw/guide/main.xhp
text/shared/01/gallery.xhp
text/shared/guide/dragdrop.xhp
text/shared/guide/dragdrop_beamer.xhp
text/shared/guide/dragdrop_gallery.xhp
text/shared/guide/dragdrop_graphic.xhp
text/shared/guide/dragdrop_table.xhp
text/shared/guide/main.xhp
text/swriter/guide/dragdroptext.xhp
Changed any links to text/swriter/guide/insert_graphic_gallery.xhp in the following files to links to to text/shared/guide/gallery_insert.xhp:
text/sdraw/guide/graphic_insert.xhp
text/shared/guide/insert_bitmap.xhp
text/shared/guide/insert_graphic_drawit.xhp
text/swriter/guide/insert_graphic.xhp
text/swriter/guide/insert_graphic_dialog.xhp
text/swriter/guide/insert_graphic_fromchart.xhp
text/swriter/guide/insert_graphic_fromdraw.xhp
text/swriter/guide/insert_graphic_scan.xhp
text/swriter/guide/main.xhp
Updated text/shared/01/gallery.xhp to update obsolete instructions.
Added "How to Get" instructions for accessing the Gallery with a keyboard shortcut.
Added additional keywords to make the page easier to find.
Added additional HID bookmarks so that pressing F1 will now open the relevant help page for context menu items in the Gallery.
Reorganinzed the article to improve clarity including adding additional headings.
Added embed links for additional menu options to provide a more thorough explanation of the Gallery feature.
Added an explanation of the "Title" option in the context menu.
Removed the "hidden" tag from the description of the "Detailed view" and "Icon view" options.
Updated the description of the Insert function in text/shared/00/00000010.xhp to reflect how inserting an object from the Gallery currently works. Changed "Background" to "Insert as Background" to better reflect current menu options.
Change-Id: Ib510289436a449a1581b2f9b6deacea3f5cfe37c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165620
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
|
|
texts properly to ooxml.
Also adding "FormattedStrings" property for title objects
to simplify the working of character formattings in editable
chart shapes.
TODO: odf import/export
Change-Id: Ie27b4dee72c24fa6a2a4e2a7db8da7fa50eb8937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165583
Tested-by: Jenkins
Tested-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
|
|
Editable textshapes include main chart title, sub chart title, axis titles.
In chart2 the chart2::XFormattedString and chart2::XFormattedString2 store
the formatted characters from textshapes, so we need to set all the character
properties from the EditTextObject and need to add them to to the XFormattedString
array with all the related texts which are formatted individually.
For formatting of the characters the .uno:FontDialog command can be used,
which can be called from the chart menubar, toolbar and with right click
on the text when we are in edit mode in the textshape.
(Note: in the next patch the OOXML export will be fixed.)
Change-Id: I5750a5fe694b384dc6b28e2ef03ac1f2b03957db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165501
Tested-by: Jenkins
Tested-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
|
|
Character formats are disappeared from Chart Title textobjects if they were
formatted non-uniform. In this patch only the OOXML import and the chartview
part will be fixed which make it visible after the import.
(Note: next patch will contain the chart controller part where the characters
can be formatted during title editing).
Change-Id: I4fb5c3d80b7889935d198e70fb49e2c68108b235
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165500
Tested-by: Jenkins
Tested-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
|
|
Improve where the disable is done and in addition to making disabled
also clear the objects tree.
Also fixes a drag and drop ordering scrolling bug introduced by commit
60e32969a98cad348cf8e55e8f93abc3d6e9c70c
Change-Id: I702c85bc1ba16837fb7f8c2246bdb29d96e6cc6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165606
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
As part of the efforts in tdf#145538 to replace regular for
loops with range-based for loops in the codebase where suitable,
this commit does so in SvxNumOptionsTabPage::PageCreated.
PS-2: Renamed a variable.
Change-Id: I7ec813a3c6fead3246137a2841c9f3e80f5adc63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165594
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
A separate thread may have already acquired m_aMutex and that
thread will then try to acquire the solar mutex. However, when
the main thread calls this method, the main thread has already
acquired the solar mutex.
So, drop the desktop mutex before calling out.
Change-Id: Ic87063266ac5101b866df9f24067a403e1417745
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165682
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
seen with forum-mso-en4-207468.xls
so we will have to ensure that nDefaultSystemCurrencyFormat
is set before using the RO mode
Change-Id: Ib1e755203917ddd751a1493c817cc8383bbbc043
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165658
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
1. The regex must match the whole input. Thus, the ^ and $ metacharacters
must be replaced with \A and \z, which only match beginning and end of
input, not any line start / end.
2. The * and ? metacharacters of LIKE must match newline character; thus,
search flags must include UREGEX_DOTALL. To avoid changing TextSearch
implementation, I use icu::RegexMatcher directly.
The direct use of icu::RegexMatcher also allowed to simplify the code by
calling icu::RegexMatcher::matches method. This may perform better than
general-purpose utl::TextSearch::SearchForward.
Change-Id: I75776498b36f236da294462362ed5b36ed8cdf68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165700
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
'sc' module was cleaned.
Change-Id: Ia491d741a4c1c5314f35ebb4baa82dd516948ae7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165699
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Change-Id: I548a33e93c14c40c6cd500e3306a8e4279e73f52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165678
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ibd37a38bf1fe6c2669af11b0c4eca957954f64bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165676
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
...at the expense of losing, at least for now, the script editor for it (which
had been hacked into the old upstream sources in a hard-to-maintain way).
rhino-1.7.14.zip is taken from
<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip>.
Building it would now use Gradle, but instead just hack together an invocation
of javac and jar in external/rhino/ExternalProject_rhino.mk that effectively
generates the same jar as the upstream-built jar available at
<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.jar>.
All the various patches are no longer necessary:
* external/rhino/rhino1_5R5.patch and external/rhino/OfficeScriptInfo.java were
mostly for the hacked-in script editor, which has been abandoned at least for
now (see above).
* external/rhino/rhino1_5R5-find_swing.patch (originally from
0a7f9346503a557f583bced269655fa1996550af "ause109: #i106296# make build.xml
aware of TARFILE_LOCATION") appears to be obsolete.
* external/rhino/rhino1_5R5-updateToolTip.patch is covered by
<https://github.com/mozilla/rhino/commit/ab20a73b16f68daf715c7ac4808c119bb15d698c>
"Fix bug 414869: Rhino debugger fails to launch due to updates in mac os x
leopard".
* external/rhino/rhino-classpath.patch.1 from
bb58293296f843654045d7b0eba6899d11533a4a "rhino: unbreak build on Fedora 34"
was only relevant when building with Ant.
Change-Id: I5fca5915d785716f7aaf313ff2469a20f55f707a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
|
|
the 'xmlsecurity' module was cleaned
Change-Id: If8fae797ed5586888022ecb09bab690d68ae7bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165593
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
Change-Id: I3c4ca1083f8ef4053d1b4202bf9617b9373312bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165537
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
the 'desktop' module was cleaned
Change-Id: Ia7dcb77a42ca7f9be67e30d10cd54697bf93b6d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165663
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
|
|
regression from
commit a95bff116e1da140b9abe9742ceeb9a3caed43d5
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue Mar 26 15:42:52 2024 +0200
convert OCellListSource to comphelper::WeakComponentImplHelper
Change-Id: Ib8af6627c641c73d9e4e6aaa43d694084a2854ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165671
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ic53d4a462e12e8448b14e750c4ef2824385b8f28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165502
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
|
|
Change-Id: Iea48c8750c940441c5687068317107a5932799e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165670
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Icafd8d0e3cf1923fd287792cb03a5431907599e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165669
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
for SSL use by pyuno emailmerge
another alternative mechanism that could work is to generate one
with something like: "security find-certificate -a -p > cert.pem"
ref: https: //hynek.me/articles/apple-openssl-verification-surprises/
Change-Id: I8bff2ca5bbbb4f2c2333a67e0281dd4fa0b06405
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165599
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
* Update translations from branch 'master'
to e36ba06ea7b75b61d93b7b9b9f50d90301010738
- update translations for master
and force-fix errors using pocheck
Change-Id: I65d403dd9ce3233ba067c1e76faa0b9f782fe816
|