summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2022-05-17sw content controls, picture: add doc model & UNO APIMiklos Vajna
This is meant to be a content control (providing rich text), which is also a picture placeholder field. Add a new Picture property to track this type, this way the click handler will be able to present a file picker when showing the placeholder. Change-Id: Ibbd3720fc94d0f17654ec813821d218166c76424 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134457 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-17sw: document SwEditShell::InsertTable()Miklos Vajna
How it interacts with SwCursorShell::MoveTable() is far from trivial. Change-Id: I04c9123c0b39192df43fe32984d66852102ebd1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134410 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-16Fix a UITest on WindowsMike Kaganski
Change-Id: I943a7696fd896c8709fdcd25bce650dd80244daf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134367 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-05-16Fix a UITest on WindowsMike Kaganski
Change-Id: Ieb6d04e344b1d875f2661833e17f64930681e528 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134366 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-05-16sw content controls, dropdown: edit list items: add modify and deleteMiklos Vajna
Modify is really similar to insert, just we pre-fill the list item properties dialog with old data. Also allow moving items up / down, and eliminate a not needed frame in the inner dialog, which would assert when using the gen backend. With this, the content control dialog is quite complete for dropdowns. Change-Id: I26e77dd881f0a0eea44d2a6137f76fd29ab32fc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134405 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-16tdf#137748 make keyboard accelerators functional in Statistics dialogSeth Chaiklin
Make the keyboard accelerators in the Statistics tab of the File - Properties dialog select the text of the fields that they label. Change-Id: I61a93e227ed1e457355dc971dc4864ab4419a770 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134358 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-16Make media object delete when it is cutJim Raykowski
Change-Id: Id586e015e42c23aa455d6f1a5dc42fbda492d2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134381 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2022-05-16Related: tdf#137748 "Update" should have use-underlineCaolán McNamara
Change-Id: I8303cd8d2cabd8888797758870480483661d8801 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134391 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins
2022-05-16sw content controls, dropdown: edit list items in the properties dialogMiklos Vajna
- add a weld::TreeView to show existing display name - value pairs - add a button to add a new list item, together with a new SwContentControlListItemDlg to specify the list item properties + write the changed list back to the doc model Change-Id: I9243be84eb0af65437eccfb48c6780787609bc68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134379 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-16sw: prefix members of SwMSDffManager, SwWW8FltControlStack, ...Miklos Vajna
... SwWW8FltRefStack and SwWW8ReferencedFltEndStack See tdf#94879 for motivation. Change-Id: I93ac7230bc383433d7232c5d14ed98339620316f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134380 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-16std::stable_sort() where libc++ debug mode breaks a unittestLuboš Luňák
Libc++ debug has a feature that randomizes equal elements during sort, which normally wouldn't make a difference, but some tests rely on specific order of tested data. The ones failing without this include: CppunitTest_sw_ooxmlexport testMsoPosition CppunitTest_sw_xhtmlexport testTdf66305 CppunitTest_sw_ww8export testCommentExport Change-Id: Id49846939a264150cc82091718ffe6b904d7130e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134337 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-05-15tdf#149049 related: fix media object inserts twice in WriterJim Raykowski
Change-Id: Id7a7b845e0255086eb877d21699ddb0b80cc47c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134335 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-14Related tdf#149072: avoid warning "misuse of method"Julien Nabet
complete warning log: <SwTextFormatColl::GetAssignedOutlineStyleLevel()> - misuse of method part of bt when opening attachment of tdf#149072 0 SwTextFormatColl::GetAssignedOutlineStyleLevel() const (this=0x77064d0) at sw/source/core/doc/fmtcol.cxx:608 1 0x00007f8a52aa7941 in sw::(anonymous namespace)::HeaderCheck::check(SwNode*) (this=0xa457630, pCurrent=0x7705e98) at sw/source/core/access/AccessibilityCheck.cxx:622 2 0x00007f8a52a9a6a3 in sw::AccessibilityCheck::check() (this=0x7ffe4a14ab10) at sw/source/core/access/AccessibilityCheck.cxx:947 3 0x00007f8a53ed2ad7 in SwDocShell::runAccessibilityCheck() (this=0x74ef0e0) at sw/source/uibase/app/docst.cxx:1559 4 0x00007f8a16e7fdec in ImpPDFTabDialog::OkHdl(weld::Button&) (this=0xa0e9990) at filter/source/pdf/impdialog.cxx:324 5 0x00007f8a16e7fb2d in ImpPDFTabDialog::LinkStubOkHdl(void*, weld::Button&) (instance=0xa0e9990, data=...) at filter/source/pdf/impdialog.cxx:317 Change-Id: I2ed50f14eff01babd47ada3831c0a051fc767dbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134312 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2022-05-14tdf#121740 cache hashcode in SequenceAsHashMapNoel Grandin
shaves 2% off load time Change-Id: I5bd4eabf61205df21a27d2822acd2676a7732a3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134315 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-14Partially resolve: tdf#149010 rename section "Names" -> "Accessibility"Seth Chaiklin
Change-Id: I2f9f38ae79f0f05b42e6f209d504c5f8a5896ed3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134182 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-13tdf#149074 SvHeaderTabListBox not handling lack of preset column widths wellCaolán McNamara
Change-Id: Ibd33fe5c5168850eca1bdc7242afc38ed08b5fa2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134289 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-13sw content controls, dropdown: add an initial properties dialogMiklos Vajna
- read the doc model: show if a content control is a placeholder or not - work with a shared pointer in the dialog, which avoids lifetime issues in case the content control we edit in one view gets deleted in an other view - write the doc model: set the placeholder mode of the content control based on the checkbox state and mark the doc as modified if any widget is touched when pressing OK - handle command state: allow this dialog only inside content controls Change-Id: Ie0b9075ccd3450dd403cc7f8bbf93fc04de3b234 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134278 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-13add SvStream::ReadLine(OStringBuffer... to reduce OString allocationNoel Grandin
and use it where possible Change-Id: I3efc7a642f73661ce606c917c0323ba9948521c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134265 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-13sw content controls, dropdown: add LOK APIMiklos Vajna
- expose the available list items in a new "items" key of the LOK_CALLBACK_CONTENT_CONTROL callback - add a new lok::Document::sendContentControlEvent() function to be able to select a list item from the current drop-down - add a new listbox to the gtktiledviewer toolbar to select a content control list item when the cursor is inside a dropdown - add tests for the array API of tools::JsonWriter Change-Id: I47f1333a7815d67952f7c20a9cba1b248886f6dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134256 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-13CppunitTest_sw_layoutwriter: use more SwParaPortion::dumpAsXml()Miklos Vajna
See commit feeed3e762cf077fbd9cf48f82e949365108ccc1 (CppunitTest_sw_layoutwriter: avoid some a11y-based layout testing, 2022-04-07) for motivation. Change-Id: Ie52b96e1d7a5e5e2d55d9f68f7756e21b86ea9b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134249 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-13tdf#104930 aligning CTL text with hanging baseline.Mark Hung
1. SwTextSizeInfo::GetHangingBaseline() calls SwFont::GetHangingBaseline() to obtain the hanging baseline value. Only CTL script handled, it always return 0 for other two scripts. Eventually Outdev::GetFontMetric() and TextMetric::GetHangingBaseline() are called to obtain the hanging baseline value from vcl. 2. SwTextFormatter::CalcAscent() sets the baseline value for the portion via SwTextSizeInfo::GetHangingBaseline(). 3. SwTextFormatter::InsertPortion() sets the maximum baseline value for the whole line. 4. SwTextCursor::AdjustBaseLine() calculates the new baseline in case hanging baseline is available. Change-Id: I1aae7a34dfc953227b7873fc8e3af5cc7e2fbbff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133668 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2022-05-12sw content controls: fixes for the ending dummy charMiklos Vajna
- make sure the DOC/RTF export doesn't write the dummy char as-is - let "enter" only insert a linebreak while inside a content control, to ensure that the starting and ending dummy char stays inside the same text node - let deletion of the dummy character at the end behave the same as the start dummy character: if trying to delete that single character, then just move the cursor, don't delete it - reject document insertion in the middle of a content control, similar to input fields Change-Id: I9b54ef50261e6b17f38eadadacfe1e1111199e96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134239 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-12sw: fix crash in SwDrawShell::Execute()Miklos Vajna
Crashreport signature: SwDrawShell::Execute(SfxRequest&) [clone .cold] include/svx/svdhdl.hxx:194 SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) sfx2/source/control/dispatch.cxx:255 which is a bit tricky to read (probably due to LTO), but what happens here is that the handle index is user input and we look at index up in a list without error handling. This is a problem since commit 7eed711a6115bf892c998cbd73a2c5b706c6f99d (Extended MoveShapeHandle command for Anchors as well, 2021-05-24), which assumed that handle indexes and the handle list can't get out of sync. Fix the problem similar to what commit 48beccf52413981d3d1c525a81a2c57048abe261 (sw: fix crash in SwView::Execute(), 2021-09-03) did at SID_MOVE_SHAPE_HANDLE handler for Writer images (this one is for Draw shapes). This fix just makes sure we don't crash, there may be some deeper reason why the handle index is out of sync with the handle list in the first place. Change-Id: I8f3a25d74082984cedce09362a690f24d7236ba6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134216 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-12sw content controls, dropdown: add insert UIMiklos Vajna
- introduce a SwContentControlListItem::ToString() that tries to use the display text of the list item, otherwise falls back to its value and use it while building the dropdown widget and when inserting selected list item - handle the dropdown case in SwWrtShell::InsertContentControl() - expose this as a new .uno:InsertDropdownContentControl command - mention the new and all previous content control commands in the MS-compatible forms menu as well Change-Id: I075f77933c1466b5258357d5a661e173c34de34f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134215 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-12tdf#148941 consistency between popup box and option dialog for objectsSeth Chaiklin
cui/uiconfig/ui/objecttitledescdialog.ui * change "Title" to "Text Alternative" to use the terminology from Web Content Accessibility Guidelines (WCAG) 2.1 https://www.w3.org/TR/WCAG21/#dfn-text-alternative which is also consistent with the purpose of this option in LO + add tooltips to "Text Alternative" and "Description" in Description popup box. The idea is that the tooltips will help to understand the purpose of dialog. sw/uiconfig/swriter/ui/frmaddpage.ui * _Alternative (Text only) -> "Text _Alternative" [This change matches the change in the popup box] + add missing : to "vertical alignment", according to HIG officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu + add tooltips for the "Name" and "Description" .unos, primarily for the customize dialog, and icons in notebookbars. Change-Id: I1943b49e13763371823bfcf2cfc8652c907de110 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134066 Tested-by: Jenkins Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
2022-05-12tdf#148940 improve non Snap-to-char mode textgrid layout.Mark Hung
- Revert b647f9f4bcb24ed9b71c77038da6b754b8d42eb7 , i.e. tdf#107362 don't insert kern if snap to char is not checked. This includes: a) Revert to insert kern portion to align the next CJK text portion to the next grid cell border. b) Revert none snap-to-char code to proecess CJK script only as before. Latin and CTL scripts are processed as witnout text grid. - EvalGridWidthAdd() now uses the 0th element of kern array as the glyph width to calculate the distance to the nearest cell border. This makes layout more accurate and do not generate extra spaces, allow testTdf107362 to pass. - SwFont::GetTextBreak() non snap-to-char mode now uses the same code as snap-to-char mode to calculate the accommodable text length. This fix one excess character per line problem for non snap-to-char mode. - Update testTdf107025 because the character in the test case occupies more than one text grid cells. Layout change has been verified. - tdf#107446 breaks again because of the patch. It needs different solution for Word compatibility. Change-Id: I7fadb065b9cce2d71aaaed39be2881c43d8e4db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134001 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2022-05-12tdf#142840: doc export: use BookmarkToWord() for hyperlinksVasily Melenchuk
Inernal hyperlinks to bookmarks should not contain spaces. This is not required for RTF or DOC: MS Word is okay with spaces there (unlike in DOCX). But since we are replacing spaces in bookmark names we should do this also in links to these bookmarks. Change-Id: I7a3e530817572ed53032c2be1ad96f8e8498bac3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133590 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-05-11tdf#148148: Applying Title Case when selection contains only spacesMichael Warner
Previously, if the user's selection does not contain any word characters, but the node does contain characters outside of the user's selection, then searching for the word boundaries when applying title case could result in start and end points that were incorrect. In Writer this results in title case being applied to non-selected characters. In Calc this results in a debug assertion being hit. This commit prevents those issues by skipping transliteration on the node in this case. Change-Id: I20c5ef44793741c5863f838c13ba222452346a97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132801 Tested-by: Jenkins Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-11Inline the typedefMike Kaganski
... and simplify SwOLELRUCache::InsertObj a bit Change-Id: I7461e800ade0e0c3f2a1cd79715cecd5cfc971bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134174 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-05-11Advanced Diagram support: UNDO/REDO support for Diagram DataModelArmin Le Grand (Allotropia)
Added support for UNDO/REDO for changes in Diagram ModelData. This is currenly applied/used in the DiagramDialog for it's Add/Remove actions (also supports Cancel of that dialog 1st time ever). But it is defined more general to add/support manipulating actions like clone/change_text etc. Also the UI/dialog at he end will not be/stay modal, so this is a test implemenation how to use it. It uses an extract/apply mechanism to get/set the Diagram ModelData at/for the UNDO action. That may be expanded as needed for additional data in he future. It may also be considered to modify the Connection/Point ModelData to shared_ptr internally completely to avoid copying these at all. OTOH it is not that much data to handle at all. Change-Id: I4702ed908b79a476177fe66c0e3284898c6adda5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134118 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
2022-05-11sw content controls: introduce a word breaking dummy char at the endMiklos Vajna
- this way double-clicking on the last word of a content control or the first word after the content control selects the correct text range, similar to how the same at the start of content control already worked - this allows not touching the expand flag in the SwTextContentControl ctor, which was overwritten by the ODT import (when the content control was at the end of the paragraph) anyway - hide this dummy character when accessing the paragraph content via the UNO API or the text export - still need to audit a few more places in follow-up commits to maintain the invariant that content controls have the same dummy char at the attribute start and end -- somwhat similar to how SwTextInputField does it with CH_TXT_ATR_INPUTFIELDSTART/END Change-Id: I88763d6db84afedbb865b680f040994c4d6ab7d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134151 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-11sw content controls, drop-down: add DOCX importMiklos Vajna
- inline drop-down content controls were imported as an SwDropDownField previously, but that has the drawback of not being able to store both display texts and values of each list items - adapt tests under sw/qa/ which asserted that the import result is a field, and check content control properties instead - change dmapper so that SdtControlType::dropDown is one more inline SDT that gets mapped to SwContentControl - remove the no longer needed grab-bagging in writerfilter/, otherwise we would write the SDT markup twice on export - improve DomainMapper_Impl::PopSdt() to actually map the collected dropdown properties to properties on the to-be-inserted content control Change-Id: I7e88ec8cd1d73bc1c6c75154d6ab07352cbcec8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134143 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-11CppunitTest_sw_ooxmlexport12: avoid mustTestImportOf()Miklos Vajna
Can use CPPUNIT_TEST_FIXTURE() instead. See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: I1f0fdb4947c0a9763d145d4926b37c7576a25cad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134134 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-10sw XHTML export: output table / table row background format using CSSMiklos Vajna
The HTML export uses HTML elements / attributes to describe the background color of tables / table rows. CSS markup is used when exporting styles, not direct formatting. This behavior makes sense for the HTML mode, but XHTML wants to CSS markup whenever possible, and usage of CSS markup for the reqif mode is not even optional. Fix the problem by switching to CSS markup for table and table row backgrounds in the XHTML case -- this is OK for reqif when describing tables (the reqif spec only forbids detailed CSS markup for spans, not tables or table rows). This amends the behavior of commit 4cd3c436923bfba281b1bf16d9785208a2119cea (sw reqif-xhtml export: limit values of the style attribute, 2018-04-11), which avoided invalid table row background markup by losing it on export. Change-Id: Ia0858986c3e8a3ea41adf8a24119442fe5068ee3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134119 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-10sw content controls, drop-down: add DOCX exportMiklos Vajna
Map the list items to an XML markup like: <w:sdt> <w:sdtPr> <w:dropDownList> <w:listItem w:displayText="red" w:value="R"/> <w:listItem w:displayText="green" w:value="G"/> <w:listItem w:displayText="blue" w:value="B"/> </w:dropDownList> </w:sdtPr> ... </w:sdt> Change-Id: I483009603f1138e4bd5871bfd8c760a3de739ba1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134104 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-10ofz#47205 import never completedCaolán McNamara
keep nEndPos and nStartPos consistent if there is no following piece Change-Id: Iaa0840eb9a60c429d60ff449aed0a2f981306b0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134093 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-10tdf#147590 update OLE object after document refreshJuergen Funk
Regression from b099da78a6f0b3e120f706714003b05d84d11e70 we didn't update linked OLE document after document reload Change-Id: I8e52f6430f454b276cb43449c6f7a3b0e07e909f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130692 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Tested-by: Jenkins
2022-05-10sw: document SwXTextFieldMiklos Vajna
I.e. the UNO class wraps SwFormatField, and that wraps SwField. Change-Id: Ieadcf8bf1de8a034dacc567b1193ec2c5391a42a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134092 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-05-09sw content controls: only try to insert placeholders if there is no selectionMiklos Vajna
The logic is that in case there is no selection, we insert a placeholder like "type here", but if there is a selection, that can be a custom placeholder. Without this fix, we would hit an assertion failure on inserting content control when there is a selection, as the placeholder is empty and operator[](0) is not allowed for empty OUStrings. Change-Id: I8370b8d74415faf0e76dccb574aa29bea1947bb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134041 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-09sw: prefix members of RTFSurround, SwMSConvertControls, ww8::WW8Sttb and ...Miklos Vajna
... wwFontHelper See tdf#94879 for motivation. Change-Id: Ib5ee24b6ed599041b0c2724931742d86ee9b360c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134033 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-07Drop excess +1Stephan Bergmann
...as identified by Noel in the comment at <https://gerrit.libreoffice.org/c/core/+/133841/3#message-e2b2c6daa41983c25d6fc758235b993d04e1c055> "tdf#148299 Don't unmotivatedly mess with spaces in file names" Change-Id: Ie118191ceb731ceef3ca92869a4fa8c05f5835e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133981 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-07GCC 12 is still just as brokenStephan Bergmann
Change-Id: Ic2e151eb78512388150492b6dff0c39046d4d3c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133979 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-06remove unnecessary sequenceToContainerNoel Grandin
If we are not going to manipulate the resulting vector, then it is actually slower, since we have to allocate more storage for the vector Change-Id: I65677007d105f4783603df74113ebed6db0b551b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133963 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-06tdf#143720 treeview not expanding vertically to fill spaceCaolán McNamara
use a simpler box instead of a grid here and it works out ok vertically Change-Id: I14fd05b25b00f79b115c041a8e9f5c7ebcf49419 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133949 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-06tdf#148920, tdf#91035: sw: Add UItestXisco Fauli
Change-Id: Icdeb93a8c45bfccd4f749ec24d8226e9bdd8cdd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133933 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-06sw: don't copy useless char escapement to next node on splitMiklos Vajna
Unless autocorrect notices such a just-typed content, pressing enter at the end of a paragraph which ends with superscript or subscript text will carry over that formatting to the next paragraph, which is hardly wanted by any user. Technically this is not copying: paragraph split works by creating a next text node, moving all content & formatting to this next node, then move part of the content back to the previous node, which is all content in case of an enter at the end of a paragraph. Copying character formatting over to the next text node makes sense: e.g. paragraph alignment or boldness is probably something a user wants to continue using in the next text node. But superscript is typically created by autocorrect in English text for "1st" and similar input, this is usually unwanted in the next paragraph. Fix the problem by special-casing the RES_CHRATR_ESCAPEMENT case and remove the matching SvxEscapementItem from the hints of the just created next paragraph in case it's there. A possible future improvement would be to support this when there are other active (direct formatting) hints, in which case going via SwDoc::ResetAttrs() is probably a better choice, but the effects of that for undo and redlining is not clear. Change-Id: I57feb99d9a31f16c277eba44f464ab49936b65aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133936 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-06uitest: fix typoXisco Fauli
Change-Id: I1cd8d50a5d4dce0dcb436d218af5de0ed8f05f3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133935 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-06sw content controls, drop-down: select list item on clickMiklos Vajna
- remember the selected list item in SwDropDownContentControlButton::ListBoxHandler() - extend SwWrtShell::GotoContentControl() to update the document text, somewhat similar to how checkboxes are already handled - improve SwSelPaintRects::HighlightContentControl(): - re-create the vcl widget in case a different content control was selected - adjust position/size and re-show the dropdown button after selecting an item + doc text was updated Change-Id: Id3b89b6132697bfec7046caeb1f0c5fe93e99b37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133915 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-06tdf#91035 sw page-style UI: All styles shown, not hiddenJustin Luth
The first entry in the list (All styles) is what is shown by default, so that means that the 0th entry should be pre-selected, not the 1st. Change-Id: I4c204fda41a0551b9f30724df361e4f797a87325 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133911 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
2022-05-06tdf#128744 sw DOCX: unprotect change tracking with verificationLászló Németh
Unprotect change tracking only by password verification instead of 1) unprotecting without the password or 2) rejecting the correct password. I.e. now 1) clicking on Record changes icon of Track Changes toolbar or Edit->Track Changes->Record asks for a password, and 2) Unprotect Record changes on Security page of File->Properties... accepts the correct password with disabling record changes. Show also "Invalid password!" dialog disabling Record Changes by its icon or menu option, like Properties... dialog window does, if the password is invalid. Note: Still allow to unprotect OpenDocument export of a protected OOXML import document, because that doesn't contain the original password info, only a dummy RedlinePassword. (OpenDocument exports protect Track Changes with the simple RedlineProtectionKey configuration setting, so it's not possible to map the OOXML password info to OpenDocument without extending this.) Follow-up to commit d416250f4f1766e2d596ea3feef6a94b7adf29f4 "tdf#106843 DOCX: forbid disabling protected Record Changes". See also commit bfd7730f4cf002a79dc9c02c23286850fee3f12a "tdf#89383 DOCX import: fix permission for editing". Change-Id: Iafcf4a6b551a7e8485d4311aee889c2522526d71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133894 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>