summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-19Fix typosAndrea Gelmini
Change-Id: Ideee477b0c8f0d472a607ed69ba51351d87f61bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101010 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-08-19sd signature line: preserve current page after signingMiklos Vajna
Once the user adds a visible signature to a PDF file, we reload the document, so what you see on the screen matches what's in the file (and you can add a next signature). Make sure that in case the signature is not on the first page, the current page state is preserved. Change-Id: Ia1780ce5602ee350855b6dec8340a65e63bf2d4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100999 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-19Make "Location" line stick to the bottom of the table of JREsStephan Bergmann
At least on Linux with SAL_USE_VCLPLUGIN=gtk3, this already happened to be laid out well, but e.g. on Linux with SAL_USE_VCLPLUGIN=gen and on macOS, there was blank space between the table and the "Location" line, and the latter was rather kept close to the following "Optional Features" section. (There still appears to be variance among the various backends how the two "Java Options" and "Optional Features" sections are spread out vertically when the dialog is resized.) Change-Id: I58ba9fc0e29916f0fa0efb7c3180da058ba72f0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100921 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19Remove BuildVersion also from Android and iOS version ini filesStephan Bergmann
...after 5fdf2009d21fa220dfee70ea755bd698c16257a7 "tdf#134522 remove --with-build-version ./configure flag", 00fa759dc9f13eb4618a7762be9ca6eaf3fd37f7 "tdf#135133: Don't try to read BuildVersion", and 6ee46adb446f5350df2b1efc7fc3ffe2506dfaa0 "Remove BuildVersion from installation set version ini files" already removed it from anywhere else Change-Id: I42ccf35d6952ad0a826517ecadfe0ebb3bb704a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101003 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19Allow to set LO_ELFCHECK_ALLOWLIST in autogen.inputStephan Bergmann
(To minimize disruption with other people's potential use of the variable, when it is not set during configuration make sure not to export it as empty from config_host.mk, so that it can then still be passed as an environment variable to individual `make` invocations.) Change-Id: I785910f1076c05905e354ef846d16ffb7ea0a081 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101002 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19weld OTitleWindowCaolán McNamara
Change-Id: I10996b1d927e6e8db913d04d975fda69669a2988 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100984 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19tdf#135329 sw MS export: don't miss nextAttr fly positionJustin Luth
Step 1 - write out bypassed flies. This patch is Step 2 - don't bypass fly position. The SearchNext function was skipping some flies because it was not returning them as a stopping position (nextAttr). The time I noticed this happening was at the start of the paragraph, when there were zero-anchored paragraph flies which hadn't been processed and so they returned a non-usable minPos. With this patch, I OUGHT to have rendered Step 1's patch unnecessary. Change-Id: I9924dbf5424f5b0309ec944e1bb79380672220f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100387 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2020-08-19tdf#135412 tdf#135888 sw: fix copying of linked text-boxesMichael Stahl
The resetLink()/restoreLinks() were added in commit 00a007be5ad88bac9905b373bc5e02d02acab11a because testMissingPath missing-path.docx was crashing. But then 0bcc5b3daebeb2a7d2b5ba132af4745cc6c78cd0 refactored how linking works and introduced the isTextBox function, which is called in the middle of DocumentContentOperationsManager::CopyFlyInFlyImpl() after resetLink(), and this now always returns false, the same for another call inside CopyLayoutFormat() (when called from CopyFlyInFlyImpl()), which causes text-boxes to be copied to 2 separate flys (tdf#135888). The problem in tdf#135412 is that somehow when called from SwFEShell::Paste() the content-index from the clipboard document ends up in the SwDrawFrameFormat that is created in the target document, and this causes crash in Undo because the node index is out of bounds. 10 SwUndoInsLayFormat::UndoImpl (this=0x7c2a760, rContext=...) at sw/source/core/undo/undobj1.cxx:310 (rr) p rContent.GetContentIdx()->GetNode().GetDoc()->IsClipBoard() (rr) $29 = true It turns out that missing-path.docx doesn't crash any more without resetLink(), and removing it fixes the 2 bugs. Change-Id: I0c6c91a42e00b9f3b79b774c814e7323f2bb3e05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101004 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-08-19add a Title label type for base's title windowsCaolán McNamara
Change-Id: I306591e931f7b4be8222cb6160032d7d105c522d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100994 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19make a LabelType enum distinct from MessageTypeCaolán McNamara
Change-Id: Ib548cf9f97eb356dfe8f612c177dc29883e9128a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100993 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19Fold Bootstrap::Impl::getVersionValue into its single useStephan Bergmann
...thereby fixing that it returns _sDefault instead of an empty string when "version.ini (versionrc) doesn't exist" Change-Id: Ie38afb6d87bd908f8a9773daaf5cee56751ae950 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101000 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19Remove BuildVersion from installation set version ini filesStephan Bergmann
...after 5fdf2009d21fa220dfee70ea755bd698c16257a7 "tdf#134522 remove --with-build-version ./configure flag" had already removed it from the instdir/ version ini file (but apparently forgot to also remove it from installation set version ini files) and 00fa759dc9f13eb4618a7762be9ca6eaf3fd37f7 "tdf#135133: Don't try to read BuildVersion" removed its last consumer now Change-Id: I98fd71e218fc0ede74ebc1b2e649011616d559ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100997 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19don't split polypolygon in canvas if not needed (tdf#135395)Luboš Luňák
Those polygons will be merged back in Skia because of 12147e0322e0fdd1b561c94e7ebd3fdd69ceaac0, which is costly with tdf#135395. And if the only reason for the splitting is that the polygon requires a winding rule but DrawPolyPolygon() uses evenodd rule, then simply convert the polygon to the evenodd rule. Change-Id: Iba5ec31d6d6407f734b20badc80c846071068d40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100976 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-08-19don't assert on dumping screenshot under XCaolán McNamara
e.g. on sceenshot to dbaccess/ui/savemodifieddialog/de/SaveModifiedDialog.png looking at the output its better to include the csd offset under X too Change-Id: If9e1f8d6350a7931461804c459d0d4a88a01b523 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100983 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19isStaticLocal should imply hasGlobalStorageStephan Bergmann
(See documentation of clang::VarDecl::hasGlobalStorage: "This includes all global variables as well as static variables declared within a function.") Change-Id: I59d9e9e946033b6d4c52e80cfeaf59a9b036b349 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100995 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19Fix typo in codeAndrea Gelmini
Change-Id: Ie8ebbfd9bdf5916d50161fdf39de963730f051a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100868 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-19use switch statementCaolán McNamara
Change-Id: I64a61a2d08196b86e0dcb789c06a2b90f62a8097 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100992 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19support the background color used by base's title windowsCaolán McNamara
Change-Id: Id5e9b34f35bdcd38c7d22797573ce2549f842a66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100991 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19restore call to dragFinished on successful dropCaolán McNamara
Change-Id: Ib8a1e7f38d4e5f658ff55b645d39b0c521e21f87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100990 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19update pchesCaolán McNamara
Change-Id: I6a300169d33bdc36e4c7e720a7afc336a86eea68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100962 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19Fix typosAndrea Gelmini
Change-Id: I58c510121a9f535b2a31854f10b5f6535554d379 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100988 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-19Fix typosAndrea Gelmini
Change-Id: Ibe3cd52117f7f47e1806bde76114cb1644d78763 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100969 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-08-19put label inside another window to create the paddingCaolán McNamara
instead of using blank labels for spacing Change-Id: Ie3c7f761bccbaf916473e7ef92912bdb62e43c5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100979 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19headless: don't allow the system to set subpixel rendering eg.Michael Meeks
Change-Id: Id62c03938c88d70dabda6111b8a7cca3b175e31f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100875 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 985922fe1a5dfd9ce02f7d24c4083d9d69544951) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100805 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-08-19Restore "bff: terminate on SAXException on malformed input"Caolán McNamara
This reverts commit 50fd69dfe25d14c75f0dae7fa1bf276ea6deefd3. now that... commit 986bd28388df745dd969e7be7c3bda36b2b2cb0e Date: Thu Aug 6 10:50:47 2020 +0100 ofz#24641 libc++abi __cxa_exception has grown another member solved the substantial problem Change-Id: I38734d99a2c8d9e272547ea657555eb4b59a5052 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100974 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19Remove unused includeStephan Bergmann
Change-Id: I019148e0823e68ccbb1cf60f6eac9e69b634515b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100973 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19Always prefer Value over ResourceURLMaxim Monastirsky
Make this not depend on a particular implementation in the UIControllerFactory class. Change-Id: I277a6e6c9fa986cbdb0cf03975f91731c6187dca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100966 Tested-by: Jenkins Tested-by: Maxim Monastirsky <momonasmon@gmail.com> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-08-19Use ToolBox::GetImageSizeMaxim Monastirsky
Change-Id: Ie7ae46001589584482bf5efe698b3774edace325 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100968 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-08-19Related: tdf#135369 Handle missing icons in ImplImageMaxim Monastirsky
Don't see a reason for returning false only if the missing icon is of a command with arguments. Change-Id: I06caa806ee86212d436bbb5a4dae5ee8096e060b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100965 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-08-19tdf#135133: Don't try to read BuildVersionMike Kaganski
The option to set it was removed in 5fdf2009d21fa220dfee70ea755bd698c16257a7, and now the check is redundant - and even harmful until the remnants of the setting is dropped from bootstrap.ini. Currently the dummy value found there makes the About dialog miss the build id, and copying info to clipboard gives <buildversion> instead of proper build id. Previously the string was always empty in most builds (including TDF), which made the code proceed to buildid. Bootstrap::getBuildVersion got unused now, and is removed. Change-Id: If59e456655da29bb9421edc0e15d421829d0a02b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100957 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-08-19tdf#127471 Remove font width scaling hackSamuel Mehrbrodt
Which causes distorted fonts in certain cases (see bug report). Fix was suggested by Ilhan Yesil at https://bugs.documentfoundation.org/show_bug.cgi?id=127471#c6 Change-Id: Ie644f56f0835ffad9230f981d2927d6b4c17453d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100970 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-08-19tdf#123647 Chart XLSX export: fix missing empty chartTünde Tóth
Save empty chart as empty bar chart, because a chart without chart type is invalid. Change-Id: Ieb9cc4300070b5280565fe814ba0343640dfff0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100844 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-08-19don't include syntax highlighting in undo/redoCaolán McNamara
Change-Id: I7d7560fe94a7c9748ddd1a5e5584ef3e4b1efea2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100959 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19move VclMultiLineEdit to toolkit-only headersCaolán McNamara
Change-Id: I2e8728061e484f79768fcfe67d674cb76367a94d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100951 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19weld OQueryTextViewCaolán McNamara
its plausible with the EditEngine replacement for the SQL editor that the undo could be integrated better than the current check-if-the-text-has-changed timeout method. But that's left unchanged with this commit. Change-Id: I9b9e373044a80ee94dab4ceaad0ef2801b0b1166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100950 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19tdf#112290 sw: fix missing line break in small capitalAttila Bakos
Calculated hyphenation positions are skipped in the case small capital text, resulting long lines exceeding paragraph width, for example after wide images. Likely the reason of the problem is tdf#78527 "FORMATTING: automatic hyphenation doesn't work on text in small caps or all caps". Change-Id: Ia0121728bcc099f3ec19e01afd64e1594d6274be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99992 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-08-19Fix typoAndrea Gelmini
Change-Id: Ia659860a0512ef0bb9405e794bb4c5fc4c6f6f55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100923 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2020-08-19Drop fallback to read buildid from boostrap ini fileStephan Bergmann
f9e6d8d7c33a308f6f1c15929dd839de2abae3b5 "INTEGRATION: CWS nativefixer18: fix: #124825# read build id from version.ini" from 2005 had left the previous code to read from the bootsrap ini file as a fallback, presumably intended for some (short) transition period. (Plus loplugin:elidestringvar fallout. And fix the comment, which appears to have been non-matching right from the start.) Change-Id: Ia50228f4ae21e9f7ded48fe47d68fcd9931b090c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100967 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19vcl, sd: various small cleanupsMiklos Vajna
Change-Id: Ic7ad2e044cc1807b105bcad2daf978224b96f298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100956 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-19Spurious space at start of generated version ini fileStephan Bergmann
...since 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610 "tdf#118303 - Wrong converting of the Vendor-String" Change-Id: I192f8b9cfaba0863612c9099b926ea5828783bd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100963 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-19convert SvXMLStylesTokens to scoped enumNoel Grandin
as a step towards converting the *StyleContext classes to fastparser Change-Id: I0440cbce91d7b20e7181c3a6112791a9af2210b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100954 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-19Fix typo in codeAndrea Gelmini
Change-Id: Ied22aa3812e7db3550e8884720b1df32e38c65be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100870 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-18Remove code that has become nonsense over timeStephan Bergmann
The getToken call started out as > commit 6f9dff66ee12c3cf5874fd4a33b82dbb090fe124 > Author: Caolán McNamara <caolanm@redhat.com> > Date: Tue Jun 28 13:00:51 2011 +0100 > > break build id into multiple lines if using g log > > diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx > index 3157a9b48fd7..863bd90312fa 100644 > --- a/cui/source/dialogs/about.cxx > +++ b/cui/source/dialogs/about.cxx > @@ -72,13 +72,34 @@ Image SfxApplication::GetApplicationLogo() > return Image( aBitmap ); > } > > -/* intense magic to get strong version information */ > +/* get good version information */ > static String > GetBuildId() > { > rtl::OUString sDefault; > - String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) ); > - OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" ); > + rtl::OUString sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) ); > + //strip trailing - from ./g log > + if (!sBuildId.isEmpty() && sBuildId.getStr()[sBuildId.getLength()-1] == '-') > + { > + rtl::OUStringBuffer aBuffer; > + sal_Int32 nIndex = 0; > + do > + { > + rtl::OUString aToken = sBuildId.getToken( 0, '-', nIndex ); > + if (!aToken.isEmpty()) > + { > + aBuffer.append(aToken); > + if (nIndex % 5) > + aBuffer.append(static_cast<sal_Unicode>('-')); > + else > + aBuffer.append(static_cast<sal_Unicode>('\n')); > + } > + } > + while ( nIndex >= 0 ); > + sBuildId = aBuffer.makeStringAndClear(); > + } > + > + OSL_ENSURE( sBuildId.getLength() > 0, "No BUILDID in bootstrap file" ); > return sBuildId; > } > presumably at a time when utl::Bootstrap::getBuildIdData returned multiple git hashes for the split repositories back then, separated by dashes. Then > commit 8a3aae9b694deb2b41157509e84815a5b7fb7655 > Author: Andrew Higginson <at.higginsonAtgmail.com> > Date: Tue Apr 10 12:43:48 2012 +0100 > > Resolves: fdo#31022 about dialog is suboptimal > [...] > diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx > index 3ee3e8fad261..a4352e1dd396 100644 > --- a/cui/source/dialogs/about.cxx > +++ b/cui/source/dialogs/about.cxx [...] > +rtl::OUString AboutDialog::GetBuildId() > +{ > + rtl::OUString sDefault; > + rtl::OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault)); > + if (!sBuildId.isEmpty()) > + return sBuildId; > + > + sBuildId = utl::Bootstrap::getBuildIdData(sDefault); > + > + if (!sBuildId.isEmpty()) > + { > + sal_Int32 nIndex = 0; > + return sBuildId.getToken( 0, '-', nIndex ); > + } > + > + OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" ); > + return sBuildId; > +} [...] changed that to only use the first dash-separated part of utl::Bootstrap::getBuildIdData. The commit (and the corresponding <https://bugs.documentfoundation.org/show_bug.cgi?id=31022> "EasyHacks: 'About dialog' wording and layout are suboptimal") is vague on why it did that, but maybe the value returned by utl::Bootstrap::getBuildIdData had meanwhile been reduced to a single git monorepo hash value without any dashes anyway. Finally, > commit ab846145bbd56f4308c8657df8b1354a403edd74 > Author: Heiko Tietze <tietze.heiko@gmail.com> > Date: Wed Apr 29 11:39:57 2020 +0200 > > Resolves tdf#132322 - Link to Gerrit hash reintroduced > > Mulit-line label split, Build realized as link_button > > Required changes also solve tdf#132066 partially as many > localized strings are not anymore copied to clipboard > > Change-Id: I346fdc65cd1734f17854eccd587fe0b7e216e720 > Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93119 > Tested-by: Jenkins > Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> > [...] > diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx > index ed58d06acc1c..845ad5496a37 100644 > --- a/cui/source/dialogs/about.cxx > +++ b/cui/source/dialogs/about.cxx [...] > +OUString AboutDialog::GetBuildString() { > [...] > + OUString sDefault; > + OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault)); > + if (sBuildId.isEmpty()) > + sBuildId = utl::Bootstrap::getBuildIdData(sDefault); > + if (sBuildId.isEmpty()) { > + sBuildId = sBuildId.getToken(0, '-'); > + } > + OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file"); > + > + OUString sBuildStr; > > if (!sBuildId.trim().isEmpty()) { [...] > + sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID); > if (sBuildStr.indexOf("$BUILDID") == -1) { > SAL_WARN("cui.dialogs", "translated Build Id string in translations " > "doesn't contain $BUILDID placeholder"); > sBuildStr += " $BUILDID"; > } [...] > + sBuildStr = sBuildStr.replaceAll("$BUILDID", sBuildId); > } > + return sBuildStr; > +} apparently made two mistakes: For one, it dropped the early returns, so that cutting at the first dash would also be done for a non-empty value returned from utl::Bootstrap::getBuildVersion, and not only for the value returned from utl::Bootstrap::getBuildIdData. But for another, it lost the "!" negation, so that if (sBuildId.isEmpty()) { sBuildId = sBuildId.getToken(0, '-'); } is dead code now. The best solution for this mess is probably to just not attempt any kind of cutting at a first dash. Change-Id: Id801bb5995325e4d6cc6f8d257afe1af64ef12bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100961 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-18Fix hyperlink popup does not show upMert Tumer
The popup does not show up when double clicking same cell after first one when the cell has a hyperlink. This is because LOK_CALLBACK_INVALIDATE _VISIBLE_CURSOR message is filtered out when it is duplicate and hyperlink is inside this callback. Selecting different cell after editing one does not make calc to send another invalidate cursor message because it is only sent if the selected cell is being edited. This confuses the ui experience, so this patch prevents the callback from being filtered out if only it contains a hyperlink. If there is not a hyperlink on the cursor position the duplicate callbacks will still be filtered out. Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: Ibca0887b7d49633e476bc63d08bc0b7cc309d710 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100851 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-18tdf#132555 PPTX VML import: handle stroke properties of image shapesMiklos Vajna
ComplexShape::implConvertAndInsert() returns early in the graphic object shape case, so stroke model is not applied at all. Also fix a problem in ShapeBase::finalizeFragmentImport(), where the shape type had no stroke, but the shape itself had, and the later should win. The warning in OleObjectGraphicDataContext::onCreateContext() now points out that <mc:AlternateContent> is ignored as a child of <a:graphicData>, which probably should be addressed at some stage, but it's not required to fix the missing stroke. Change-Id: I4ab43b4c6d40d9f43caad22b85f5b885fa8b4ef1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100952 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-18Improve location of unfold fold code use in outline moveJim Raykowski
Change-Id: I299f871c4d6e06f63efaf80e04cb668c52ae8543 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100829 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2020-08-18Fix typosAndrea Gelmini
Change-Id: I85a91d24943430b42217ac91611f182059d8ec69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100919 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-18Fix typosAndrea Gelmini
Change-Id: I9d55e4478d8cf3047b4ccac88e06fdc87e68e6ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100871 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-08-18Removed duplicated includesAndrea Gelmini
Change-Id: I61861d87449f83cb3a1efe8a2cf0345864c2f1db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100918 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-08-18Fix typo in codeAndrea Gelmini
Change-Id: I7a9b2dccc118395494cf39cfa64867c09a358c31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100869 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
generated by cgit (git 2.34.1) at 2024-06-29 16:39:30 +0000