summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-02-12tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as Copy'"Xisco Faulí1-11/+2
This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371. Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-12tdf#130610 docx export: handle bold as toggle propertiesSerge Krot4-0/+96
Change-Id: I4c60b7eab6430a64ea1c8bcf40d0036d0b38516f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88460 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-02-12DOCX import: fix ZOrder of inline vs anchored shapesMiklos Vajna8-11/+33
Shapes which are anchored but are not in the background should be always on top of as-char anchored shapes in OOXML terms. Writer supports a custom ZOrder even for as-char shapes, so make sure that they are always behind anchored shapes. To avoid unnecessary work, make sure that when there are multiple inline shapes, we don't pointlessly reorder them (the old vs new style of the sorting controls exactly this, what happens when two shapes have the same ZOrder, and all inline shapes have a 0 ZOrder). Adapt a few tests that used ZOrder indexes to access shapes, but the intention was to just refer to a shape: fix the index and migrate to shape names where possible. Change-Id: I670e4dc2acbd2a0c6d47fe964cb5e3f2300e6848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88540 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-12Classify shape(s) selections as 'complex'...Dennis Francis1-0/+3
in isComplex() of XTransferable2 implementation SwTransferable. This method is used by online via doc_getSelectionType() to determine the type of selection. In writer this method used to classify shape objects as non-complex which translates to 'text' in online, so if a shape is selected in online, the js code there would treat it as text. This is problematic when you want to send the correct align uno commands based on selection type. So returning true in isComplex() for writer would correctly treat the shape selections as 'complex' in online Writer. Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12vcl: avoid accessing null member on unloading viewsAshod Nakashian1-2/+3
Change-Id: If4e416c7257c861b9e13352b3329d9719b159e61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87830 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88538 Tested-by: Jenkins
2020-02-12Fix typoAndrea Gelmini1-1/+1
Change-Id: I2b0fe68cf5346a6788bbd63242eadf872d58a87e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88556 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-12drop newly unused TreeListBoxCaolán McNamara5-1057/+2
Change-Id: Iea157bb472ee409a1a15b9f6c9cfe0adc21d1a03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88449 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12weld ObjectCatalogCaolán McNamara7-79/+122
Change-Id: I1979c6f8f5705360aa0df8cb7aeaeca00cd66ce9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88448 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12crashtesting: convert assert to SAL_WARN_IFNoel Grandin1-1/+1
Change-Id: I70a9922960dee978be05218ebf16a8186c3bc0c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88524 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12Add case table for MedefaidrinAlex Henrie1-0/+43
Change-Id: I7325311a4a0957b1a43c36d04cbefde2ea7461eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88420 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2020-02-12only freeze/thaw if we have toCaolán McNamara3-2/+22
because gtk will relayout and things jump around confusingly and unnecessarily Change-Id: I817e803f8ad7e523e5855326fc097f8798ddb679 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88526 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12add some more libs to libmergedNoel Grandin1-0/+9
Change-Id: I2d3c3d64f1fb1d3635bdde761f6502ba05221f95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88522 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12we always want to expand/collapse on double clickCaolán McNamara1-5/+5
Change-Id: Idf5496b44f5e2d5782d99317029aa0e9cb99e8d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88527 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12cypress: mobile: Font size combobox is broken on core/master.Caolán McNamara9-22/+45
a) for vcl version, listen to modify and select, instead of just modify so we can get the artificial select via uiobject that the mobile makes use of. (and disregard the modify which we know will lead to select so we get just one event in that case) b) default to assuming something has been picked "directly" unless we know otherwise. ideally the result is that https://cgit.freedesktop.org/libreoffice/online/commit/?id=08d6c3fdf9bac4ad8318151ab1402690eb950f52 isn't needed Change-Id: Ibbf33eab88dabd55d0c329aa00c8adaf001a4f50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88476 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12Blind fix for Linux aarch64 with libcxxabiStephan Bergmann1-2/+2
...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-12crashtesting: remove assert in SvXMLImportContext::SvXMLImportContextNoel Grandin1-1/+0
which came from commit 813118bfbb453f812be9e1a30f84908b4e0bfb51 Date: Fri Dec 20 14:34:56 2019 +0200 add checks to optional fields in SvXMLImportContext but it turns out various places abuse this field and pass stuff that is not a element name, including empty strings Change-Id: I33cfc7e44e0aafe0fdb084482a199d5cffde6a76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88523 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12lok: add "type" information when a graphic is selectedHenry Castro1-3/+4
Change-Id: I67a36d3aabbc197d9ac8f6ca4509dafd6f2620f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87991 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12android: Don't show the multiline toggle in the formula input bar on phones.Jan Holesovsky1-2/+6
The interaction there currently distorts the view and occupies too much space anyway. Change-Id: I093432dcfc223e4ea8b0f5a3cc45368f90c3cc0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88477 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88481 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12Get the align states of draw-shapes in...Dennis Francis1-9/+44
SwDrawBaseShell::GetState() so that the align buttons are informed (in core desktop and online via statechange messages) Change-Id: Ic69fb03bc98f39b1a6a389d50d3d6404fefd7f29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88159 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88453 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12Allow boolean valued statechange messages for...Dennis Francis4-8/+37
object align commands : ObjectAlignLeft [SID_OBJECT_ALIGN_LEFT] ObjectAlignRight [SID_OBJECT_ALIGN_RIGHT] AlignCenter [SID_OBJECT_ALIGN_CENTER] What is pending is to set correct align state items for Impress in DrawViewShell::GetMenuStateSel(). For doing that we need to store the object align state somewhere when we execute SID_OBJECT_ALIGN_* in DrawViewShell::FuTemporary(). For Writer the align state information was already available in frame-format-manager object. Change-Id: I86fcf59cfc66af98097611277201ecaa3b8c22cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88077 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88452 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12tdf#129575 DOCX import: fix table style preferenceLászló Németh17-45/+203
handling by recognizing docDefault properties instead of default-value based heuristics. Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88457 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12move some svx/ headers inside the moduleNoel Grandin170-372/+265
Change-Id: I8d9a50039a8139caebb2cfb83ca476d39432f255 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88238 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12ofz#20455 sw: add some checks in SwTable::CheckConsistency()Michael Stahl1-1/+8
Check consistency of number of boxes in SwTable and nodes. Change-Id: I617f99282b900b17a65ecd18fdd8e8f8860896db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88471 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-12ofz#20455 sw: HTML import: fix invalid table in footerCaolán McNamara6-8/+21
The obvious problem was that a bookmark failed to be copied to the correct node, it was created on a SwStartNode, which failed in makeMark() and caused a null-pointer. The target position was off by 1 node because there was a spurious StartNode/EndNode pair directly below the table: [ 41] 0x5b13430 TableNode , [ 42] 0x5b1d010 StartNode , [ 43] 0x5b12a50 StartNode , [ 44] 0x5b135f0 TextNode "", This was created by a special case in SwTableNode::MakeCopy() because .GetTabSortBoxes().size() == 1. But the table had actually quite a bunch more cells in the nodes-array, just they were not yet in the SwTable. In an exciting twist of events, it turns out the table was copied while it was not yet finished parsing: the problem was that in the middle of the table, some CSS set some page attributes, and this caused a first-page page style to be created in SwCSS1Parser::ParseStyleSheet(), by copying the master page style. Unfortunately the table was in the <div title="footer">, so it was copied in this incomplete and inconsistent state. It might be possible to get rid of the special case in SwTableNode::MakeCopy() by restricting the special case skipping of StartNodes at the start in SwNodes::CopyNodes() a bit so that StartNodes whose EndNodes are copied aren't skipped; at least that's the most reasonable explanation for the special case. But for now just fix the HTML import. Additionally, only on MacOSX, using libc++, this triggered an assert: Assertion failed: (!pImpl->mpStaticDefaults || typeid(rItem) == typeid(GetDefaultItem(nWhich))), function PutImpl, file /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/svl/source/items/itempool.cxx, line 611. Probably because SdrTextAniCountItem is not marked DLLPUBLIC. Change-Id: Ia167265e7540eea649801eaac2b89f9e18b685cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87859 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-12Revert "tdf#118947 sw tablestyle: manually scan parents for ::SET"László Németh3-113/+23
Except its unit test. This reverts commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c. Change-Id: I525edd59b9d4d522048b272575285f13675413e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88456 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12Revert "related tdf#118947 sw tablestyle: no need to avoid numbered para"László Németh1-1/+2
This reverts commit 6ed87cc5a4f755f360951550cac836e8967fc6bf. Change-Id: Idd56da3056b60a60228875c644d57099b3d2520f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88455 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12Revert "revert obsolete writerfilter hacks for tdf#119054 and tdf#128752"László Németh4-0/+58
This reverts commit 749fd6508504cf3b2e3822eca52a67fa36d75fb8. Change-Id: Iad4cd836e2908e2c21e70013f88af213b3a1822d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88142 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-02-12add some more libs to libmergedNoel Grandin1-0/+5
Change-Id: I14ec1c6015c8a71fabca90ca3dec52965915a63f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88511 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12move some canvas/ headers inside the moduleNoel Grandin87-226/+208
Change-Id: Iaa00cff88ad756b7e084cc68fe744d387328180b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88360 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12If asked to do so, enable icecream even in the 'build' part of configure.Jan Holesovsky1-0/+1
Otherwise it is used only in the 'host' part of the cross-compile build. Change-Id: Ifb8d88e18c131e3019a4f3168afc1b743f3cc8e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88486 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12Store and retrieve client visible area on ScViewDataMuhammet Kara2-0/+8
So that core will be aware of the visible area on the client side, and act accordingly when needed. Change-Id: Ieca9b23deb36f3e713704304672dd7037154e904 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88487 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins
2020-02-12lok: Add LOK_CALLBACK_STATE_CHANGED for uno:OrientationMuhammet Kara2-1/+16
Change-Id: Iab3aaf742bdb9fc4b9c5875fee7d769fa0581eeb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87370 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88451 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-12solenv: remove no longer needed OptionalBox widget factoryMiklos Vajna1-1/+0
Not needed since commit 2d0944ab7a94ea0d5cd5f66c4895a0c99d9a3593 (Resolves: tdf#130513 sfxlo-OptionalBox isn't in sfx, 2020-02-08). Fixes this Android build error: /tmp/native-code-7aaa80.o:native-code.cxx:custom_widgets: error: undefined reference to 'makeOptionalBox' Change-Id: Ib03c9516963e6b14c57ecfca9c7f78132dea2059 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88514 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-02-12Drop macOS SDK 10.12 baselineMike Kaganski1-5/+2
...which appears to no longer work due to incompatible changes incorporated in LO code already. sberg says: "The first issue I encountered when building against the 10.12 SDK is 'fpicker/source/aqua/ControlHelper.hxx:119:78: error: use of undeclared identifier 'NSControlStateValueOn''." Change-Id: Ib762dd8eaa355925b9a81fb41b550c49bfcf53da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86216 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins
2020-02-12clang-analyzer-deadcode.DeadStoresNoel Grandin56-205/+86
Change-Id: Ifa384933569b27d0d08eb479bb95b799163ae386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88450 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12tdf#130440: Add UItestXisco Fauli1-0/+45
Change-Id: I7621e0576dedcc759f44e9662a3926d238d952d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88437 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-02-12tdf#43157 Clean up DBG_ASSERTShubham Goyal1-14/+13
Change-Id: Ie41f91f873d7cada5e738d758ad6b677adcee989 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87428 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-12tdf#128921 tdf#130341 tdf#122053 qt5: Native PopupMenusMichael Weghorn2-2/+48
This implements native PopupMenus for the qt5 VCL plugin, which not only gives them the native look and feel, but also makes context menus faster (tdf#128921), accessible (e.g. to the Orca screen reader, tdf#122053), and makes them work for a case in Base's relationship dialog where entries in the non-native context menu were not selectable/clickable (tdf#130341). For now, this always shows the popup menu at cursor position, which can be changed by taking the Rectangle passed to 'Qt5Menu::ShowNativePopupMenu' into account if there should be any need. Change-Id: Ie52cbc682acacb92716ff51e8bf7f1ab07d34cf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88512 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-02-12tdf#84553 Correctly handle failures while getting a WMI Object.Michel Thomas2-30/+40
The output before this patch : checking for active Antivirus software... C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\antivirusDetection.vbs(1, 1) (null): 0x8004100E found The link for which is : https://ci.libreoffice.org/job/gerrit_windows/57035/consoleFull Change-Id: I714442739a8daf132e95b9f6a750aa7abab3561e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88465 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-02-12Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabiStephan Bergmann1-0/+22
...for Linux aarch64, similar to 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" for macOS x86-64. But unlike on macOS (which is known to always use libcxxabi), be careful to only execute the hack in builds targeting libcxxabi. Change-Id: I5417fde425d2d6bac9400592193a9fe5d2bfe175 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88458 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-12vcl: fix UB in Window::ImplGetFirstOverlapWindow()Miklos Vajna2-0/+15
mpWindowImpl can be nullptr here, see online.git's unit-load-torture test: vcl/source/window/window2.cxx:882:24: runtime error: member access within null pointer of type 'WindowImpl' SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior vcl/source/window/window2.cxx:882:24 in Surrouding code already checks for nullptr mpWindowImpl, so fix it directly where the problem is reported, not a caller. (Also fix a similar case in Window::ImplCallFocusChangeActivate().) Change-Id: I34dee0fd49483c428a78fd48b54c00b2f0a26417 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88474 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-12nModCode assigned but not usedMaxim Monastirsky1-3/+2
aModEvt.mnCode used to get the currently pressed keys before commit fe0451259d2fb93c809c1bfa3baf5abd90019c58 ("tdf#103158 ctrl+shift should work on key up"). Now it gets the previously pressed ones, by ignoring the last nModCode assignment. My intention in the mentioned commit was to only change aModEvt.mnModKeyCode to also include the released key, and nothing else. So let's revert the unintentional change to aModEvt.mnCode. Change-Id: Ic182119e732b79bc494c73f9bd72959f75cc38b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88484 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-12Fix a crash in OpenSSL when checking updates in dbgutil build on WindowsMike Kaganski2-0/+12
... showing a message "OPENSSL_Uplink(00007FFF05F33000,08): no OPENSSL_Applink" with this call stack: libeay32.dll!OPENSSL_showfatal(const char * fmta, ...) Line 986 at C:\lo\src\build\workdir\UnpackedTarball\openssl\crypto\cryptlib.c(986) libeay32.dll!unimplemented() Line 23 at C:\lo\src\build\workdir\UnpackedTarball\openssl\ms\uplink.c(23) libeay32.dll!file_ctrl(bio_st * b, int cmd, long num, void * ptr) Line 334 at C:\lo\src\build\workdir\UnpackedTarball\openssl\crypto\bio\bss_file.c(334) libeay32.dll!BIO_ctrl(bio_st * b, int cmd, long larg, void * parg) Line 361 at C:\lo\src\build\workdir\UnpackedTarball\openssl\crypto\bio\bio_lib.c(361) [Inline Frame] libeay32.dll!X509_print_ex_fp(_iobuf *) Line 93 at C:\lo\src\build\workdir\UnpackedTarball\openssl\crypto\asn1\t_x509.c(93) libeay32.dll!X509_print_fp(_iobuf * fp, x509_st * x) Line 80 at C:\lo\src\build\workdir\UnpackedTarball\openssl\crypto\asn1\t_x509.c(80) neon.dll!make_chain(stack_st_X509 * chain) Line 446 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_openssl.c(446) neon.dll!ne__negotiate_ssl(ne_session_s * sess) Line 752 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_openssl.c(752) neon.dll!open_connection(ne_session_s * sess) Line 1706 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_request.c(1706) neon.dll!send_request(ne_request_s * req, const ne_buffer * request) Line 1011 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_request.c(1011) neon.dll!ne_begin_request(ne_request_s * req) Line 1245 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_request.c(1245) neon.dll!ne_request_dispatch(ne_request_s * req) Line 1456 at C:\lo\src\build\workdir\UnpackedTarball\neon\src\ne_request.c(1456) ucpdav1.dll!webdav_ucp::NeonSession::OPTIONS(const rtl::OUString & inPath, webdav_ucp::DAVOptions & rOptions, const webdav_ucp::DAVRequestEnvironment & rEnv) Line 918 at C:\lo\src\core\ucb\source\ucp\webdav-neon\NeonSession.cxx(918) ucpdav1.dll!webdav_ucp::DAVResourceAccess::OPTIONS(webdav_ucp::DAVOptions & rOptions, const com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> & xEnv) Line 187 at C:\lo\src\core\ucb\source\ucp\webdav-neon\DAVResourceAccess.cxx(187) ucpdav1.dll!webdav_ucp::Content::getResourceOptions(const com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> & xEnv, webdav_ucp::DAVOptions & rDAVOptions, const std::unique_ptr<webdav_ucp::DAVResourceAccess,std::default_delete<webdav_ucp::DAVResourceAccess>> & rResAccess, bool * networkAccessAllowed) Line 3934 at C:\lo\src\core\ucb\source\ucp\webdav-neon\webdavcontent.cxx(3934) ucpdav1.dll!webdav_ucp::Content::open(const com::sun::star::ucb::OpenCommandArgument3 & rArg, const com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> & xEnv) Line 2227 at C:\lo\src\core\ucb\source\ucp\webdav-neon\webdavcontent.cxx(2227) ucpdav1.dll!webdav_ucp::Content::execute(const com::sun::star::ucb::Command & aCommand, long __formal, const com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> & Environment) Line 553 at C:\lo\src\core\ucb\source\ucp\webdav-neon\webdavcontent.cxx(553) updatefeedlo.dll!`anonymous namespace'::UpdateInformationProvider::load(const rtl::OUString & rURL) Line 493 at C:\lo\src\core\extensions\source\update\feed\updatefeed.cxx(493) updatefeedlo.dll!`anonymous namespace'::UpdateInformationProvider::getUpdateInformationEnumeration(const com::sun::star::uno::Sequence<rtl::OUString> & repositories, const rtl::OUString & extensionId) Line 591 at C:\lo\src\core\extensions\source\update\feed\updatefeed.cxx(591) updchklo.dll!checkForUpdates(UpdateInfo & o_rUpdateInfo, const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> & rxContext, const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> & rxInteractionHandler, const com::sun::star::uno::Reference<com::sun::star::deployment::XUpdateInformationProvider> & rUpdateInfoProvider, const rtl::OUString & rOS, const rtl::OUString & rArch, const com::sun::star::uno::Sequence<rtl::OUString> & rRepositoryList, const rtl::OUString & rGitID, const rtl::OUString & rInstallSetID) Line 129 at C:\lo\src\core\extensions\source\update\check\updateprotocol.cxx(129) updchklo.dll!checkForUpdates(UpdateInfo & o_rUpdateInfo, const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> & rxContext, const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler> & rxInteractionHandler, const com::sun::star::uno::Reference<com::sun::star::deployment::XUpdateInformationProvider> & rUpdateInfoProvider) Line 97 at C:\lo\src\core\extensions\source\update\check\updateprotocol.cxx(97) updchklo.dll!`anonymous namespace'::UpdateCheckThread::runCheck(bool & rbExtensionsChecked) Line 393 at C:\lo\src\core\extensions\source\update\check\updatecheck.cxx(393) updchklo.dll!`anonymous namespace'::UpdateCheckThread::run() Line 501 at C:\lo\src\core\extensions\source\update\check\updatecheck.cxx(501) updchklo.dll!threadFunc(void * param) Line 186 at C:\lo\src\core\include\osl\thread.hxx(186) sal3.dll!oslWorkerWrapperFunction(void * pData) Line 62 at C:\lo\src\core\sal\osl\w32\thread.cxx(62) ucrtbased.dll!thread_start<unsigned int (__cdecl*)(void *),1>(void * const parameter) Line 97 at minkernel\crts\ucrt\src\appcrt\startup\thread.cpp(97) kernel32.dll!BaseThreadInitThunk() ntdll.dll!RtlUserThreadStart() The problem is missing OPENSSL_Applink function in soffice.bin (see workdir/UnpackedTarball/openssl/ms/uplink.c), because openssl/applink.c is not included. That started after commit 5c89198f69f4487b1c872269ec6f2931490b3d02, which enabled debug output from Neon in dbgutil builds. Just comment out the call to the OpenSSL function that uses file pointer API from the Neon debug code on Windows. Change-Id: Id0188990e9122ee9fd2b3b6b7292bbeb1d206515 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88412 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
2020-02-12tdf#126700 allow replacing the default documentsJan-Marek Glogowski9-9/+57
Per default, a document opened by a user action will always open in a new frame. For tdf#83722, this behaviour was extended to documents created from templates. But this currently also affects the default factory templates, if these are replaced by a config setting with a real template, which was not intentional. So this patch introduces a new MediaDescriptor property, which allows to mark a document as replaceable and automatically sets it for factory default documents. If this property is set to true, a document just acts as a placeholder while it's unmodified. I.e. the next opened document from its frame will close and replace it. Change-Id: I45ffa8709f7cdda949fac78f3b363f120f0c4a03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88257 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-11fix svtools' sVendor for langpack install for DebianRene Engelhard1-2/+1
after a21987977eae34eaf02fa109201c802f77ea68d1 Change-Id: I4bd2b37e3f006209f55bccca9fe117b0c0c4efbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87908 Tested-by: Jenkins Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2020-02-11Fix FontColor does not change selected cells on calcMert Tumer1-2/+24
Change-Id: Iae2f72bff4fd6986fc8cc07ba09996b1af4eb140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86670 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 23e8e4521366aaf5831a3c1feaffdc41658ce7e7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88398 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-11tdf#129388: Avoid any actual painting of the slide sorter in the LOKit caseTor Lillqvist1-3/+8
The JS code in Online creates its own slides sorter thing anyway, the one is core is only needed as a data structure. Change-Id: I0eeb79c523b72f7b616f11443198d5af82b70643 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87184 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88444 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-11tdf#130440 only select first page if no other page is selectedXisco Fauli1-1/+1
Found while implementing the UItest. See https://gerrit.libreoffice.org/c/core/+/88437 it asserts on line 34 AssertionError: 2 != 1 as the first and second slides are selected Change-Id: I249dc0ac6faa55f0f15deedb848beabbc64aeed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88439 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-02-11Fix duplicate "stringresource" in MERGE_LIBRARY_LISTStephan Bergmann1-1/+0
...where both entries were added with 40fe721462df5bedacddc8829cefc3d739cf940f "add some more libs to libmerged", and defining Library_stringresource in scripting/Module_scripting.mk is conditional on BUILD_TYPE SCRIPTING. This will hopefully fix <https://ci.libreoffice.org/job/lo_callgrind_linux/7884/> (which apparently uses --enable-mergelibs), > /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o: in function `stringresource::StringResourceImpl::isReadOnly()': > /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297: multiple definition of `stringresource::StringResourceImpl::isReadOnly()'; /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:297: first defined here > /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o: in function `stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)': > /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659: multiple definition of `stringresource::StringResourceImpl::loadLocale(stringresource::LocaleItem*)'; /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/scripting/source/stringresource/stringresource.o:/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/scripting/source/stringresource/stringresource.cxx:659: first defined here [...] Change-Id: Ie667487bced048d3b0b0081a9fa4abafa090f02b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88468 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins
2020-02-11tdf#130478 add direct dash paint in GDIPlus (win)Armin Le Grand (Collabora)1-3/+58
Not as easy as hoped, see more info in the adapted file vcl\win\gdi\gdiimpl.cxx itself. Change-Id: I265888c65658d5e8a2a04b6f064d2baf3e1d9bad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88463 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>