summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-03tdf#88163 Fix WMF font sizeHossein
The problems in tdf#88163 can be categorized into two parts: 1. A regression which is caused by the commit a9020e461803964a206d5551884b70717eed165c. The font size for text is wrongly calculated for wmf files WITHOUT the placeable header. 2. A long-lasting bug that has existed from LO 3.5 (tested with various LibreOffice versions from 3.5 to master). The font size for text is wrongly calculated for wmf files WITH the placeable header. This patch solves the first part. In this patch the way wmf is scaled is changed using mnUnitsPerInch as a variable that controls the scale. The previous method was dividing the left/right/top/bottom fields of aPlaceableBound which caused the bad scaling of text. The second problem still remains, and possibly can be solved by usign the old scaling method that was previously used here (dividing pos values of aPlaceableBound), but the scaling factor should be calculated, which varies in different wmf files. More study should be done to solve this part. Values used for the example "visio_import_source.wmf" used in the test WmfTest::testNonPlaceableWmf() are slightly changed, but the rendering should not noticeably change, except the fix for the text font size. A new test WmfTest::testTdf88163NonPlaceableWmf() is added which checks for both font height and text boxes' positions. Font height can depend on the exact font that is used for Roman in the platform, so it vary between Linux, Windows and macOS. Thus, a range is used for ensuring that the font height is correct. By visual inspection, it is confirmed that this fix does not affect fdo#74336 and the fix for it still works for attachment 93188. Change-Id: I55bf38ba4345a0aa48c3e522976a2a5c32f7ec8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121272 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-09-03tdf#144155: Revert "tdf#36383 sc AutoFilter: fix changing row height"Xisco Fauli
This reverts commit 3678e0efcb8bedc58dd329a430da0ac3b1572df8. Conflicts: sc/qa/uitest/autofilter/tdf36383.py Change-Id: Ie1abd0cdea013571a27b187ffcb20125a0656442 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121512 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins
2021-09-03tdf144058 sw track changes: fix table deletion at paragraph joinLászló Németh
Tracked paragraph join by table deletion left empty table in the text after accepting the changes, caused by the non-continuous redline range over the table, related to the copying of the formatting of the first paragraph to the (wholly or partially) removed paragraphs. Fixed by skipping paragraph format copying in the case of table paragraphs. Note: this is not enough for tables with inner redlines, where tracked paragraph join with deletion of such a table still leaves an empty table at the place of the table (a problem inherited from OOo). Regression from commit 1bbbe57dfc0b43d6b5444798d77dcdf5e4e76e49 "tdf#119571 change tracking: show layout changes at paragraph join". Change-Id: Ib3ff79c766b5e6faced796b9546d332bab4e0d94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121510 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-03Remove some unused includesMiklos Vajna
See tdf#42949 for motivation. Change-Id: I62354cf2ae750a91b72e91ad838a40e205e7cd61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121526 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-09-03no need to allocat PptFontEntityAtom separately hereNoel Grandin
Change-Id: Id0b8c919bc35bb427a88c229d024a118437785f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121530 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-03no need to allocate BSaveStruct separatelyNoel Grandin
Change-Id: Id14f525e84c22caa8f974f2f1d9f398f8d8e2df8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121532 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-03Update git submodulesRafael Lima
* Update helpcontent2 from branch 'master' to 95e6fe8d728b7981e4262e71646fd212da1775aa - tdf#63175 Fix description of Calc shortcut keys This patch adjust a few shortcut key descriptions and adds two new ones. Both shortcuts were reported by the user and they do work in LO 7.3. Change-Id: Iab697f5894ceb3bb6ff62c732139f2aff2ae9ec0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121471 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-03Update git submodulesAndrea Gelmini
* Update helpcontent2 from branch 'master' to cc703be0b95314adcf7de4c1c4a5e6e0631c2a2e - Fix typo Change-Id: I75613efd4b08164a495c8a5110d3cea016bc05cf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121541 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-03related tdf#137363: no NUMBERING_LEVEL 9(no-level) in paraJustin Luth
Remove the (fake) 9 from the direct paragraph formatting. Otherwise when numbering is applied it will start at level 10 instead of the proper level (as defined by the style). Change-Id: I26fdff36e4f3d3449a259918a7c57a76bae7d486 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121503 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-09-03vcl: Migrate OutputDevice font functions to font.cxxChris Sherlock
Add unit tests for SetFont() and GetFont() Change-Id: I5b66cd5531aa0f9fd73357dd2a168d9c5b655b35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121016 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-03Make sure to use debug options for firebird in debug modeMike Kaganski
Change-Id: I358bd2013387e9fb341d92764f29767d6c0c2cb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121470 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02ofz#38011 save and restore m_pLastAnchorPos via UnoCursorCaolán McNamara
when we do some operations that may delete paragraphs Change-Id: I2165dd287771f06c6d0fd061dd7659b06db4bd72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121511 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02tdf#35129 a11y: Let SPINBUTTON have role SPIN_BOX, not PUSH_BUTTONMichael Weghorn
Change-Id: I3aaac19890a356e930203ecdb003edfbfed1b52b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121516 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-02do the same check on the same code pattern as was done earlierCaolán McNamara
in this same function Change-Id: I03a112e3e57549ec776e99a460544b575476528d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121496 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02tdf#144209: sc_subsequent_filters_test2: Add unittestXisco Fauli
Change-Id: I00a0f1efad4d003c7213117ede7f14fbdcb2c00e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121509 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-02cid#1490900 Unchecked return valueCaolán McNamara
Change-Id: I22ab45d8e7bc72c3cf8cf8bb8ddbefef4250fdad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121517 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: Ie666d56816b5af96590d482e2af204e0f6486bc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121494 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: I5b06808b7b676b9e7cbcea2d9330431c82055d0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121521 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02tdf#136610 Add Clone/Clear Direct Format to other tabbed interfacesrafaelhlima
Change-Id: I4d009de786acd2a84f698b11eb48c52222f09c25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120858 Tested-by: Jenkins Tested-by: Andreas Kainz <kainz.a@gmail.com> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2021-09-02Related: tdf#137363 ODT import: handle style:list-level="..." for para stylesMiklos Vajna
This is just the import side, the export side still needs doing. The used attribute was already part of ODF, and NumberingLevel for para styles where already imported/exported for DOCX. Change-Id: I8385ed23dc799c99e81318387236341b404d01a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121515 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: I9284239851472d6776e80d9d9c283b7f45db13c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121499 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02Update git submodulesAlain Romedenne
* Update helpcontent2 from branch 'master' to 6e00ebfc8b1fb0abb3a1f4a18cbf1177f0b92618 - sf_platform.Printers new 7.3 property Change-Id: I44841d02698568e63791a2fdba480002caa03d4e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121468 Tested-by: Jenkins Tested-by: Jean-Pierre Ledure <jp@ledure.be> Reviewed-by: Rafael Lima <rafael.palma.lima@gmail.com>
2021-09-02rename UpdateMode -> UpdateLayout in editeng classNoel Grandin
... because "update" is such a generic term I keep forgetting what we are turning on and off Also return the previous value from SetUpdateLayout to make the save/restore code more compact. Change-Id: Iae1764c837a92e58c9b17521f130e8fc80311d22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121479 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02convert malloc/free to std::vectorCaolán McNamara
Change-Id: Icc9bb8cd6851ee027d5a5469c78d26cf6a943708 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121501 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02move variables to where they're usedCaolán McNamara
Change-Id: Iaf7e7bf1a58aedb0ad6852812f969fc7e6153a54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121500 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02vcl: make GetFillColor() and IsFillColor() inline class functionsChris Sherlock
Change-Id: I5f80765658f1c1679f56df59d4b8212caa9d1357 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121486 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02Use utl::TempFile::EnableKillingFileMike Kaganski
Helps keep temp directory clean also on exceptions Change-Id: I81c17d90d6905653db946e68faf2a7f59c17da15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121466 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02clang-tidy:readability-redundant-member-initNoel Grandin
Change-Id: I396b83c089fef3aeb7789c17a3013ce61691504e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121489 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: I827ddc6692280dbad44b03cfa07f1f35375080c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121502 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02Resolves tdf#144227 - Default command to switch UIHeiko Tietze
Remaining .uno:ToolbarMode replaced by .uno:ToolbarModeUI Change-Id: Ie5afaa997dabaca0feafde41355945460f1292f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121417 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2021-09-02clang-tidy:readability-redundant-member-initNoel Grandin
Change-Id: I39b9ac81d65f4a269293824642c1b2ec593c0584 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121490 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02unused definesNoel Grandin
Change-Id: I494e64c69decb9fb3d5b13ffc2f18d99f6b7749f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121442 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02clang-tidy:readability-redundant-member-initNoel Grandin
Change-Id: I0a9b238c0ba551b330bee7b89eb6cd48fad1b265 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121488 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02loplugin:badstaticsNoel Grandin
whitelist another that started showing up when I built clang from recent trunk Change-Id: I37cb3a430a72df7e39e1ef8a5cf5f51383b4eaf9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121493 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: I2b33dd4893bb71bd7880e068d26ebe3d31d07ab1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121485 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: Ic592091450d596d505b7e802cb8560be2c01cb0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121451 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02tdf#144189 Not Precedes (U+2280) and Not Succeeds (U+2281)dante
Change-Id: Id2d619769012a1b26415656e7793a70c6b17c298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121482 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
Change-Id: I08bffde6c08d97d140e2985876a62084035d657f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121484 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02ofz: MemorySanitizer: use-of-uninitialized-valueCaolán McNamara
bodge dodgy SetStreamSize for now Change-Id: I4f15a2f2e196eb7b4a22331e66966f242d8968c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121483 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-02sw: handle mbPurgeOLE when replacing compat optionsMiklos Vajna
This is only read in SwOLEObj::UnloadObject() and the flag was there already with the initial import. It has no UI, so probably it's a compat setting. Change-Id: If776f7f86d2d2ebbc7421855e032c316e8ecacc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121481 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-09-02tdf#137363 DOCX filter: no NUMBERING_LEVEL 9(no-level) in stylesJustin Luth
The only real (initial) reason for setting PROP_NUMBERING_LEVEL in the style was to round-trip it so it didn't get lost. It does kinda give a nice side benefit in UI, where the style can now set the listLevel at the same time as turning numbering on (at least on the second try.) However, 9 ends up meaning LEVEL 10 in LO UI, instead of NO LEVEL. So eliminate that value from round-trippability, since LO has no correlating NO LEVEL value possible for that PROP. The UI is too broken and inconsistent for any attempt at a unit test. Change-Id: Ibd9cea2ec10e85651f9f6643ad1b49ebf9babe12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121448 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-09-02vcl: test bitmap color when using DrawBitmap()Chris Sherlock
Change-Id: I0c4f9517ca4573300b6ef9237ac9536f19523ab7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121043 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-09-02turn on symbols for jenkins windows buildsNoel Grandin
so we get good stacktraces when something goes wrong Change-Id: I1e0832b3ab0bdbbf1a76533c37fbb0a8060a0166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121266 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-02external/cairo: Avoid UBSan invalid-null-argumentStephan Bergmann
...as seen during CppunitTest_sw_uiwriter4: > [_RUN_____] SwUiWriterTest4::testEmojiAutoCorrect cairo-surface.c:2852:28: runtime error: null pointer passed as argument 2, which is declared to never be null > /usr/include/string.h:44:28: note: nonnull attribute specified here > #0 in _cairo_surface_show_text_glyphs at workdir/UnpackedTarball/cairo/src/cairo-surface.c:2852:9 (instdir/program/libcairo.so.2 +0x9ac09e) > #1 in _cairo_gstate_show_text_glyphs at workdir/UnpackedTarball/cairo/src/cairo-gstate.c:2077:15 (instdir/program/libcairo.so.2 +0x65a4af) > #2 in _cairo_default_context_glyphs at workdir/UnpackedTarball/cairo/src/cairo-default-context.c:1315:12 (instdir/program/libcairo.so.2 +0x62404f) > #3 in cairo_show_glyphs at workdir/UnpackedTarball/cairo/src/cairo.c:3629:14 (instdir/program/libcairo.so.2 +0xa6c77f) > #4 in CairoTextRender::DrawTextLayout(GenericSalLayout const&, SalGraphics const&) at vcl/unx/generic/gdi/cairotextrender.cxx:265:9 (instdir/program/libvcllo.so +0xae46aa3) Change-Id: Ifa22046bb35a872c4db38130a7ae4c9b758ccbc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121473 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-02tdf#144172: patch FB to use per-process LOCK directoriesMike Kaganski
As discussed at https://github.com/FirebirdSQL/firebird/pull/6937: > > But as well, we may just use process id instead of session id in > > the ConfigStorage::ConfigStorage creating filename. That would be > > even better, fitting better into our per-process temp dir policy. > I tend to agree with you here. It looks safe assuming LO uses > SuperServer only. Let's not replace the session id with process id, but instead append process id after session id, to avoid (unlikely?) accidental overlap of process id and session id, which would produce the same name as already used by, say, isql tool. Change-Id: Ibce8a8c75d405aae3e8949e7daf2476accdff22b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121457 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02vcl: move OutputDevice line functions to line.cxxChris Sherlock
Add unit tests for SetLineColor(), IsLineColor() and GetLineColor() Change-Id: I54a6e191f9c821c258527ebf075d88ff60cc9471 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121015 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02tdf#144230: sanitize string length embedded in SQL_VARYING dataMike Kaganski
It is unclear why the length may be wrong; but at least be safe to avoid buffer overruns. Wrt the validity of sqllen here: see SQLDAMetadata::scatterData in firebird's src/yvalve/why.cpp. Change-Id: Icc24c1cc0db66c20732188ab0621cde53c1ba5c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121458 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-02tdf#74702 vcl: make helper funcs for ImplDrawWaveLine() and ImplDrawWavePixel()Chris Sherlock
Unit tests written for Printer and OutputDevice, note that I might have uncovered a bug. Change-Id: Ic8e6e02ce0df349fc6fb6a3334105c1e6dfa3f36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113563 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-09-02Revert "make Skia the default now on Mac too" (tdf#144214)Luboš Luňák
It turns out HiDPI needs special handling, and I didn't get it right, and can't find a way to set up that mode here, so I can't test. Revert the default for now until this gets sorted out. This reverts commit 2489edcbe0f5dc77649fc2e801c1bbffb71692b8. Change-Id: I6d2f09a81c1ffa1537183a834f242c4f8b29aa4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121423 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-01tdf#135588 wina11y: Map AccessibleRole::STATIC to ROLE_SYSTEM_STATICTEXTMichael Weghorn
This looks like a better match to me than the previously used 'IA2_ROLE_TEXT_FRAME' and the NVDA screen reader reads the text of child objects of 'ROLE_SYSTEM_STATICTEXT' when announcing their parent objects if they have a specific role (e.g. 'ROLE_SYSTEM_PANE' or 'ROLE_SYSTEM_GROUPING'). Description for 'ROLE_SYSTEM_STATICTEXT' from [1]: > The object represents read-only text, such as labels for other controls > or instructions in a dialog box. Static text cannot be modified or > selected. Description for 'IA2_ROLE_TEXT_FRAME' from [2]: > Collection of objects that constitute a logical text entity. With this and an additional change to make the NVDA screen reader speak the children of a VclBox, NVDA reads the complete text of MessageDialogs as they are shown, rather than just the dialog title. ('AccessibleRole::STATIC' is used for the readonly VCLMultiLineEdits in a MessageDialog, s. 'VCLXAccessibleEdit::implGetAccessibleRole'.) The additional change needed to fix tdf#135588 when using NVDA on Windows is to make sure that 'AccessibleRole::PANEL' (used for a VclBox on Windows, s. commit 685ec1899435037205d98a102a32ca8b6a4836d0 Date: Mon Feb 17 16:57:44 2014 +0000 Related: fdo#74284 try AccessibleRole::PANEL for VclBoxes under windows Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13 and additional information in fdo#74284) is mapped to something for which NVDA descends into the children. Testing this by just changing the LibreOffice side can be done by adapting the mapping for 'AccessibleRole::PANEL' to 'ROLE_SYSTEM_PANE' like this: diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 9e3f7d063b3b..e0ae1e2dc03e 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -98,7 +98,7 @@ const short ROLE_TABLE[][2] = {OPTION_PANE , IA2_ROLE_OPTION_PANE}, {PAGE_TAB, ROLE_SYSTEM_PAGETAB}, {PAGE_TAB_LIST, ROLE_SYSTEM_PAGETABLIST}, - {PANEL, IA2_ROLE_OPTION_PANE}, + {PANEL, ROLE_SYSTEM_PANE}, {PARAGRAPH, IA2_ROLE_PARAGRAPH}, {PASSWORD_TEXT, ROLE_SYSTEM_TEXT}, {POPUP_MENU, ROLE_SYSTEM_MENUPOPUP}, Adapting NVDA as follows to handle 'controlTypes.ROLE_OPTIONPANE' accordingly might be a better approach, though: diff --git a/source/NVDAObjects/behaviors.py b/source/NVDAObjects/behaviors.py index e51f9e4a3..47389186e 100755 --- a/source/NVDAObjects/behaviors.py +++ b/source/NVDAObjects/behaviors.py @@ -89,6 +89,7 @@ class Dialog(NVDAObject): continue #For particular objects, we want to descend in to them and get their children's message text if childRole in ( + controlTypes.ROLE_OPTIONPANE,^M controlTypes.ROLE_PROPERTYPAGE, controlTypes.ROLE_PANE, controlTypes.ROLE_PANEL, I'll discuss that in the corresponding NVDA issue on GitHub: [3] [1] https://docs.microsoft.com/en-us/windows/win32/winauto/object-roles [2] https://accessibility.linuxfoundation.org/a11yspecs/ia2/archive/ia2-1.0.2/docs/html/_accessible_role_8idl.html#e37ff81431ee3762a5d41a2cb909108d73becd811853026681d0000b17da7862 [3] https://github.com/nvaccess/nvda/issues/11687 Change-Id: Ic49d49cfc2d5f01646086931f9f8a522c6f0d5fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121476 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>