Commit Graph
1157 Commits
Author SHA1 Message Date
Noel Grandin 73e6a7975b loplugin:unusedmethods
Change-Id: I7805ac9bc6f8c0aa5ba4804777e7d7c2c29a78f3
Reviewed-on: https://gerrit.libreoffice.org/52066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29 14:45:43 +02:00
Noel Grandin 63c6668f06 loplugin:virtualdown in svl,svtools
I expect a lot of the overriding methods will be removed as soon as I
run the unusedmethods plugin

Change-Id: I4fb228724fcfba51a98d2113efb93cec1bc15c7c
Reviewed-on: https://gerrit.libreoffice.org/52006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-29 08:35:23 +02:00
Caolán McNamara f98040a273 another stab at the ofx infinite rtf loop
Change-Id: I2dcc186fd7118a85e2059d061fc4cac555c96ee8
Reviewed-on: https://gerrit.libreoffice.org/51944
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-27 16:51:40 +02:00
Caolán McNamara 19ca4e8a5e Resolves: tdf#116540 Revert "ofz infinite loop"
This reverts commit e4551b905e.

Change-Id: I95634dd166c51586b5da47b996993a098823ca32
Reviewed-on: https://gerrit.libreoffice.org/51941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-27 15:49:23 +02:00
Szymon Kłos 030c30b33b tdf#116241 Customizing value highlighting colors
Available in: Tools->Options->Application colors

Change-Id: I6e4f7a0dcad9a6ee222275019596853f0cbd3ab0
Reviewed-on: https://gerrit.libreoffice.org/51791
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2018-03-26 23:24:08 +02:00
Samuel Mehrbrodt a82cdccb0c Typo: GetSelectItemId -> GetSelectedItemId
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b
Reviewed-on: https://gerrit.libreoffice.org/51750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-03-23 08:26:14 +01:00
Caolán McNamara 12efe34abb support both vcl and weld in genericunodialog for interim
Change-Id: Ife85dd7a4bd27260514b390ca3928152db0d688f
Reviewed-on: https://gerrit.libreoffice.org/51699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-21 15:48:12 +01:00
Caolán McNamara 4b785097f1 drop unnecessary includes
Change-Id: I1a817d5575bbd57ecaa874a27158b9218e4210cc
Reviewed-on: https://gerrit.libreoffice.org/51603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-20 13:08:20 +01:00
Tomaž Vajngerl afea2bbcd5 svtools: cleanup GraphicAccess
Change-Id: I1eb2b5dd6859653594771d950992dfca38161446
Reviewed-on: https://gerrit.libreoffice.org/51104
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-12 12:56:02 +01:00
Tomaž Vajngerl ab9eff78f0 remove support of GraphicObject URL from GraphicAccess
Change-Id: I4f14241f8528e025ddb108c73bee2df61f8927de
Reviewed-on: https://gerrit.libreoffice.org/51103
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-12 12:28:58 +01:00
Tomaž Vajngerl 7fbb96c2fb Move (and rename) graphic stuff from svtools to vcl
This is preparing to change how GraphicManager works where it
won't base itself around GraphicObject anymore but Graphic. No
functional or cosmetic change was made to the classes, only
changes that were needed because of the move and rename.

The only thing that wasn't moved is the GraphicRenderer as it
is not needed in vcl for now (but makes sense to move it in the
future to keep graphic stuff together).

grfmgr was renamed to GraphicObject as the GraphicManager will be
changed a lot and most likely moved out, so the name grfmgr won't
make any sense anymore.

All the UNO implementations were renamed with a prefix Uno and
used the same name as the class name. This is made to be more
specific which are the Uno objects (for example graphic.cxx
contained the implementation of XGraphic, which is similar to
graph.cxx contains Graphic).

Change-Id: I54a2fa6c7e997469aaa7770db05244adb9f64137
Reviewed-on: https://gerrit.libreoffice.org/51068
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-11 13:37:21 +01:00
Tomaž Vajngerl d0b36b780d oox: remove unused methods that rely on GraphicObject URL
Change-Id: Ie68ccfa8d802bb284da8bb4af69882f4b66a3dac
Reviewed-on: https://gerrit.libreoffice.org/51010
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-03-10 02:11:58 +01:00
Caolán McNamara 7750df3d61 give color picker explicit parent
Change-Id: I73e9a29abd5d767b31850e9a6b1f2b8d757ee928
Reviewed-on: https://gerrit.libreoffice.org/51000
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-09 17:03:42 +01:00
Caolán McNamara 48bca65f1c inherit welded dialogs from a common ancestor
Change-Id: Ifa6c871a134cf89bfba71b1049a115cf7c953c42
Reviewed-on: https://gerrit.libreoffice.org/50936
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-09 13:47:52 +01:00
Miklos Vajna a8ca72cbcd svtools: allow writing characters with HtmlWriter
The sw HTML image export already uses HtmlWriter, so need to extend this
to support XHTML alternate text, writing the character data directly is
not an option.

Change-Id: Iac3f2b9a3828175a5f1d0fb14ab505f8de389e52
Reviewed-on: https://gerrit.libreoffice.org/50965
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2018-03-08 18:53:53 +01:00
Noel Grandin c774ad610e loplugin:constantparam in svtools..unotools
Change-Id: I6e72fbe44dcb65ee5162448e9a72e6437d56b044
Reviewed-on: https://gerrit.libreoffice.org/50948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-08 18:23:53 +01:00
Katarina Behrens 683a68cb51 After Java settings have changed, restart LibO for real
Previously restart LibO dialog was shown, but did nothing. I haven't
found an easy way to close all frames with 3 modal dialogs opened, so
now restart dialog simply pops up later (after user bonks OK button
on Tools > Options dialog)

Change-Id: I6e61fa1fc41199c2f16cb80da771202c255f3810
Reviewed-on: https://gerrit.libreoffice.org/50566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2018-03-06 13:05:10 +01:00
Noel Grandin 9bb9589d7a use more Color in ExtendedColorConfigValue and reportdesign
Change-Id: I710407ccdd373ba686914e1d049bd8c2bcdcd1e3
Reviewed-on: https://gerrit.libreoffice.org/50576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-02 10:53:44 +01:00
Miklos Vajna b4f3af91d3 sw HTML export: handle XHTML ns alias even with HTMLOutFuncs::Out_AsciiTag()
This is meant to be mechanical, full conversion to HtmlWriter has to be
done step by step in follow-up commits.

Change-Id: Ieab096f8c9936f0ecad029fbdfb51da7412ad83e
Reviewed-on: https://gerrit.libreoffice.org/50449
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-01 10:07:31 +01:00
Miklos Vajna 9df0ce081e sw HTML export: allow custom XHTML namespace alias
This helps in case the HTML filter expected to produce an XHTML fragment that
has an explicit namespace alias for <http://www.w3.org/1999/xhtml>.

This only has an effect when HtmlWriter is used to write elements,
though.

Change-Id: I161caf4bb6bc6d0c21a7a67433b08bb060b447f1
Reviewed-on: https://gerrit.libreoffice.org/50448
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-02-28 11:41:50 +01:00
Noel Grandin c98d330302 replace Color(COL_*) with COL_*
using

    git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
    | xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)//g"

and then some manual fixup where the resulting expression no longer
compiled

Change-Id: I0e268d78611c3be40bba9f60ecfdc087a36c0df4
Reviewed-on: https://gerrit.libreoffice.org/50372
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-27 11:28:29 +01:00
Caolán McNamara 0fad8d3081 convert remaining WarningBox to weld::MessageDialog
Change-Id: I7e3c156a6ad47ac232636ae274280c1cb7556d4a
2018-02-27 09:52:32 +00:00
Miklos Vajna 61e4c00eee sw HTML import: allow custom XHTML namespace alias
This helps in case the HTML filter is given an XHTML that has an
explicit namespace alias for <http://www.w3.org/1999/xhtml>.

Change-Id: I437fa85ba19ce907c9c4b10c8d10aaf2217dc0ea
Reviewed-on: https://gerrit.libreoffice.org/50380
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2018-02-27 09:09:54 +01:00
Caolán McNamara d75144cf44 convert remaining InfoBox to weld::MessageDialog
Change-Id: I91d828e38d96264cf4a76f30940942556b8f78d8
Reviewed-on: https://gerrit.libreoffice.org/50205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-02-25 20:03:26 +01:00
Caolán McNamara 6a4c464b49 weld native message dialogs
just the straight-forward MessageDialog cases first

a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)

Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154
Reviewed-on: https://gerrit.libreoffice.org/50143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-02-22 22:07:38 +01:00
Mike Kaganski f00e891f33 tdf#115892: properly get the box' saved value
Previously textual value like "10,5 pt" was converted to int as simply
10 (multiplied by 10, it became 100), which compared as different from
unchanged value of 105. This made the fractional values to be treated
as always changed.

This patch uses the same code to convert saved value as is used for
current edit box value.

Change-Id: I09a84a6bf33b17e0192b79b31af21ef14d7e9c63
Reviewed-on: https://gerrit.libreoffice.org/50066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-02-21 08:11:23 +01:00
Noel Grandin 72593849bb ColorData->Color in sd..svx
Change-Id: I70de56b6bfb1ea4655ec03510fad92bf6645f64e
Reviewed-on: https://gerrit.libreoffice.org/50046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-21 06:05:41 +01:00
Caolán McNamara 8ed356fb69 reserve negative responses for internal responses
Change-Id: Iecf7d25340ff751c2984e27fdd303d2162472344
Reviewed-on: https://gerrit.libreoffice.org/49971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-02-19 14:45:19 +01:00
Noel Grandin fe96d07621 move CellBorderUpdater bitmap update to VirtualDevice
part of the process of making Bitmap an internal detail of vcl/

and remove last outside-of-vcl use of BitmapWriteAccess from
header file.

Change-Id: I59a4353e11f881d24a7be50cf0f91f4f0dcffcaa
Reviewed-on: https://gerrit.libreoffice.org/49850
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-16 19:51:05 +01:00
Samuel Mehrbrodt 38774ce79b tdf#86739 Option to set image anchor type in image insert dialog
This adds the selectbox to (hopefully) all filepickers:
- LO native
- GTK/GTK3
- KDE4
- KDE5
- Windows
- macOS

Change-Id: I01bd42b1ca18e0f691b879647a6cb1b62177d3ce
Reviewed-on: https://gerrit.libreoffice.org/49311
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-02-08 16:42:14 +01:00
Katarina Behrens 7214a912f7 tdf#104861: extension list is not a child dlg control anymore
After 989cf68b68, 88f31af748 and 3aec456ba8 buttons aren't
embedded in the extension list anymore, so treating it like a
child dlg control just causes Tab key to skip the widget

Change-Id: I4372062c135804d8b51a8640c1e9959f03a617fe
Reviewed-on: https://gerrit.libreoffice.org/49254
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2018-02-06 10:37:29 +01:00
Miklos Vajna 41759e1e89 svtools: SvParser<T>::NextToken() can be pure-virtual
Change-Id: I9e8c87beb86ee073d6b5ee95c3f80e6dc55a99e9
Reviewed-on: https://gerrit.libreoffice.org/49117
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2018-02-02 09:04:24 +01:00
Andrea Gelmini 01c43770b7 Fix typos
Change-Id: I455efa82de60b764a500e1cc092ae08e800ec824
Reviewed-on: https://gerrit.libreoffice.org/49068
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-02-01 11:08:03 +01:00
Kshitij Pathania 056c3bf2dc tdf#111837 removed lag in navigator selection update
Change-Id: I0d15f8352ab1d8846df3b03334bda20550d117d2
Reviewed-on: https://gerrit.libreoffice.org/48717
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-01-28 18:22:56 +01:00
Mike Kaganski 1710f23e21 Make handled flags for Java interaction handler static
In commit 5785e4f4ab, initial work to only
show Java error dialogs once had been done. Still, in some cases, multiple
such dialogs can still be shown.

JavaInteractionHandler instances can be created in at least two contexts:
in JavaContext::getValueByName, and in DesktopContext::getValueByName.
Additionally, in the latter, it is not kept for subsequent reuse, but re-
created anew each time. So, it is possible that "Java Missing" (and friends)
dialogs will be shown multiple times per session. E.g., specific installed
extensions (not using Java, but rather Python) can trigger said behavior
in Desktop::doShutdown inside BackupFileHelper::tryPushExtensionInfo.

This patch makes the "already handled" flags static, thus sharing the
status among different handler instances.

Also, unchanged-after-const-initializing m_bShowErrorsOnce is removed.

Change-Id: I79d40639caa9764a04af9201c7e1a6fa624f03e5
Reviewed-on: https://gerrit.libreoffice.org/48678
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-26 19:33:41 +01:00
Miklos Vajna fc2d155f42 Fix some IWYU warnings
Change-Id: I4b6e799c1afc2a762a3729ee89f3226c59a6eef8
Reviewed-on: https://gerrit.libreoffice.org/48462
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2018-01-24 10:14:09 +01:00
Miklos Vajna a54787669b EPUB export, fixed layout: add chapter names to the navigation document
Extend vcl::PDFExtOutDevData so that it's possible to use it outside the
PDF export; this way the EPUB export can know which chapters start on
which page.

This means fixed and reflowable layout has the same table of contents,
instead of just Page <N> in the fixed layout case.

Change-Id: I935fb23c66ec747431b91e83b0e677d4e5f704b9
Reviewed-on: https://gerrit.libreoffice.org/48332
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2018-01-23 09:05:02 +01:00
tagezi 506e1396c3 tdf#115002 Including of bitness information into Java message on Windows
Change-Id: Id5235360110cf9838a38f8063448b06a5de1f82c
Reviewed-on: https://gerrit.libreoffice.org/48272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-22 06:41:39 +01:00
Noel Grandin bfd81eed4c loplugin:useuniqueptr in SvEmbedTransferHelper
Change-Id: Ie01e783fea160fba0041ae43a82ad3f4a7c961f9
2018-01-17 10:16:35 +02:00
Noel Grandin 5ed542f8a3 loplugin:useuniqueptr in GraphicManager
Change-Id: I46f2e6a0ef2e2d19b0af0238a46462efe6e2c068
2018-01-17 10:16:35 +02:00
Noel Grandin cf52cc9a0b loplugin:useuniqueptr in AsynchronLink
Change-Id: I911bb1f8ca98e368f8275083936a8eb9013f462c
2018-01-17 10:16:35 +02:00
Stephan Bergmann 6c5a1601d2 Remove unused IMAP_OBJ_NONE
...no other traces of it apart from its definition in
2351b6d4ba "INTEGRATION: CWS hedaburemove01:
 #72503# get rid of hedabu procedure: Moving headers to svtools/inc/svtools and
correspondent necessary changes"

Change-Id: I8a919b35f90acde5a72616b311a3e66c591c1e36
Reviewed-on: https://gerrit.libreoffice.org/47917
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-16 08:42:10 +01:00
Jim Raykowski 77acf66a34 change Not to Dont in tdf#36308 fix
Change-Id: I05806eea3363b7363d7a377277c63785aadc5386
Reviewed-on: https://gerrit.libreoffice.org/47870
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-15 22:29:11 +01:00
Stephan Bergmann 6feb524aaf More loplugin:cstylecast: svtools
Change-Id: Ia9517b20d6579a77a81906aff16068b732ada878
2018-01-15 09:02:44 +01:00
Stephan Bergmann 43b137e140 More loplugin:cstylecast: svtools
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files

Change-Id: Ide9e7c53b554f0a36e2078a8823f5ef6fb5cc8fa
2018-01-12 20:14:18 +01:00
Jim Raykowski 582b2ed5ba tdf#36308 make double click not expand/collapse node in Navigator tree
Change-Id: I0075af147e5aa02f09db57fc2113dcdfcab5bc57
Reviewed-on: https://gerrit.libreoffice.org/47241
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-11 11:30:08 +01:00
Tomaž Vajngerl 0189792bd8 SAL_WARN when using the interal GraphicObject URL
Write a warn if a URL is created from a internal GraphicObject
URL as this is now deprecated.

Extract the way to determine if a URL is internal to its own
function, so it can be used to check and rewrite places that use
it.

Change-Id: Iedf13a596eab839094ea98e41787865bf6783adf
Reviewed-on: https://gerrit.libreoffice.org/47495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-01-07 03:24:19 +01:00
Takeshi Abe 1a012a90b4 svtools: Simplify TabBar_Impl with std::unique_ptr
Change-Id: If477373f6e5a39ccd61332356a821f7c7d38d28d
Reviewed-on: https://gerrit.libreoffice.org/47488
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
2018-01-07 02:51:41 +01:00
Takeshi Abe d25465aed6 svtools: Simplify HeaderBar with std::unique_ptr
Change-Id: I5376616ed1b1a1087dd8bac6830d31212252e4bd
Reviewed-on: https://gerrit.libreoffice.org/47459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-06 07:44:46 +01:00
Jan Holesovsky 7ca3490d91 lokdialog: Use only one of the installed langpacks when setting locale.
Change-Id: I446775b121b7806a549f4dbbaa1f2dcf019d9bc2
Reviewed-on: https://gerrit.libreoffice.org/47386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-01-05 09:51:54 +01:00