summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-13Bump version to 5.3-17cp-5.3-17Andras Timar1-1/+1
Change-Id: Ia47411718c0f2e8c3cf5196686b7927a95e9d8ac
2017-06-13tdf#98888: mediawiki inserts redundant emptylines in <ref>Julien Nabet1-1/+1
There's a newline in case of heading, table or bibliography following text:p ok but only if we're not in text:note node Change-Id: I71172751a51e29abdd770e758d27b1bc8f15cb0d Reviewed-on: https://gerrit.libreoffice.org/38470 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 8a400cfa468655142103f18f722adf1d5cbda9c7) Reviewed-on: https://gerrit.libreoffice.org/38485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 509fb27b9b630f8506af6104f8230b0efa2ebaaa)
2017-06-13tdf#106423: dbase file can have no recordsJulien Nabet1-1/+2
Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e3ff19b33c84557fd20e68960499933b4e52638 tdf#84834 sc: stricter type detection for dBASE files Log test file from tdf#84834 still opens in Writer as expected Change-Id: Ibf5a0f586e3a132455d2363e61e5cc7ea249002d Reviewed-on: https://gerrit.libreoffice.org/38660 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 57ae8834c8313354477117b65d87c86407f6bf82) Reviewed-on: https://gerrit.libreoffice.org/38692 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit d2353a5a8afa5aa0a760b0e6412c2f77aa3a6df6)
2017-06-13Watermark: fix rotation calculationSzymon Kłos1-11/+25
* when angle > 180 was used calculated value was 0 * values are rounded Change-Id: I0cade407883a60d8d802b487668882e95f42ddce Reviewed-on: https://gerrit.libreoffice.org/38597 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 42353b95629322f51e059337ab06579ffb1c6934) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2017-06-13tdf#108494 incorrect Watermark positionSzymon Kłos1-0/+9
Change-Id: Iec1dba66604af008ad8b6b1c20cd508048144463
2017-06-13tdf#108480: Undo from clone formating does not remove vertical alignmentTamás Zolnai2-14/+14
In the related change: d36aa2ba3132ce62a370b7260ca620642cbf7dbf wrong method was used to set cell properties, which does not handle undo actions, so use the proper function. Other issue was related to undo handling of vertical text alignment in general. In some cases undo actions were lost after user clicked out of the cell. It is because vertical alignment is not affecting the outliner and so the related undo actions were just dropped in EndTextEdit() method. Reviewed-on: https://gerrit.libreoffice.org/38699 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42) Change-Id: I3a6a95fac711056a658a3dee616733939cd13330
2017-06-12tdf#108305 sw: fix crash on fly "Position and Size"Michael Stahl1-2/+4
Everything else in SwFrameShell::Execute() checks pArgs isn't null so do the same here. (regression from d02f75a8c36705924ddd6a5921fe3012fafce812) Change-Id: I73d85b111a5d2c088b9d888b8595ceb3979e8d2b (cherry picked from commit 28d760e5220a175a5eb8e859498baa4c7f97f3e2) Reviewed-on: https://gerrit.libreoffice.org/38521 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e64a85d50dbd4db7a3de1ee2f6caf52cc60f6a50)
2017-06-12Fix typo in queryAggregationStephan Bergmann1-1/+1
...that caused UBSan failure in UITest_calc_demo: > framework/source/services/desktop.cxx:406:47: runtime error: member call on address 0x611000887c80 which does not point to an object of type 'com::sun::star::lang::XServiceInfo' > 0x611000887c40: note: object is base class subobject at offset 64 within object of type 'chart::CreationWizardUnoDlg' > 1a 06 80 29 70 23 e8 c8 5a 7f 00 00 50 87 f0 00 40 60 00 00 48 24 e8 c8 5a 7f 00 00 02 00 00 00 > ^ > #0 0x7f5d62c1413b in framework::Desktop::addTerminateListener(com::sun::star::uno::Reference<com::sun::star::frame::XTerminateListener> const&) framework/source/services/desktop.cxx:406:47 > #1 0x7f5ac78f9337 in chart::CreationWizardUnoDlg::CreationWizardUnoDlg(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:52:15 > #2 0x7f5ac7906cdd in com_sun_star_comp_chart2_WizardDialog_get_implementation chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:368:30 > #3 0x7f5df087ff37 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:1716:9 > #4 0x7f5df0757dab in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:2127:14 > #5 0x7f5df06f69f1 in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) cppuhelper/source/servicemanager.cxx:667:13 > #6 0x7f5df07134f2 in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx:998:17 > #7 0x7f5df0715d7a in non-virtual thunk to cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx > #8 0x7f5d47aca8ca in FuInsertChart::FuInsertChart(ScTabViewShell*, vcl::Window*, ScDrawView*, SdrModel*, SfxRequest&) sc/source/ui/drawfunc/fuins2.cxx:650:27 > #9 0x7f5d49da003c in ScTabViewShell::ExecDrawIns(SfxRequest&) sc/source/ui/view/tabvwshb.cxx:344:13 > #10 0x7f5d49ce50ed in SfxStubScTabViewShellExecDrawIns(SfxShell*, SfxRequest&) workdir/SdiTarget/sc/sdi/scslots.hxx:1407:1 > #11 0x7f5de463ea6d in SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) include/sfx2/shell.hxx:211:35 > #12 0x7f5de4600cbe in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) sfx2/source/control/dispatch.cxx:377:20 > #13 0x7f5de4621593 in SfxDispatcher::PostMsgHandler(SfxRequest*) sfx2/source/control/dispatch.cxx:1156:17 > #14 0x7f5de460487a in SfxDispatcher::LinkStubPostMsgHandler(void*, SfxRequest*) sfx2/source/control/dispatch.cxx:1136:1 > #15 0x7f5de5f18eda in Link<SfxRequest*, void>::Call(SfxRequest*) const include/tools/link.hxx:84:45 > #16 0x7f5de5f189d2 in SfxHintPoster::DoEvent_Impl(void*) sfx2/source/notify/hintpost.cxx:44:12 > #17 0x7f5de5f18861 in SfxHintPoster::LinkStubDoEvent_Impl(void*, void*) sfx2/source/notify/hintpost.cxx:42:1 > #18 0x7f5dbc3bb9fa in Link<void*, void>::Call(void*) const include/tools/link.hxx:84:45 > #19 0x7f5dbc3a5bdf in ImplHandleUserEvent(ImplSVEvent*) vcl/source/window/winproc.cxx:1946:30 > #20 0x7f5dbc39103c in ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) vcl/source/window/winproc.cxx:2495:13 > #21 0x7f5dbf2f016f in SalFrame::CallCallback(SalEvent, void const*) const vcl/inc/salframe.hxx:276:33 > #22 0x7f5dbf350db2 in SvpSalInstance::DoYield(bool, bool, unsigned long) vcl/headless/svpinst.cxx:345:31 > #23 0x7f5dbe714b69 in ImplYield(bool, bool, unsigned long) vcl/source/app/svapp.cxx:494:29 > #24 0x7f5dbe6efb53 in Application::Yield() vcl/source/app/svapp.cxx:558:5 > #25 0x7f5dbe6ef896 in Application::Execute() vcl/source/app/svapp.cxx:458:9 > #26 0x7f5dfab81984 in desktop::Desktop::DoExecute() desktop/source/app/app.cxx:1354:5 > #27 0x7f5dfab89eb6 in desktop::Desktop::Main() desktop/source/app/app.cxx:1698:17 > #28 0x7f5dbe76c6ab in ImplSVMain() vcl/source/app/svmain.cxx:192:35 > #29 0x7f5dbe779bf1 in SVMain() vcl/source/app/svmain.cxx:230:16 > #30 0x7f5dfadb8659 in soffice_main desktop/source/app/sofficemain.cxx:166:12 > #31 0x50fa39 in sal_main desktop/source/app/main.c:48:15 > #32 0x50f9e3 in main desktop/source/app/main.c:47:1 > #33 0x7f5df9322400 in __libc_start_main /usr/src/debug/glibc-2.24-33-ge9e69e4/csu/../csu/libc-start.c:289 > #34 0x419f79 in _start (instdir/program/soffice.bin+0x419f79) Change-Id: I0a798c6d77b7349077ea44dfe112024abb2567f0 (cherry picked from commit 89214e05e0c2f92fbe68e6c4f4a9035a94cff282) Reviewed-on: https://gerrit.libreoffice.org/38612 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ddba7030fb8ba565bdeef997f87eb491f8ce6a80)
2017-06-12tdf#37859: Odb data copied to Calc showed wrong encoding in WindowsJulien Nabet1-1/+1
Blind fix since I don't have Windows. If it works, many thanks to: - Urmas (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c16) - Himajin100000 (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c35) Change-Id: I9fd84977eab8410ec022b6e34f1a636326eaf56a Reviewed-on: https://gerrit.libreoffice.org/38253 (cherry picked from commit 39487b14956d883899311b6294f6f09ca2371366) Reviewed-on: https://gerrit.libreoffice.org/38547 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 3951d44110df55589ff80f5eab752817c2475c0d)
2017-06-12tdf#107795 fixed cursor position after inserting input fieldBernhard Widl1-0/+4
Change-Id: I3c063c0393b524132e522914a7a9885c8a9c3b78 Reviewed-on: https://gerrit.libreoffice.org/37536 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 408a7e320db978a8f784fa25e35caedf931612c5) Reviewed-on: https://gerrit.libreoffice.org/38443 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 48e75d8107d64920dd90c5d98b79dc982e311fa3)
2017-06-12libstaroffice: use correct loop indexDavid Tardon2-0/+28
(cherry picked from commit cc2db25645ede743bdc3824fe7d26ea4beda6a96) Signed-off-by: David Tardon <dtardon@redhat.com> Change-Id: I1b862ed2d69c41361bc8c26d96c5329473fe64aa Reviewed-on: https://gerrit.libreoffice.org/38444 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit f17462390d9ba866f76207839ff996896d0a9af5)
2017-06-12ofz: fix remaining length checkCaolán McNamara1-3/+5
Change-Id: I1788ae2a15823b0dc165ad1a99bd0f2aac0bcaf1 Reviewed-on: https://gerrit.libreoffice.org/38363 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e5a25e6b01490cf14dfc6af019fdb0896b19a76d)
2017-06-10coverity#1412145 Result is not floating pointCaolán McNamara1-1/+1
Change-Id: Ia2b4c4f14f5a59dd5d24c0d0749922e0d190f53a Reviewed-on: https://gerrit.libreoffice.org/38635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-10VML: EMU to Points conversionSzymon Kłos2-3/+7
Change-Id: Icd2dbd6e894975615268dc4aa52d1d53bf9c0bca Reviewed-on: https://gerrit.libreoffice.org/38581 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-10Watermark: VML export/import font sizeSzymon Kłos6-3/+26
Change-Id: I11409dfc621018a761c70a640938e18ae679d3f5 Reviewed-on: https://gerrit.libreoffice.org/38254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-10Watermark: RTF import / exportSzymon Kłos4-3/+687
* "wzName" should contain shape name * MS Word watermark has text inside the "gtextUNICODE" (do not create additional shptxt) Change-Id: I7929ec83a9219d6087d36ccbf6d7e735acf63722 Reviewed-on: https://gerrit.libreoffice.org/38219 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-10Avoid UBSan warning about negative double -> sal_uInt32 conversionStephan Bergmann2-7/+7
Since ea890b1d4bcd6dd59db9f52dce1609c020804e24 "tdf#108408: support unit specifications for ST_HpsMeasure", the OOXMLUniversalMeasureValue ctor is converting textual data to mnValue via intermediary double instead of sal_Int32, so textual data representing negative values now triggers UBSan warnings (e.g., "writerfilter/source/ooxml/OOXMLPropertySet.cxx:630:43: runtime error: -70 is outside the range of representable values of type 'unsigned int'" during CppunitTest_chart2_export; it appears that, while HpsMeasure may be documented to only cover positive values, TwipsMeasure may be negative). But OOXMLUniversalMeasureValue::mnValue is apparently only used in OOXMLUniversalMeasureValue::getInt, to return an int value, so just change its type. Change-Id: I44eabb78f09100c05cc9d1e79a739648f34ea743 (cherry picked from commit 600ec501bafc691d37078a0ed5b4ca8bf32340f1) Reviewed-on: https://gerrit.libreoffice.org/38632 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-09tdf#108408: support unit specifications for ST_HpsMeasureMike Kaganski8-21/+79
w:ST_HpsMeasure is defined in ECMA-376 5th ed. Part 1, 17.18.42 as This simple type specifies that its contents contain either: * A positive whole number, whose contents consist of a measurement in half-points (equivalent to 1/144th of an inch), or * A positive decimal number immediately followed by a unit identifier. ... This simple type is a union of the following types: * The ST_PositiveUniversalMeasure simple type (§22.9.2.12). * The ST_UnsignedDecimalNumber simple type (§22.9.2.16). This patch generalizes OOXMLUniversalMeasureValue to handle standard- defined units, and introduces two typedefed specifications: OOXMLTwipsMeasureValue (which is used where UniversalMeasure was previously used), and new OOXMLHpsMeasureValue. Unit test included. Reviewed-on: https://gerrit.libreoffice.org/38562 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit ea890b1d4bcd6dd59db9f52dce1609c020804e24) Change-Id: Iccc6d46f717cb618381baf89dfd3e4bbb844b4af Reviewed-on: https://gerrit.libreoffice.org/38591 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-09tdf#104450: Use Calibri; let LO to fallback to CarlitoMike Kaganski2-7/+6
Using Calibri will allow to keep originally intended font on round-trip. If Calibri is absent on a system, LO will fallback to Carlito for rendering, but keep original font intact. Reviewed-on: https://gerrit.libreoffice.org/38456 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit dd1ba90f6069b41e3f2c301809afefc6f63da710) Change-Id: I8f29bed29bc7f48912b2637053ff128ea904c7a1 Reviewed-on: https://gerrit.libreoffice.org/38590 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-09tdf#108350: Use Carlito for DOCX import by defaultMike Kaganski4-2/+31
In OOXML (i.e. Word since 2007), the default document font is Calibri 11 pt. If a document doesn't contain font information, we should assume our metric-compatible equivalent Carlito to provide best layout match. A unit test included. An existing unit test (testN766487) was corrected to match the font size that Word uses (11; was 12 which doesn't match Word's size). Reviewed-on: https://gerrit.libreoffice.org/38421 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5471a5585cba925bb0dcb2dc41e03ad563998166) Change-Id: I3040f235696282dc7a124cd83fb34a6d95a29a17 Reviewed-on: https://gerrit.libreoffice.org/38589 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-06-09Add --script-cat parameter to dump scripts content.Michael Meeks8-90/+191
Also factor out over-long print method into its own helper. Change-Id: Ica98dc9c999d5655e78662774e0140d70369d0b7 Reviewed-on: https://gerrit.libreoffice.org/38579 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/38602 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-09tdf#99074: export Web view to DOCXAron Budea4-12/+18
...so document saved in Web view shows in Web Layout in Word. Change-Id: If39d566be02966fe5d22f74aee46e6d5452a9451 Reviewed-on: https://gerrit.libreoffice.org/38469 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/38587 Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-06coverity#1409895 Resource leakCaolán McNamara1-2/+6
Change-Id: I1430ac41bf11bf3ae5c4cba3406a24148acd728e (cherry picked from commit e805881d74392969746d34756b035850c67883e6)
2017-06-06coverity#1409896 Dereference before null checkCaolán McNamara1-2/+2
should this be pShell instead of pSh ? Change-Id: Ie653dbbdee8cebc402c9ee9e78630353ba977921 (cherry picked from commit 6ee4b68ce5bd52b31713fc5213594e54b2412737)
2017-06-06Related: tdf#106950 sw: fix crash on opening this fileMiklos Vajna1-0/+3
Not every paragraph supports the container::XEnumerationAccess interface. Change-Id: I0690f2e631f733b8f478a7df30d2918400eccf2f Reviewed-on: https://gerrit.libreoffice.org/38111 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e01c6a3ba7c0e6a089769187ee1ad241aa862280)
2017-06-06coverity#1409893 Division or modulo by float zeroCaolán McNamara1-2/+6
Change-Id: I697e9c7772792b02257ed1f40666dd70bb70300c (cherry picked from commit bc28dde1891fd6e3b7ded3f2603aaf63a9111106)
2017-06-06Watermark command opens a dialog, add ... to the labelAndras Timar1-1/+1
Change-Id: I274661b1ec892425d84cd72194c376e498bf70ed (cherry picked from commit 439cdc8530fef0d7e1a62a66c094a27af2181309)
2017-06-06tdf#101885: fix crash in AccFrameSelectorcp-5.3-16Julien Nabet1-0/+2
Deal with no parent case 0x00007ffff5e98240 in vcl::Window::GetChildCount() const () 0 0x00007ffff5e98240 in vcl::Window::GetChildCount() const () 1 0x00007ffff54f2d1f in svx::a11y::AccFrameSelector::getAccessibleIndexInParent() () See https://bugs.documentfoundation.org/attachment.cgi?id=127141 Change-Id: I795dc4c083d743466b5605d3dcc8f9fca8674c43 Reviewed-on: https://gerrit.libreoffice.org/37575 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit c9275062ed745a8c5d52a3863299baf8bcf86ea7) Reviewed-on: https://gerrit.libreoffice.org/38414 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 75d14731e79b66a75e2d3327b94721f6218eb4d7)
2017-06-06sc::ColRowSpan::mnEnd is inclusiveEike Rathke1-2/+2
Wrong since commit 1e721077b43de84edab2a3ed2f316ddcbec6e3ec Date: Tue Oct 7 00:22:32 2014 +0900 and commit 91502a72c12c559442e8bf77c27a516b49c2a68d Date: Thu Oct 9 14:44:27 2014 +0200 So HasAttribSelection() and HasSelectionMatrixFragment() did not query the rightmost column of each marked range from ScMarkData. Change-Id: Ie3aca26ee1b6c249c1135268dc0ad3ea053ea2b8 (cherry picked from commit 77d1e0c49adea959dd418de9b6cf9901e01be3ae) Reviewed-on: https://gerrit.libreoffice.org/38371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7821c84215be4f3e968f9a6afd8f8325992ef03c)
2017-06-06tdf#108024 Keep original selection during DrawViewShell::FuTemporary()Takeshi Abe1-1/+2
Otherwise it was disposed in the middle of its own mouse event handler FuSelection::MouseButtonUp(). Change-Id: I0d96048526dece7232e5a777364ad4da1d64c904 Reviewed-on: https://gerrit.libreoffice.org/37976 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 96d59ffc572c4cf112405a85aee3366d45bc7757) Reviewed-on: https://gerrit.libreoffice.org/38302 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 64c8c76a1dca96cb2ceed2aced8ff4e5efd60aa9)
2017-06-06Resolves: tdf#108279 dimension rows are 32-bit and don't wrap at 64kEike Rathke1-1/+1
Change-Id: I7bf7a149fb1db526ef62bea2f52b200cf5053cc2 (cherry picked from commit 259c2409310814ae62c8d0aefef19a71e8d88dbe) Reviewed-on: https://gerrit.libreoffice.org/38331 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 190c0d9ed02a5ed0659b07955b839bb16b1ba638)
2017-06-06tdf#75256 sifr icon theme - trackchangesbarMatthias Freund2-0/+0
Fix for wrong filename for trackchangesbar Change-Id: I3a286c87b6ca9e01a8e256acde00715a84f7b4d9 Reviewed-on: https://gerrit.libreoffice.org/38323 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 373c5775735858138a461548272175b3141a3e37)
2017-06-05Related: tdf#108269 oox: allow recovering broken DOCM filesMiklos Vajna5-10/+27
The content type inside an OOXML file differs for DOCX and DOCM. These must be in sync with the file extension, otherwise MSO refuses to open the file. We used to always write the DOCX content-type even for files which had the DOCM extension. Allow users to recover those broken files by detecting a "has docm extension but docx content-type" file as docm, so re-saving it will produce output that's accepted by MSO as well. (cherry picked from commit 97fa7024ce608b7908aca369e8c643a5de9ebf78) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport9.cxx Change-Id: I7d60c6f6c1d0421e95b3dc9e8fff617f101919f5 Reviewed-on: https://gerrit.libreoffice.org/38357 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-01Bump version to 5.3-16Andras Timar1-1/+1
Change-Id: Ib731d2ebe1732630d4f818d7d990142a430ba3e9
2017-06-01tdf#105281 Rearrange a few things for l10n-friendlinessAdolfo Jayme Barrientos1-67/+72
With the Notebookbar addition, no care was taken to update this UI bearing in mind that there *might* be a few languages suffering in consequence. Change-Id: I78c4a1846e192c4c7a64328b730517d42aff979f (cherry picked from commit bd911c02594c77e1f7e8a01a364b6e0967d4db26) Reviewed-on: https://gerrit.libreoffice.org/35832 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 828a54cfb944c1b98cd38628dbb8cb99fc86dfec)
2017-06-01tdf#106607 - Sifr icon for "Table Styles" neededMatthias Freund1-0/+0
Change-Id: I174e8022fbc206256b19fb8e9f2a60f02757fce4 Reviewed-on: https://gerrit.libreoffice.org/38229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit c9b7511983fd0150283e894cc5ba314df0df45d1)
2017-06-01Related: tdf#107961 ensure notifyhdl is unset after disposeCaolán McNamara1-2/+18
Change-Id: I69790c8d3cfffc09ee6d6c165e17823223c5058a Reviewed-on: https://gerrit.libreoffice.org/38238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit cbd8fd58c6d5ad40561b936b1c7f3b75f518b6c2)
2017-06-01sw: add separate DOCM filterMiklos Vajna10-9/+93
This way at export time we can preserve the correct content-type, which isn't the same for DOCX and DOCM. Reviewed-on: https://gerrit.libreoffice.org/38298 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 697173f6fdfae581022cfdb5ec5171c5a3be58f0) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport9.cxx sw/source/filter/ww8/docxexportfilter.cxx Change-Id: I08fa734c72fab7400bd327a07a760839556dbf6f
2017-06-01Watermark: VML font-family import for textpathSzymon Kłos6-2/+38
Handle style attribute to get font-family: <v:textpath style="font-family:&quot;DejaVu Sans Light&quot;;font-size:1pt" .../> Change-Id: I5fe530aecccc57e103b413ef494502f666f1005a Reviewed-on: https://gerrit.libreoffice.org/38039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-01Watermark: docx interoperabilitySzymon Kłos6-9/+50
Before patch: Document created in MS Word: <v:shapetype id="_x0000_t136" o:spt="136" ...> <v:shape type="#_x0000_t136" ...> Imported to LO and exported: <v:shapetype id="shapetype_136" o:spt="136" ...> <v:shape type="shapetype_136" ...> Then again imported to MS Word and exported: <v:shapetype id="shapetype_136" o:spid="_x0000_m1026" o:spt="100" ...> <v:shape type="#shapetype_136" ...> In this moment LO after import had shape in the navigator but it wasn't visible. Patch: * vmshapecontext.cxx is changed to read ShapeType from id instead of o:spt when o:spid is present. * vmlexport.cxx added o:spid for Word to identify inserted watermark * edfxol.cxx changed name of shape to "PowerPlusWaterMarkObject" for Word * tests Change-Id: I25322628838a98c45cbeed64144d04977b2ea9ba Reviewed-on: https://gerrit.libreoffice.org/37969 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-01Watermark: updated Put and QueryValueSzymon Kłos1-12/+23
Change-Id: Ica65be783130b1981093204edd03dc793a16343b Reviewed-on: https://gerrit.libreoffice.org/38027 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-06-01tdf#108040 Don't turn on header to check if Watermark existSzymon Kłos1-1/+1
Change-Id: Ieaf42384248deb283f71743f68c059b384abaa1a
2017-06-01Watermark: read angle valueSzymon Kłos1-2/+17
Change-Id: Ib6b98c58b1251c27476cbbbd03a2f7ed97e68c45 Reviewed-on: https://gerrit.libreoffice.org/37947 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-06-01Watermark: move to the insert menuSzymon Kłos2-1/+1
Change-Id: I6058236434de00cddec1340613e83c10acc4df2a
2017-06-01Watermark: remove enable checkboxSzymon Kłos3-44/+4
Change-Id: Ic18b85070bf6c5c3e9678859a87cb9f44411533b
2017-06-01Watermark: extended configurationSzymon Kłos11-46/+262
* it is possible to set font family, color, angle and transparency Change-Id: Idea2fb9ee748394bb3d706fa790e109238584cdb Reviewed-on: https://gerrit.libreoffice.org/37793 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-05-31Watermark: Insert watermark commandSzymon Kłos20-122/+632
* added new command .uno:Watermark * if no arguments are provided the dialog is opened where user can enter the text * with provided Text argument the watermark is created * created SfxWatermarkItem to transfer watermark properties * dialog loads current setings * SetClassification use SetWatermark Change-Id: Ifc1319f5aa7c11bb141f8e4b5b9a5088613021c2 Reviewed-on: https://gerrit.libreoffice.org/37599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-05-31tdf#108056 sw: add UI to disable SubtractFlysAnchoredAtFlys compat optionMiklos Vajna7-16/+59
There is a reason this is off by default, make it a bit more easier for users to not depend this option when they don't actually need it. (cherry picked from commit f85ded43446b17fbfdd868cc057ba39666d3d7cb) Conflicts: include/unotools/compatibility.hxx officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs sw/inc/viewsh.hxx sw/source/ui/config/optcomp.cxx sw/uiconfig/swriter/ui/optcompatpage.ui unotools/source/config/compatibility.cxx Change-Id: I21c5b942c6021fa21840779e1a9f53055fbf279f Reviewed-on: https://gerrit.libreoffice.org/38081 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-31tdf#108056 sw SubtractFlys: add missing expansion of the clip pathMiklos Vajna1-3/+18
With this finally the bugdoc has no more unexpected white lines around the fly frame. In the non-SubtractFlys case DrawFillAttributes() already did an expansion of the clip path, but this was overwritten in case the layout flag was set. Fix the problem by taking care of this in lcl_SubtractFlys() itself. Change-Id: Iac91279f8bc19588e763425aff5cb800e793da83 Reviewed-on: https://gerrit.libreoffice.org/38079 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 0714d2f3009bbb24501561c1a8e96a6feb9a42ca)
2017-05-31tdf#108056 sw SubtractFlys: work with a polypolygon directlyMiklos Vajna3-17/+16
In case the intention is that the clip rectangle should include the page, except a fly frame, we built a list of rectangles that covered this area. This introduces the problem if adjacent rectangles don't join perfectly. Instead allow lcl_SubtractFlys() to work on a clip state directly, this way the clip polypolygon will only contain two paths (the page rectangle and the rectangle of the fly), so rounding errors can't happen. Change-Id: I5b2e9a382aa7d16f3b16509670de754b5e00bd6d Reviewed-on: https://gerrit.libreoffice.org/38066 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 87d62a6222932d36c91d7b69240c7bccbf4e46be)