summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-10-29bump product version to 6.1.3.2.0+libreoffice-6-1-3Christian Lohmaier1-1/+1
Change-Id: I1dea874f7ac5edacfaa54541ca59f26f68b5364c
2018-10-29update creditsChristian Lohmaier1-1443/+1454
Change-Id: I8a383888ae8e2da96c7eef94c40cf3ddb7815d98 (cherry picked from commit 360b557c28c7f19731d566c01627cc104d06638a) (cherry picked from commit cb5584c8a715df8aa68cecefd0bad8d1839124e8)
2018-10-29Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1-3' - update translations for 6.1.3 rc2 and force-fix errors using pocheck Change-Id: I8707b11ce2d130f136617e928e7b705c47721fef (cherry picked from commit 617684686d72dd389f37b16128deba8c5282ecc4)
2018-10-28tdf#120376 sd: fix duplicated styles on copy/pasteMichael Stahl1-2/+3
Unfortunately the comparison was inverted, so a style is copied iff it already exists, which is clearly the reviewer's fault... (regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b) Change-Id: I3425982feb08e980eca9243cc16120897b65a70f Reviewed-on: https://gerrit.libreoffice.org/62436 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1) Reviewed-on: https://gerrit.libreoffice.org/62449 Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 8bef4f3033fff8eb12a58d3fa4cdd49076e18cf2) Reviewed-on: https://gerrit.libreoffice.org/62474 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-27Resolves: tdf#120003 missing prefix to link url in .doc importCaolán McNamara2-12/+30
regression from... commit 9b77f8142bf665a47c3a179e3fe3f82623a99f8a Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Apr 6 15:08:45 2017 +0100 ditch ReadRawUniString three argument lclGetString32 variant mistaken for two argument lclGetString32 variant Change-Id: I163aad0de7873487d9f9c8b6c28d162159fe7ad4 Reviewed-on: https://gerrit.libreoffice.org/61887 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit faf048080124a4e1c9fcb4637fa9541921c758bd) Reviewed-on: https://gerrit.libreoffice.org/61923 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-27tdf#120674 set DlgEdForm early in DlgEdObj::EndCreateArmin Le Grand1-3/+16
Change-Id: I5ba0504265f5692614a8db0117883528bd4bfc0b Reviewed-on: https://gerrit.libreoffice.org/62000 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 92b849b9297cbf78bddf5e48bdbd44303a7021db) Reviewed-on: https://gerrit.libreoffice.org/62225 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-26tdf#120387 get lock to use ImpEditView::CutCopyJan-Marek Glogowski1-38/+23
ImpEditView::CutCopy releases the SolarMutex to handle clipboard access. So lock the SolarMutex when accessing this function through OutlinerView::Copy(). Now all paths effectively need the SolarMutex, so remove all the intermediate locking. I guess the explicit release for the xTransferable.is() test isn't needed. Change-Id: Ib2a69a520bbf0ef7ba4ccb893c6489b292207f2a Reviewed-on: https://gerrit.libreoffice.org/61580 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit c11ee0f7b0e4e7bf4d1e2e5bb4309f24b917ce79) Reviewed-on: https://gerrit.libreoffice.org/61585 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 72a44569af5d69b3093d01e4d16448509a8ad807) Reviewed-on: https://gerrit.libreoffice.org/61650 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-10-26tdf#118963 Hand over a SdrModel to createControlLabelPairArmin Le Grand5-21/+78
Change-Id: I34a35ff0700d14474fa9946851812c25c4eb4bc1 Reviewed-on: https://gerrit.libreoffice.org/58187 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit e5ee79b5c089e72e6b24c04c7c820d706bd39993) Reviewed-on: https://gerrit.libreoffice.org/61316 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2cf13c31c6aa262e4bb4b075597f3543ecd3c4a6) Reviewed-on: https://gerrit.libreoffice.org/61936 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-23Resolves: tdf#73081 empty <> not-empty is also a match if numericEike Rathke1-3/+3
This simplifies to match empty for the same conditions whether numeric or not, an empty string does not result in numeric 0 here. Change-Id: I923a3e1f07dd2691d3ac720fc28ba76986fe6c3d Reviewed-on: https://gerrit.libreoffice.org/61486 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 9d8c89d9044edb5ad5c8bc4a8f0fd5868192714e) Reviewed-on: https://gerrit.libreoffice.org/61640 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-23tdf#120795: fix ooo2wordml_list.xsl syntaxJulien Nabet1-0/+3
See errors in comments from tracker Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=1501df419ea4d40358d705a281fd9662088ba51e Change-Id: I9bbf970ac2b8cbf8fcc448f0847f61e8606797c7 Reviewed-on: https://gerrit.libreoffice.org/62205 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 2995a95d8efa727ea53b06323c0b2bdc52e1aed0) Reviewed-on: https://gerrit.libreoffice.org/62211 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-10-22keep pyuno script processing below base uriCaolán McNamara1-2/+28
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7 Reviewed-on: https://gerrit.libreoffice.org/61971 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-22tdf#69460, tdf#118416: Don't copy whole columns to the clipboardTor Lillqvist1-19/+47
...for the BITMAP or PNG formats either. Change-Id: Ib1739ceb917fe24dac412007fd6522e40f5517c4 Reviewed-on: https://gerrit.libreoffice.org/56577 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/61852 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-10-19tdf#118690 don't try to process all messagesJan-Marek Glogowski1-1/+6
Regression from commit 221b0ab1245b ("WIN use Reschedule instead of own dispatch loops"). This limit the maximum reschedule loops as the original code did. There is still a busy loop when opening the print dialog, as it was before the patch, but this at least gets printing started. Change-Id: If867329b82b13c898bb15b08584244084488a66c Reviewed-on: https://gerrit.libreoffice.org/60310 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 79cb9ef524c3a6b058019da5ca6acfad7a895bf2) Reviewed-on: https://gerrit.libreoffice.org/60941 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 376a4c754a2bf95b3033b88d68e98a562ba8632b) Reviewed-on: https://gerrit.libreoffice.org/61655 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-19tdf#120478: fix wrong icon when JDBC driver test failsJulien Nabet1-1/+2
Change-Id: I1d96e4a5e091caddf46131385ff5274521844fa9 Reviewed-on: https://gerrit.libreoffice.org/61637 Tested-by: Jenkins (cherry picked from commit 8b44c2c525a663dbee3d88785ddcd0d5781002da) Reviewed-on: https://gerrit.libreoffice.org/61645 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-19tdf#120158: Base CMimeContentType on INetMIME::scanContentTypeStephan Bergmann3-254/+19
...instead of using yet another local implementation of parsing media types. CMimeContentType is the implementation of the UNO css.datatransfer.XMimeContentType interface. One observable change in behavior is that type, subtype, and parameter names will now always be reported in lower case instead of with the casing from the input preserved (but those differences in casing are functionally equivalent per the media type specification). Also, parameter names supplied to the hasParameter and getParameterValue functions are now also treated case-insensitive. The upside of this change is that INetMIME::scanContentType (via "The encoding of rMediaType should be US-ASCII, but any Unicode values in the range U+0080.. U+FFFF are interpreted 'as appropriate.'") already implicitly supports RFC 6532 "Internationalized Email Headers" extensions for media types, allowing quoted- string parameter values to contain non-ASCII Unicode characters. That means that tfd#120158 "Impossible to paste special in Writer from Calc in Libreoffice 6.1.x in some UI languages - the dialogue caption says 'unknown source'" can be fixed by just allowing non-ASCII typename parameters being generated in ImplGetParameterString in svtools/source/misc/transfer.cxx, and reverting the problematic (see the comments there) previous fix <https://gerrit.libreoffice.org/61601> "tdf#120158: fix ImplGetParameterString for typename". (Which will be done in a follow-up commit, to ease potential backporting, as that previous fix has already been backported to some versions but not to others.) Reviewed-on: https://gerrit.libreoffice.org/61684 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b75e3ded1f73c943fb09f117e476e367ac0c3413) Conflicts: dtrans/source/cnttype/mcnttype.cxx Change-Id: I5d4d3586e8046f288a97605b000e262a8db5a4e9 Reviewed-on: https://gerrit.libreoffice.org/61702 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-19Resolves: tdf#115182 default Chart percentage format is integerEike Rathke5-50/+54
Regression from commit 0f4b3cb7d3d68906de316a64dcec281da2a641bd CommitDate: Mon Aug 10 17:12:45 2015 +0200 The chart2/qa/extras/xshape/data/reference/tdf90839-?.xml reference files were created with the then wrong default of two decimals so need to be adapted. For chart2/qa/extras/xshape/data/reference/tdf90839-1.xml this meant to regenerate because of the changed positions and sizes of labels. Change-Id: Ib0c2c862af9399ab2af5178d01510aa5e4fff97c Reviewed-on: https://gerrit.libreoffice.org/61826 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 9672d034b9e760f24ac9a6652ab45dee15ee260a) Reviewed-on: https://gerrit.libreoffice.org/61855 Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 7d17e8e1798b7120b9e8559d042de2afc0a078e3) Reviewed-on: https://gerrit.libreoffice.org/61857 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-19Resolves: tdf#120487 postit losing focus triggering recreation of postitCaolán McNamara1-1/+4
Change-Id: Idde6b740bc94de62bbd528b656841ab37e3f3786 Reviewed-on: https://gerrit.libreoffice.org/61682 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit f1e09253316d9db39b7adab6d31e759c09de3406) Reviewed-on: https://gerrit.libreoffice.org/61786 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-18update creditsChristian Lohmaier1-1887/+1921
Change-Id: I666805e38c40826328d8c4226c394d4c3072b2a7 (cherry picked from commit c3eb1c85f95168f8e84b8f655c839eff23c7e98a) (cherry picked from commit 67c65aa21335cf28aca2e92a9fa2f180aa800ea6)
2018-10-18tdf#119067 DefaultLabel only for interactively created OBJsArmin Le Grand2-19/+40
Both have to work - the Wizard-created report which this report defines and the interactively created ones (see tdf#118730). The second was moved to OUnoObject::CreateMediator and by error sets the default text (e.g. 'Label') now all the time. This was wrong. To solve, remember if the Object was created interactively (which is the case when ::EndCreate was called which is needed again) and set the default only when that is the case. Change-Id: Id26e701d863b098a77db5f6419bcabf1f2ec5017 Reviewed-on: https://gerrit.libreoffice.org/61620 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> Reviewed-on: https://gerrit.libreoffice.org/61654 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-10-15Resolves: tdf#120031 skip min/max for empty string in GetSavedIntValueCaolán McNamara1-1/+6
so "" turns into 0, which is which we want for the single use case here in 6-1 Change-Id: I3e28b09e2ed99ab90583b087b4100efe4935414a Reviewed-on: https://gerrit.libreoffice.org/61378 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 5239c649ead0344f6a8fc1bcee44a2ec9fd6ae56) Reviewed-on: https://gerrit.libreoffice.org/61712 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-10bump product version to 6.1.3.1.0+Christian Lohmaier1-1/+1
Change-Id: I1ebf93781d234464ed1520aef8d81eea22e9488e
2018-10-10Branch libreoffice-6-1-3Christian Lohmaier4-1/+1
This is 'libreoffice-6-1-3' - the stable branch for the 6.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2385fb3c54a78a05c67cc2d9d055ab45aece4520
2018-10-10tdf#120422 LibreLogo: fix page and line formatting of "magic wand"László Németh1-2/+2
Format program lines as paragraphs, instead of a single paragraph with line breaks: - basic debug feature "jump to the bad line" works after formatting - fix 2-page editing area: page break before the LibreLogo program Now formatting of program lines doesn't depend on the actual regular expression setting of Search & Replace functionality of Writer, so this is the intended fix for tdf#100941 "LibreLogo: 'magic wand' icon inserts incorrect '\n' characters instead of paragraph breaks". NOTE: setting also AlgorithmType, not only AlgorithmType2 prevents crashing of LibreOffice at opening Search & Replace dialog after usage of the "magic wand" icon. partial revert of the commit b1a6d157683b8182089ed5854179c8da8c416304 Resolves: tdf#100941 LibreLogo: replace literal '\n' with newline Change-Id: I34f581278fdae8d41967800d05662e37b731b59d Reviewed-on: https://gerrit.libreoffice.org/61610 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 3a81c0d402d70b00351d1b236939976d589856b8) Reviewed-on: https://gerrit.libreoffice.org/61617 Tested-by: Jenkins
2018-10-09tdf#118764 Sidebar style panel tab stopsJim Raykowski1-3/+3
Change-Id: I307de58a10ec3a79dcf75b9b1383e951b38a9d93 Reviewed-on: https://gerrit.libreoffice.org/61147 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit d9cb4522087d1ef1cafe4333f9b91a62a4657403) Reviewed-on: https://gerrit.libreoffice.org/61574 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09tdf#120271 related: Allow finalizing of LastTimeGetInvolvedShownMike Kaganski1-1/+2
This avoids abort() on modifying the setting in case it's finalized Change-Id: I5982a4d7bf867301d7ba0e7e0dbb3f7c87013134 Reviewed-on: https://gerrit.libreoffice.org/61430 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit ec235750bb30c3b66bd8b642f6abd1f9ea8244df) Reviewed-on: https://gerrit.libreoffice.org/61543 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09Resolves: tdf#120370 should check gradientgrid sensitivityCaolán McNamara1-1/+1
rather than whether listbox first entry is not selected Change-Id: Ic3dc574f6f1a476929e89e695849756437024cee Reviewed-on: https://gerrit.libreoffice.org/61560 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09tdf#120318: remove autofilter for the momentJulien Nabet1-1/+0
Before adding it the entry again, please implement it and test it. See comments of the tdf. Change-Id: I64a5729baf589dbd188b6e8fcd5075112e5a7da7 Reviewed-on: https://gerrit.libreoffice.org/61558 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit cc6d591e1c4202afdbc30a76fd56d66b7547fa34) Reviewed-on: https://gerrit.libreoffice.org/61570 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-10-09tdf#115405, tdf#119910: don't check if UCRT is already installedMike Kaganski5-20/+7
There appears to be common situation that a system has *some* UCRT libraries in System32, that were installed improperly (presumably by some applications using simple copy).In these cases, our installer would detect the presence of ucrtbase.dll, and not try to install UCRT on the system. Unfortunately, it seems that oftentimes such improper UCRT installations miss some parts of UCRT, which leads to LibreOffice failing to start with messages like "The program can't start because api-ms-win-crt-string-l1-1-0.dll is missing from your computer. Try reinstalling the program to fix this problem." (the missing component varies). This patch removes the check for UCRT presence. Installer will try to install UCRT on applicable systems unconditionally. Since the proper outcomes in case of already present UCRT are either WU_S_ALREADY_INSTALLED or WU_E_NOT_APPLICABLE and both are treated as success in inst_msu action (see InstallMSU in setup_native/source/win32/customactions/inst_msu/inst_msu.cxx), this should only make this part more robust, and not bring new problems (yes, I know that actually there will be new problems, as usual). Change-Id: I22a3d357014d31a8e492ff8a15bcb477eeb79735 Reviewed-on: https://gerrit.libreoffice.org/60789 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 1882827320ed760de82211cf690b686f8d34ff74) Reviewed-on: https://gerrit.libreoffice.org/61444 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09tdf#115262 sc: fix cumulative placement error of imagesMiklos Vajna1-2/+13
Commit 708d1c5ab242b545ced598879233fc662d7e6cc0 (sc lok: emit RowColumnHeader info in twips, 2015-11-02) improved precision of the twip -> pixel conversion ratio, but ignored the detail that limited precision used to silence cumulative errors that appear with larger precision. The original use-case was better precision of row/column headers for the LOK API, so keep that as-is, but go back to the original behavior on the desktop. (cherry picked from commit 616fd241838069e18c59064e33c4b24f5ae112c6) Change-Id: Ide169ab1745a9a9299caf3334559884ff7223cbe Reviewed-on: https://gerrit.libreoffice.org/61312 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09filename may be nullCaolán McNamara1-7/+4
Change-Id: I373886d3613607b8ee8e96d8c0314865f3991a92 Reviewed-on: https://gerrit.libreoffice.org/61251 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09listen to [leave|enter]-notify-event at event widget levelCaolán McNamara1-2/+3
rather than toplevel. This avoid the problem under wayland where with an initially maximized calc clicking in it will select all cells from 0,0 to the clicked cell until the mouse is released Change-Id: I138fe587c9cb7cfff0293847c00730593e3244e1 Reviewed-on: https://gerrit.libreoffice.org/61088 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-09Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1' - update translations for 6.1.3 rc1 and force-fix errors using pocheck Change-Id: Iaab4f42c48aeae035788b95a7ec4880f2bdfb6e2
2018-10-08Resolves: tdf#93372 format table in base is ignoredCaolán McNamara1-2/+20
since... commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 Date: Sun May 17 22:56:46 2015 +0900 refactor how font, fg. and bg. are applied in widgets/controls revert the relevant piece, in this case there are two Windows/Contexts getting their settings manipulated, rather than the usual one Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d Reviewed-on: https://gerrit.libreoffice.org/61317 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455) Reviewed-on: https://gerrit.libreoffice.org/61324 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-10-08tdf#119904 : Generalize the fix for tdf#115093Dennis Francis2-13/+55
The point is, if one of the FormulaTokens in the formula is returned as the "result" FormulaToken, then we should not reuse that same FormulaToken for each formula-cell in the group. If we do, then we end up with whole group/batch having the same result. Also adds a unit test specific to this bug. This issue is non existent in master because "SoftwareInterpreter" and related code were removed from master long after branch-off to 6.1. Change-Id: I10265211b5f14c82ed385401aa3fb838c492872d Reviewed-on: https://gerrit.libreoffice.org/61362 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-10-07Resolves: tdf#106340 resize dialog when search/replace labels are shown/hiddenCaolán McNamara1-11/+55
Change-Id: I1e20807f613a73c7dbefcb8e331f99d484eb5c04 Reviewed-on: https://gerrit.libreoffice.org/61394 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-05Resolves: tdf#120175 normalize theme names to our naming schemeCaolán McNamara2-1/+4
So breeze-dark turns into breeze_dark Change-Id: Id5d06f73a79f099048b31fd16f9f9611236af392 Reviewed-on: https://gerrit.libreoffice.org/61321 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f317a3de7473de5e6366ba4f2a4aa0ca25cdfdc1) Reviewed-on: https://gerrit.libreoffice.org/61404 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-05Do not let end row creep above start row, tdf#69977 tdf#119305 follow-upEike Rathke1-1/+1
commit 3acc5a2383f5b0458e3caf1505fe6b8ad7dc3fb0 CommitDate: Tue Mar 27 13:26:30 2018 +0200 tdf#69977 improve creation of large charts changed the loop such that it removed the stop condition for rStartRow < rEndRow, and commit aaa3c31ba79b1b3d335dcf55d72837a13411b45e CommitDate: Tue Sep 11 20:29:04 2018 +0200 tdf#119305 Chart created from fully selected sheet only targets header row still checks only for a minimum of the original end row and the last data row, which for an empty (no data) range selected may be above the start row. Change-Id: I9de08d09be62e86e7c946df701c49314fa4d682e Reviewed-on: https://gerrit.libreoffice.org/61389 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 1371c2f4edab5086af6d0661de046252def29455) Reviewed-on: https://gerrit.libreoffice.org/61391 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-05tdf#120301 oox: lclIsWhiteSpace should return true for a spaceJustin Luth3-1/+20
Change-Id: I72c79c1fed4d9a91bf02024eef23cd3b1a58632e Reviewed-on: https://gerrit.libreoffice.org/61388 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 2cae2ecfef47d8dd10647c10f9577392c1887d3a) Reviewed-on: https://gerrit.libreoffice.org/61392 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-10-04tdf#119743: add Features entries in Properties block Drivers.xcuJulien Nabet12-3/+399
in order to save special options of a database file. Regression from d6fce54c82868b82bd6fa190db6047d69bbb3ecf Read https://bugs.documentfoundation.org/show_bug.cgi?id=119743#c5 for detailed explanation + merge with 6de679cca6978694bacf5322c9ab8559740f0443 1) Fix BooleanComparisonMode 2) Revert partly 568778874429595855b435792e5ebecd52956dae (UseKeywordAsBeforeAlias) See this commit for more details Change-Id: Icea932ef5e7358db1cd819583f6ef3ad9399ca87 Reviewed-on: https://gerrit.libreoffice.org/60471 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-on: https://gerrit.libreoffice.org/60890 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2018-10-04tdf#118139 Set Default StyleSheet only when availableArmin Le Grand1-2/+11
Change-Id: Id8643895add3181c41737249326bb49e1a2c2493 Reviewed-on: https://gerrit.libreoffice.org/57582 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 7d2668517b68f9a7f056a993e53b4dd80838a4f9) Reviewed-on: https://gerrit.libreoffice.org/61315 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#120249: escape trailing backslash in argument passed to soffice.binMike Kaganski1-1/+8
... to avoid treating \" as in-argument " instead of end of argument See https://docs.microsoft.com/en-us/windows/desktop/api/shellapi/nf-shellapi-commandlinetoargvw Change-Id: Ie283ba04117e13bc06c5b92412a945f945e67ff3 Reviewed-on: https://gerrit.libreoffice.org/61214 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit f4103a42d58535e21c48ff94ab000ab0305c62e3) Reviewed-on: https://gerrit.libreoffice.org/61222 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04sw: fix copying of PageDesc follows in SwDoc::AppendDocMichael Stahl1-9/+35
The problem in the bugdoc is that there are 2 styles; "First Page" has "Default Style" as the follow, and vice versa. When the "First Page" style is copied, its follow is copied as well, but the follow of the follow doesn't point to the *new* "First PageN" style that was just created, but the original "First Page" one. Change-Id: Ie5b0064581a585a3a545360ea5c05f60652f0d4e Reviewed-on: https://gerrit.libreoffice.org/60993 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a6a4fa526b8ad19ff6d44a89ee56d4268c8e90be) Reviewed-on: https://gerrit.libreoffice.org/61062 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#118199 avoid double dispose actionsArmin Le Grand1-2/+7
Cell::dispose may be (and gets in this case) called multiple times. Do not double-cleanup stuff. Change-Id: Icb907968e8211eb4ba0bbb1c4d060eb8be9a874a Reviewed-on: https://gerrit.libreoffice.org/56924 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit ea39c41fdf63191579d25f327db81db14862251c) Reviewed-on: https://gerrit.libreoffice.org/61318 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#119569 try most likely to succeed method to get column metadata _before_Lionel Elie Mamane1-16/+23
We first try to prepare the statement and get metadata information. That's fine. Some DB engines/drivers will not give column information on an unexectured prepared statement. In that case, first try to execute the statement with all parameters set to NULL, which is likely to succeed. If not, keep "execute the raw SQL indiscriminately" as a last resort. I'm not sure it will ever be useful, though. Change-Id: I76b5fd6b2059e96fabe9a611c8e3ed115acfc964 Reviewed-on: https://gerrit.libreoffice.org/60884 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit 6bebb05bd4b338e1ed3dac2c02b8b4186dc79675) Reviewed-on: https://gerrit.libreoffice.org/60885 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#119599 RTF import: fix missing deduplication of font sizeMiklos Vajna5-27/+63
Deciding when to and when not to deduplicate repeated direct formatting of paragraph / character properties is stricky, this bug is about a case when deduplication should happen and did not, since commit 1970a686273c5d4fc1eeb4430283e37085d9f647 (tdf#113408 RTF import style dedup: separate paragraph and character handling, 2017-10-31). Especially that deduplication works in both directions: it should remove properties which are duplicated and also should insert explicit default values for not repeated properties. Fix the problem by making the getDefaultSPRM() aware of the context (which style type it deals with), and then by making sure that only default properties relevant for the given style type are inserted. (cherry picked from commit 49614a9ea971ff7f370f863ce8a2735aab973cee) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfsprm.cxx Change-Id: I35b6599cc47fa51b8754fd921c61a3b31a283547 Reviewed-on: https://gerrit.libreoffice.org/61237 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#120015, don't crash without major tick marksMarkus Mohrhard1-0/+4
Change-Id: Icac79eb1c0c47388f96d37d2921c81fb6c848607 Reviewed-on: https://gerrit.libreoffice.org/60948 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 217cb86dd06f0c539d6181d9b7fd0d71c4edd628) Reviewed-on: https://gerrit.libreoffice.org/60962 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-04tdf#120057: protect sheet dialog checklistbox should be can-focusXisco Fauli1-1/+1
Same logic as fee3669a3395133a9e47ff2f0a96159cb3eefb89 Change-Id: I43c00a6fcd0e3b42798702f746df9bcb7f817a5f Reviewed-on: https://gerrit.libreoffice.org/61320 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5f5d890c242b8a092804991dba809f6f4287cfb2) Reviewed-on: https://gerrit.libreoffice.org/61325 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-03tdf#118498 Correct CustomShape 3D VisualizationArmin Le Grand2-14/+29
Change-Id: Ic312190616044f37fd92464ad605c6e0cdd5cc4d Reviewed-on: https://gerrit.libreoffice.org/57547 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit ee71c3def71508d1fc3e110659c7ed7aa0ba2238) Reviewed-on: https://gerrit.libreoffice.org/61207 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-10-03Corrected PresObj StylesArmin Le Grand6-58/+59
When SdrPresObj's get constructed, e.g. when loading/ opening an Impress, the Styles for the PresObj's (PresentationObjects) need to be constructed carefully the same way as in former versions. This is a combination of creating the SdrObject, adding a Style and setting default Attributes, combined with in.-between corrections. All these combinations make these fragile, plus the im/export using ODF XML format and UNO API. With last SOSaw080 changes not all places were correctly converted (mainly due to new timing when and how a SdrObject belongs to a SdrPage). Corrected this now, checked im/export/echange with libreoffice-6-0 versions. Stuff is more complicated that initially thought, see comment added at AttributeProperties::GetObjectItemSet() for more info. Adaption of the two UnitTest-Files is explained there, too. Change-Id: Ia90a37492f3a92030790fbd27b7c532883bce923 Reviewed-on: https://gerrit.libreoffice.org/55029 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 6ebe8b9068be019d9e8ce4f558eb07304e2023f6) Reviewed-on: https://gerrit.libreoffice.org/61209 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-10-03tdf#120245: Accept to insert empty field with 'not null' database constraintJulien Nabet1-2/+1
See https://bugs.documentfoundation.org/show_bug.cgi?id=120245#c4 Change-Id: I9ac852a83e0a57c34ef3640bf0fb0e6a3394db63 Reviewed-on: https://gerrit.libreoffice.org/61269 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins