summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-08-08bump product version to 6.2.6.2.0+libreoffice-6-2-6Christian Lohmaier1-1/+1
Change-Id: Icf85fe31b47467be008431690b6e24f55fa53334
2019-08-08Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2-6' - update translations for 6.2.6 rc2 and force-fix errors using pocheck Change-Id: I2201f5c7ad2536af77fd0f68f9cd671e0e3ae75e (cherry picked from commit e69e3a9f886cbd77c2320fbf2b045df462f0ef1f)
2019-08-08tdf#126611 ShowDataNavigator in swxformandreas kainz1-1/+2
Change-Id: I8997ca84434f49b6e9dadd7e283455e40b90892e Reviewed-on: https://gerrit.libreoffice.org/76593 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com> (cherry picked from commit 6fee2e7ec0b563d164e1d2317d6ec41bee0dac31) Reviewed-on: https://gerrit.libreoffice.org/76710 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit df8c2759668586bd501eb0766e3cdbcc4ceb3997) Reviewed-on: https://gerrit.libreoffice.org/76785 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-08-08More adapting to C++2a char8_tStephan Bergmann1-1/+1
...in test code that is unhelpfully excluded on macOS, so wasn't covered by c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce "Adapt to C++2a char_t" which I happened to do on macOS. Change-Id: I215898a1c468c576d88914ee22deaaaa536d91e9 (cherry picked from commit 221caface804a0db8773bc77f0ffbed073f69d6b) Reviewed-on: https://gerrit.libreoffice.org/76744 Reviewed-by: Rico Tzschichholz <ricotz@ubuntu.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-08-08Properly obtain locationStephan Bergmann2-11/+19
Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8 Reviewed-on: https://gerrit.libreoffice.org/77019 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a9cde2557242a0c343d99533f3ee032599c66f42) Reviewed-on: https://gerrit.libreoffice.org/77024 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-08-08keep name percent-encodedStephan Bergmann1-1/+3
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b Reviewed-on: https://gerrit.libreoffice.org/77007 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-08-07expand pyuno path separatorsCaolán McNamara1-1/+2
Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239 Reviewed-on: https://gerrit.libreoffice.org/77102 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7) Reviewed-on: https://gerrit.libreoffice.org/77117 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-31update creditsChristian Lohmaier1-1873/+1914
Change-Id: Ib225bd0d58cb9c0dff88961a064f1a19ae91d528 (cherry picked from commit 08d23078d4636fc9fadfa45d4a0ed847cfcf7e9c) (cherry picked from commit d6185e2f8b5c055e1b67e1bf76e448a3d71f70b6)
2019-07-29decode url escape codes and check each path segmentCaolán McNamara1-1/+28
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76397 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2019-07-26bump product version to 6.2.6.1.0+Christian Lohmaier1-1/+1
Change-Id: Ibd1ab50c52f82c58cbcb5dcb686d42058704ba4a
2019-07-26Branch libreoffice-6-2-6Christian Lohmaier4-1/+1
This is 'libreoffice-6-2-6' - the stable branch for the 6.2.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.2.x release, please use the 'libreoffice-6-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I0f000cd946e846de5691c881f9e70049c0f3d228
2019-07-26expand LibreLogo check to global eventsCaolán McNamara3-11/+15
Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f Reviewed-on: https://gerrit.libreoffice.org/76195 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-07-26Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2' - update translations for 6.2.6 rc1 and force-fix errors using pocheck Change-Id: I7008bede6d657b2e5a7017acaca04edbc7d0a063
2019-07-25tdf#126340 sw_redlinehide: only move merged frames in JoinPrevMichael Stahl2-2/+4
The problem was that the first and second node were not actually merged by a redline, so moving the frames doesn't make sense. (regression from 41d8ca9686c7c184f586e99674b443c34bfd4f33) Change-Id: Ib401e4b0b2b207666f65c038ab5c346807bfea92 Reviewed-on: https://gerrit.libreoffice.org/76125 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 91b344b0346347ac40d2d6fa03a03e92d2e9f252) Reviewed-on: https://gerrit.libreoffice.org/76150 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-25tdf#126197: EndTextEdit on all views before delete/cut shapeXisco Fauli3-0/+36
Change-Id: I3da93e5c72ee6f6f99120758e870d654e01a0ec7 Reviewed-on: https://gerrit.libreoffice.org/75001 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 80db66c4f345ac469943f871308b14b7f5ed0a11) Reviewed-on: https://gerrit.libreoffice.org/75079 (cherry picked from commit e79dbb8c6c4d2cf1ce2cf0ce67c53ed4bb09898b) Reviewed-on: https://gerrit.libreoffice.org/75615 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-07-23tdf#126471 Apply selected MM printer on dialog openMichael Weghorn1-2/+1
Calling 'PrinterChangeHdl_Impl' in 'SwMMResultPrintDialog::FillInPrinterSettings' makes sure that a preselected printer is actually taken into account (i.e. 'm_pTempPrinter' set accordingly etc.) as soon as the dialog is created, not only when explicitly selecting another printer. Since 'PrinterChangeHdl_Impl' is now called initially and every time another printer is selected, there's no more need to do so in 'PrinterSetupHdl_Impl' any more. This fixes the issue that printout would always happen on default printer instead of the preselected one when SwMMResultPrintDialog was opened a second time. Change-Id: I5c930ed56d1025a7e94cc98fb70c01612bda0d22 Reviewed-on: https://gerrit.libreoffice.org/75933 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 0f0adc34889ff68da584cea97a9de649174b0333) Reviewed-on: https://gerrit.libreoffice.org/75968 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-23tdf#117480 fix crash in mailmergeSzymon Kłos1-364/+374
Catch exceptions and hide progress dialog. Change-Id: Ie63c8d7e001c90f40cf7504fd8248a6742e9d244 Reviewed-on: https://gerrit.libreoffice.org/65815 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/72280 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-07-22test: check validator exit code *after* checking validator outputMichael Stahl1-3/+3
ODF validator may now actually exit with non-0 since commit b14e2f6c63c18894286c99ee8dde9070e24b41c2 - look for validation errors in this case too. Change-Id: I36f4437c54d9a60afee0663a0b9be206773c5378 Reviewed-on: https://gerrit.libreoffice.org/75964 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ecce69dc554429e42bf3fc67d75ac86cf2120714) Reviewed-on: https://gerrit.libreoffice.org/76084 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-22Mail merge: Preselect proper printerMichael Weghorn1-2/+0
The proper printer has already been set a few lines above depending on the value of 'bMergePrinterExists', so it shouldn't be unconditionally overwritten here with a potentially invalid printer (using the same statement as already used 7 lines above for the 'else' case). This e.g. makes sure that the default printer is selected when no printer has been set, e.g. just after running Mail Merge Wizard on a new Writer doc, in which case no printer was selected previously. Change-Id: I922b8234be9c80536b6b0a9ba0dd19bdc39246e8 Reviewed-on: https://gerrit.libreoffice.org/75932 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 3bc1f99d3a792cdba037bcc757e8611d7e187b73) Reviewed-on: https://gerrit.libreoffice.org/75967 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-22tdf#123020 dbahsql: Support string delimiterTamas Bunth1-2/+18
Support multi-word table names while migrating HSQLDB data. Change-Id: I5129f995ea90a3fdbcbcb844774cf074f3ffddb2 Reviewed-on: https://gerrit.libreoffice.org/75734 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit b5890bf269214a47833bc9514b80650455e77ef6) Reviewed-on: https://gerrit.libreoffice.org/75820 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 47d6c43c19aa6ea05f0f65db58e5cdcf1c603660) Reviewed-on: https://gerrit.libreoffice.org/75853 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-19sw: fix use after free on tdf117215-1.odtMichael Stahl2-1/+3
Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame. ==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38 WRITE of size 1 at 0x615000383f56 thread T0 0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32 1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23 2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84 3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5 4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39 5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36 0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8) freed by thread T0 here: 1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7 2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17 4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19 5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5 6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20 7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50 8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39 9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9 11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55 Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf Reviewed-on: https://gerrit.libreoffice.org/75857 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dea72ef111ee8a0b1b178f8cd48757514d5ca831) Reviewed-on: https://gerrit.libreoffice.org/75941 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19sw: missing SolarMutexGuard in SwXFrame::attach()Michael Stahl1-0/+2
Causes assert in a test i'm adding... Change-Id: I5be24aa9683ec0d31494c0c97270d1d58692f764 Reviewed-on: https://gerrit.libreoffice.org/75796 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8) Reviewed-on: https://gerrit.libreoffice.org/75827 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-18Resolves: tdf#126342 obtain date particle order from pattern matchEike Rathke1-1/+20
... if there was any. In the NF_EVALDATEFORMAT_FORMAT_INTL case the input may match a current locale's pattern instead of a format's locale's pattern and patterns' (format locale + current locale) date orders may be different from the format's date order. Change-Id: I3aeaa6c361f98fe80f69c4f5d975fca892dac6ea Reviewed-on: https://gerrit.libreoffice.org/75481 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 7de96e9f7b69354fd5b15e1276678000bc386568) Reviewed-on: https://gerrit.libreoffice.org/75491 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-18Resolves: tdf#126147 relax sanity check and allow truncated tiffsCaolán McNamara1-5/+6
now the start of the row of data must still exist, but the full length of the row doesn't have to exist Change-Id: I5ed8ffef2cab19f040ba789a5d82560ca6847f26 Reviewed-on: https://gerrit.libreoffice.org/75795 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-18Resolves: tdf#126439 dialog should be modalCaolán McNamara1-0/+3
Change-Id: Ib922be4375533aff69264ee5dc99d521306f93c5 Reviewed-on: https://gerrit.libreoffice.org/75789 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-07-17tdf#126268: Check for the sign value at the right placeXisco Fauli1-2/+2
This commit contains 25277bcb727994072239c9c2549c271fdd62150e and 2e26ef34bf1a2e5d1293e45cf3b1415d9514b056 for backporting Code introduced in 6039d2463b4cc503b963811b3b1471de3291ee09 Unittest removed in libreoffice-6-2 branch See 7991a4d718c282f1fd999e76f683e333b5c220af Change-Id: Id0e249e47a91b274a247fb7e8b71353114149650 Reviewed-on: https://gerrit.libreoffice.org/75375 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/75420 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/75761 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-17tdf#126427 Fix deck highlighting after activating via UNO APISamuel Mehrbrodt1-4/+3
Reviewed-on: https://gerrit.libreoffice.org/75723 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 5a6671e8d8dc65f2bbb0880f19fd8c8c8e426b6d) Change-Id: I4ff7dfa156905abcba0df8e6bfbddc9e7d37cbbb Reviewed-on: https://gerrit.libreoffice.org/75750 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-17Resolves: tdf#126116 keep original date format if detected type is identicalEike Rathke1-5/+17
Regression from commit 478e051f4ea13b15120fdf74faf94a6c2cfcb50c CommitDate: Tue May 21 15:35:07 2019 +0200 Resolves: tdf#125109 prefer edit format's acceptance patterns and YMD order Change-Id: If1240f75ca7c4d46c156966a72b6a98c83448770 Reviewed-on: https://gerrit.libreoffice.org/74803 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit e6a1bbe6690474e752416c81e1ca8c82b2843539) Reviewed-on: https://gerrit.libreoffice.org/74856 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-17tdf#123150: Firebird: set UTF-8 client connectionTamas Bunth1-1/+5
There are two options related to character sets when attaching or creating a database with the C API: - isc_dpb_lc_ctype: Sets the character set of the connection between the Firebird server and the Client (which is the sdbc driver in that case). That is required in order to pass UTF 8 literals correctly. - isc_dpb_set_db_charset: Sets the default character set of the database itself. It has the same effect as the following SQL statement: ALTER DATABASE SET DEFAULT CHARACTER SET <Charset> We need to set both of them to UTF-8. Change-Id: Ia9e5a4b87a3997c084be8abb68c2de813fbd631b Reviewed-on: https://gerrit.libreoffice.org/75557 Reviewed-by: Tamás Bunth <btomi96@gmail.com> Tested-by: Tamás Bunth <btomi96@gmail.com> (cherry picked from commit c19c206cf42ac178906a855ae3cd198e0fcf8d14) Reviewed-on: https://gerrit.libreoffice.org/75755 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-07-16NSS fix lcc support patchJan-Marek Glogowski2-0/+12
This hangs the build process with current MSVC cl.exe. It even hangs when just calling "cl -? >/dev/null". Probably a cl.exe bug to detect redirection properly? This adds stdin redirection to /dev/null, like in configure.ac checks. Change-Id: Ie03c3103ac68cd131dc280755621a8ce0417314f Reviewed-on: https://gerrit.libreoffice.org/75495 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit b11ea5e9c37b19f0d60a4075146668954a7bf728) Reviewed-on: https://gerrit.libreoffice.org/75509 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-16Resolves: tdf#120685 don't show decimal places for pointsCaolán McNamara1-2/+5
unless its been explicitly requested Change-Id: Id9f34b68404cb3bdcaea641583980fa14453f2d1 Reviewed-on: https://gerrit.libreoffice.org/75648 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-16nss: upgrade to release 3.45Michael Stahl6-550/+9
Fixes CVE-2019-11729 CVE-2019-11719 CVE-2019-11727, and the less important CVE-2018-12384 and CVE-2018-12404 from intermediate releases. Since NSS 3.44 it's possible to build as static libraries and for iOS; drop the nss-chromium-nss-static.patch and nss-more-static.patch and hope that it works. Drop one hunk from nss.patch that looks fixed upstream. Change-Id: I7f37ac36f7f8dfd49d0bfb4a6185ca49d4f618a3 Reviewed-on: https://gerrit.libreoffice.org/75344 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6efc8a33f69bc7f4be45b7b81f67cd74c163b99e) Reviewed-on: https://gerrit.libreoffice.org/75353 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-15tdf#126310 Disable lazy loading of WMF imagesGabor Kelemen1-2/+2
Change-Id: I70d271e29bedc640cbfeab187ddb9ffce3e779e6 Reviewed-on: https://gerrit.libreoffice.org/75599 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 184a4771dad448a37f80b29bc62ad62e0a6a4bb6) Reviewed-on: https://gerrit.libreoffice.org/75614 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 1c04b5c97ca3b12e52ec55572da77f7b6636e34c) Reviewed-on: https://gerrit.libreoffice.org/75623 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-15tdf#126180: EndTextEdit on all views before delete/cut slideXisco Fauli6-24/+44
This also reworks the fixes tdf#125824 and tdf#111522 to use EndTextEdit instead of blocking the undoing Change-Id: I73c2289a9d950465f020f684e9e736148380f5c5 Reviewed-on: https://gerrit.libreoffice.org/74989 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e6c7a018a0cfee395ce2886d41c908a2447ef5cc) Reviewed-on: https://gerrit.libreoffice.org/75027 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 1aa93766ee3994af9975e96e8ea60e02078de2d8) Reviewed-on: https://gerrit.libreoffice.org/75031
2019-07-15tdf#126333 use dialog color for "button" highlightJan-Marek Glogowski1-3/+2
This control has many more problems. This is just a minimal fix, so it'll use dialog color for the highlight. In addition it uses the same color for the arrow then for the text. Reviewed-on: https://gerrit.libreoffice.org/75419 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 2060f9598bc4480c44465abc9250b595c09af188) Reviewed-on: https://gerrit.libreoffice.org/75425 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 54af6c8c873c3f6311806d210d5243b03e2d9fdf) Change-Id: Iaf263087bc09309267b2d165331d710dfc92fc77 Reviewed-on: https://gerrit.libreoffice.org/75502 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-07-13tdf#121528: Firebird stores scale as a negative numberXisco Fauli1-2/+2
Change-Id: Ic301952aeef93d3035b04442e70705d08f45f95d Reviewed-on: https://gerrit.libreoffice.org/75357 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins (cherry picked from commit 3278dfd0a2c09f8a8862277dffd9ef666d4862c6) Reviewed-on: https://gerrit.libreoffice.org/75376 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 147d65c471efd4c0d4299dbaeac70922fac0f4f3) Reviewed-on: https://gerrit.libreoffice.org/75489 Reviewed-by: Tamás Bunth <btomi96@gmail.com>
2019-07-12Postpone loading of all external references, including INDIRECT()Eike Rathke1-18/+34
... which can be constructed with an arbitrary URI text string not an svExternal* token type, until link updates are allowed. Change-Id: I2ce4de415ff99ace04c083c36c1383d76a4ef40d Reviewed-on: https://gerrit.libreoffice.org/75422 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit b824b23860b2cf533d4f2428d4a750bd72576181) Reviewed-on: https://gerrit.libreoffice.org/75433 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-07-11tdf#126173 RTF import: fix lost SHAPE fieldsMiklos Vajna3-1/+93
Commit 5a5d55a8a0f82406a8001015a723596f21d3562c (fdo#82860 RTF import: fix handling of SHAPE fields, 2014-10-15) already tried to handle this, but aCode is the shape command + its parameters (SHAPE \* MERGEFORMAT) for the bugdoc, while what we want is just the shape command. The field variable already contains a tokenized version, which was used previously only to decide if a field is unhandled or not. Reuse that for the shape comparison, so bugdoc's shape with parameters also appears. Change-Id: I7e044b94bcfab490c956b33c11dd6c69443939f5 Reviewed-on: https://gerrit.libreoffice.org/75243 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 9a15a75dfa7ab8c5d51c411e0e39d68d22b7587a) Reviewed-on: https://gerrit.libreoffice.org/75288 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 0e6fdee15df8928c33308b353a7b80de150aca6b) Reviewed-on: https://gerrit.libreoffice.org/75295 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-11kde4: Add missing include to fix buildMichael Weghorn1-0/+2
Fixes this build failure as reported e.g. by tinderbox [1]: In file included from /usr/include/c++/7/bits/locale_conv.h:41:0, from /usr/include/c++/7/locale:43, from /usr/include/c++/7/iomanip:43, from include/com/sun/star/uno/Any.hxx:27, from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/XInterface.hpp:9, from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/Exception.hpp:8, from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/RuntimeException.hpp:8, from workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/lang/XTypeProvider.hpp:8, from include/cppuhelper/compbase.hxx:25, from vcl/unx/kde4/KDE4FilePicker.hxx:22, from vcl/unx/kde4/KDESalInstance.cxx:20: /usr/include/c++/7/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = SalVirtualDevice]’: /usr/include/c++/7/bits/unique_ptr.h:268:17: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = SalVirtualDevice; _Dp = std::default_delete<SalVirtualDevice>]’ .../vcl/unx/kde4/KDESalInstance.cxx:70:107: required from here /usr/include/c++/7/bits/unique_ptr.h:76:22: error: invalid application of ‘sizeof’ to incomplete type ‘SalVirtualDevice’ static_assert(sizeof(_Tp)>0, [1] https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=libreoffice-6-2&brief-log=1562787602.2042 Change-Id: I1da444b80447ec8896ff9898684ee14fd3933b18 Reviewed-on: https://gerrit.libreoffice.org/75381 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-10Postpone filter detection until link update is allowedMike Kaganski1-7/+16
Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34 Reviewed-on: https://gerrit.libreoffice.org/75301 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f) Reviewed-on: https://gerrit.libreoffice.org/75331 Reviewed-by: Eike Rathke <erack@redhat.com>
2019-07-10Qt5 / KDE5 don't require qt_version_tag symbolJan-Marek Glogowski1-2/+2
Thanks to the extensive debugging information by the reporter of tdf#126272, I found the embedded Qt5 version tag: $ objdump -T libvclplug_qt5lo.so | grep qt_version_tag 000000.. DO *UND* 000000.. Qt_5.9 qt_version_tag So even if we try to stay Qt 5.6 compatible, this adds a dependeny to the build Qt version. But fortunatly this symbol dependency can be prevented by using -DQT_NO_VERSION_TAGGING, which this patch does. We still can't be sure we don't use newer symbols, but this way we won't prevent running with older Qt versions at all. Change-Id: Ia85c14f888d9743645909f59867b7ad568dc6f42 Reviewed-on: https://gerrit.libreoffice.org/75280 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 98df07a89dbdef020c7cd849861c5aa426021153) Reviewed-on: https://gerrit.libreoffice.org/75296 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 04c8d3335b434c7d54b2001a8b3ac194040f13d1) Reviewed-on: https://gerrit.libreoffice.org/75316
2019-07-09KDE4 create KDESalGraphics based X11VirtualDeviceJan-Marek Glogowski2-0/+10
In the spirit of commit 5ee408eb4c9f ("tdf#125673 KDE5 implement a KDE5SalVirtualDevice"), this might help with KDE4 graphics problems, like the ones mentioned in tdf#126272. Change-Id: I50875b69e1c1494803f08746bfc3b99a57e36414 Reviewed-on: https://gerrit.libreoffice.org/75281 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-07-08tdf#125863 Rework tdf#107593 so header footer delete doesn't crashJim Raykowski2-3/+4
Header footer delete from the last page when last page is unneeded (stack level 24 SwRootFrame::RemoveSuperfluous /// remove pages that are not needed at all) causes SwFrameMenuButtonBase::dispose() which sets m_pFrame to nullptr which causes crash when IsEmptyHeaderFooter calls GetPageFrame(). Doing ToggleHeaderFooterEdit() when header or footer deletion is accepted in SwWrtShell::ChangeHeaderOrFooter avoids the crash. SwHeaderFooterWin is also disposed which would make the GrabFocusToDocument crash if it got that far so use the shell window which is still valid here to GrabFocusToDocument. Change-Id: Iaced23e6716442671c5ea29b79be178f4fc836d3 Reviewed-on: https://gerrit.libreoffice.org/75010 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 151eae314358f9ee0df017cb89fbc8c87c969cdb) Reviewed-on: https://gerrit.libreoffice.org/75206 Tested-by: Jenkins
2019-07-05tdf#125953: take CLOB into account in form wizardJulien Nabet1-2/+3
Change-Id: Ie08b47c2892b7da8e516447b868067a6231279c2 Reviewed-on: https://gerrit.libreoffice.org/74927 (cherry picked from commit b59f4fe03a7843cde70a56a282b3a5d7a304f39d) Reviewed-on: https://gerrit.libreoffice.org/75056 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 96d1b176f02f0396544e6c13c170f895b13fdfde) Reviewed-on: https://gerrit.libreoffice.org/75073 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-04Fix libgpg-error compilation error with gawk5nd1013-1/+116
This is an adaptation of upstream patch https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9b6666b19072fbdf plus a fix to Makefile.in Change-Id: I5bf946cf93e5849b8a3428064ab86f6255be97da Reviewed-on: https://gerrit.libreoffice.org/75022 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit af3b993ebea2f653fabba981d4c22b9aa779b32a) Reviewed-on: https://gerrit.libreoffice.org/75075 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-04sw: fix moving of at-page anchored flys to different pageMichael Stahl1-0/+2
The problem is that some flys are anchored at a page with Y pos 35k and are moved to a page with Y pos 17k, while retaining mbFrameAreaPositionValid=true and their existing Y position. The flys will never be painted or even invalidated again because their position is off-page. This is somehow a regression from commit 0b53f794ffb2550288610b9488f11fd21ab85aae - without the new mutation of an empty-page to a normal page due to at-page flys by resetting m_bEmptyPage in SwPageFrame::UpdateAttr_() on it the problem didn't happen. Due to the above commit, the page 3 is not an empty-page any more as it has 2 flys anchored on it; previously those flys were moved (only in the layout, not in the model!) to page 4 by some funny code in SwRootFrame::AssertPageFlys(), which at first glance seems like an improvement. Change-Id: Ia071931b26e64245f90233232dd2ac0d64365ce6 Reviewed-on: https://gerrit.libreoffice.org/75009 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 5cee586a97a11c23dd252accc42099bd5e9b4187) Reviewed-on: https://gerrit.libreoffice.org/75047 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-07-02tdf#125824 svx: fix crash with view1 and view2 doing texteditXisco Fauli2-1/+19
Similar to 3a874f1c80c37e8b35666e1d73161ff762eb7e4c Change-Id: I51bffa4d33e82bb90b8a42787f55c12746bcd8c2 Reviewed-on: https://gerrit.libreoffice.org/74931 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 091f573728e7951d5dc4ef138117499b7480885f) Reviewed-on: https://gerrit.libreoffice.org/74949
2019-06-29tdf#125606 Qt5 directly show tooltips + respect the help areaJan-Marek Glogowski4-18/+5
I'm not sure why this redirection was implemented, which also ommited the provided help area. I tried hard to use vc::Window code in the beginning, but that also mirrors the cursor position for the window. Using Qt here is simply straight forward, so just do that, Reviewed-on: https://gerrit.libreoffice.org/74548 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit ab5f341efd144adb6b7d0e00fece76a2153acd10) Reviewed-on: https://gerrit.libreoffice.org/74571 (cherry picked from commit e3988fa785c0430ae708527cbc5a7baa6d9d55a6) Change-Id: Ia8c4efc1e43b915c4b071ee26d4da37d7580817c Reviewed-on: https://gerrit.libreoffice.org/74854 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-06-29sw: avoid deleting the iterated SwRowFrame on tdf104188-4.odtMichael Stahl2-13/+16
The change in commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b was not enough to fix this problem. SwContentFrame::CalcLowers() may move a SwTextFrame to the previous page; in that case Calc() on the upper is a bad idea because it may then call RemoveFollowFlowLine() and delete the SwRowFrame that is being iterated. There is one other (unknown) bugdoc with this problem, let's hope it's fixed as well... (regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: I3c55a0d7ef0350a482fb150d3e96c3b34853400d Reviewed-on: https://gerrit.libreoffice.org/74793 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 1cb7e4899b5ada902e99a0c964ee047950c07044) Reviewed-on: https://gerrit.libreoffice.org/74835 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-28tdf#126071: fix assertion with offline help viewerJulien Nabet1-1/+1
See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=152373 + https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1 Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685 (cherry picked from commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d) Reviewed-on: https://gerrit.libreoffice.org/74846 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 09:10:57 +0000