path: root/sw/source
AgeCommit message (Collapse)AuthorFilesLines
7 dayseditengine-columns: add sidebar property panelMike Kaganski1-1/+18
Change-Id: I90aefc10f9ddddeb64a65799480777bc4287abae Reviewed-on: Tested-by: Jenkins Reviewed-by: Mike Kaganski <>
7 daysremove some unnecessary LanguageType copiesNoel Grandin2-52/+52
Change-Id: Iec4374627c931ccecf05a712682ed18ef90bf359 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
7 daysRemove some unused includesMiklos Vajna1-1/+1
See tdf#42949 for motivation. Change-Id: I559eb3b41a5a0fdb37db6c45d73211ca223384fe Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
8 dayssw XHTML/reqif export, OLE data for transparent images: avoid black backgroundMiklos Vajna1-1/+7
Once a semi-transparent images is exported to reqif in OLE mode, the native data is 24bit BMP. This needs some solid color as a background for the transparent pixels. The OLE presentation data had white, the OLE native data had black, so this was inconsistent. Fix the problem by going with white for the native data as well. Change-Id: I1b5e9ed37369b541425cfcd7f690e1b0bba97ddc Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
8 dayssw: prefix members of HTMLAttrContext_SaveDoc, SvxCSS1Parser, ...Miklos Vajna6-128/+128
... SwHTMLImageWatcher and SwWriteTableCell See tdf#94879 for motivation. Change-Id: Ib5810ac4de8e8f71410d6800e08755f38d80ee8e Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
8 daystdf#108518 revert OOo hack: Fix issue #i119405: Numbering text styleJustin Luth9-297/+9
...changed after importing the *.doc 2012 commit 1c22545edf9085b9f2656ca92781158b6b123db3 This hack has been made irrelevant by layout support for copying paragraph CR formatting to the numbering. It can be improved even more for DOC by supporting RES_PARATR_LIST_AUTOFMT. The OOo guys who made this knew it was a hack. They document in > Negative Impact: > Although most common user scenarios can be met by the solution, > there are still negative impacts. Because the attributes of > paragraph end mark(0x0D) will be set to the character style > binding to the given level of a number rule, > it will have the global impact. > Other paragraphs that are applied with the same number rule's > level will also be changed. > Generally, MS Word users will have their numbering/bullets > the same attributes/style when using the same level's > of number rule, correspondingly,the impacted scenarios are rarely. So, the bad thing that was happening was that any paragraph's CR formatting could change every instance of the numbering level's formatting - not just that one paragraph's number. The first instance of the defined formatting won. tdf#133410: Also, it spammed a new char style for every numbering level. This patch depends on an earlier commit. The unit test ensures that this earlier commit exists. It was the only example I found where reverting the hack failed. Change-Id: I43b88b8219c9dbc882f57d1a282749d7c0ab2a19 Reviewed-on: Tested-by: Jenkins Reviewed-by: Justin Luth <> Reviewed-by: Michael Stahl <>
9 daysAssert on valid order of which ids in ranges on SfxItemSet creationMike Kaganski12-77/+54
This allows to make sure we actually use sorted which ranges, and then it's safe to call SfxItemSet::MergeRange when needed. Also this change relaxes the previous requirement that ranges must be separated by at least one; this allows to have adjacent ranges, like in RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_GRFATR_BEGIN, RES_GRFATR_END-1, where RES_FRMATR_END is equal to RES_GRFATR_BEGIN. Allowing this makes possible to (1) self-document the ranges, so it's clear which ranges are included; and (2) be safe in case when these constants would change, so that the one merged range would not unexpectedly contain everything inserted between RES_FRMATR_END and RES_GRFATR_BEGIN. Change-Id: Iaad0f099b85059b3aa318a347aa7fbd3f6d455c7 Reviewed-on: Tested-by: Jenkins Reviewed-by: Mike Kaganski <>
9 daystdf#142741 and tdf#38187 Set valid pages for footnote links PDF export.Georgy Litvinov1-21/+17
Change-Id: I7c00e1a522a51796c9f543a74bd8abcee6792faf Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
10 daystdf#142387 DOCX track changes: export w:del in w:insLászló Németh1-1/+5
by processing stack (revision history) of redline ranges, see GetStackCount() and GetRedlineData(). Change-Id: I7a9085bc1598f0a5e3ab4de6887a12e81738d4f2 Reviewed-on: Tested-by: Jenkins Reviewed-by: László Németh <>
10 daysFix typosAndrea Gelmini1-1/+1
Change-Id: Ibd4f8ac232eddad2b8a6c970999f0adf61a07acf Reviewed-on: Reviewed-by: Adolfo Jayme Barrientos <> Tested-by: Jenkins
10 daysBackgrd -> BackgroundNoel Grandin8-43/+43
Change-Id: I55bccacfe6c6b44570a24e9f5125e40a1a83d6ea Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
11 dayssw define bibliography entry dialog: unconditionally allow the browse buttonMiklos Vajna1-37/+6
This eliminates the "Local file" type, arguing that regardless of the type of the bibliography entry, it may make sense to associate a local URL with that. Additionally, this allows using the file picker with non-HTTP URLs, like webdav. Change-Id: I315facdcf292f439765c420e5368a99267fe1a98 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
11 daystdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)1-21/+18
The mechanism around NUMRULE_STATE does only do something when the SfxItemState is actually SfxItemState::SET, so this can be reduced to use a valid Item shared_ptr when this is the case Change-Id: I973648abff3696057f2ca21608ed64570742dddb Reviewed-on: Reviewed-by: Noel Grandin <> Reviewed-by: Armin Le Grand <> Tested-by: Jenkins
11 daysSimplify Sequences initializations (sw)Julien Nabet11-78/+48
Change-Id: I02647bdb720620afe20284a069a71c19dbfcea05 Reviewed-on: Tested-by: Jenkins Reviewed-by: Julien Nabet <>
11 daysno need to make a copy hereNoel Grandin1-3/+3
Change-Id: I47d51d3d372403f30ab38697037cdb205839df44 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
11 dayssw image anchor type: consider a style-based custom valueMiklos Vajna1-1/+13
The anchor type is determined during insertion, it's stored as direct formatting after that. We used to have a user-profile default for the anchor type. This commit allows customizing the Graphics or OLE styles: if they specify a custom anchor type, then that is user instead of the user profile setting. This allows creating templates where the default depends on the used template and not on the user profile. The UI for this was added in commit 5951da5175b9d7e5b3b47bd0d90989d2ef528c79 (sw image anchor type: add style UI for this, 2021-06-10). Change-Id: Id05342a5f38dc6267cdbe68b248dc50b87854ce2 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
11 daysloplugin:unnecessaryreturn in sw/Noel Grandin11-48/+26
Change-Id: Iaca3f5385fd2c763cd1121ae50624aaa4a1f6165 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
11 daysloplugin:unnecessaryreturn SwWrtShell::Toggle*Noel Grandin2-6/+4
Change-Id: I221dca35df23205023cf675b83c94c83178217d2 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
11 daystdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)2-4/+4
FontworkBar::getState does not need to check for SfxItemState::UNKNOWN at all, actions solely depend on FontWork object being selected. This also greatly simplifies that method. Also, the optimization by passing in a variable to checkForSelectedFontWork and remember if already computed can be removed - also in other places where it had to be given, but was not re-used at all Change-Id: I35b1f36195feb1d645619665d2dd65a84b75b118 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <> Reviewed-by: Armin Le Grand <>
11 daysRemove duplicate codeStephan Bergmann1-2/+0
The two > aSet.Put( aAnch ); had been like that ever since at least 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import", but only now aa9cb8e14749e7fb7a83b55a2bb095501f731a18 "-Werror,-Wunused-but-set-variable (Clang 13 trunk)" removed the lines of code between them (and which should not have changed neither aSet nor aAnch as a side effect, which could have explained the putative duplication), making the duplication stick out. Lets assume this was an error ever since, and that just one call is enough. Change-Id: Ie1ad54fb31212849f242eea77bc9e436b6fd92f7 Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
11 dayssw: handle InvertBorderSpacing when replacing compat optionsMiklos Vajna1-1/+1
This was added in commit de0866b507e259f1726d1015293aad8fcadd763a (sw-invert-border-spacing.diff:, 2010-09-14), it's off by default and is on for Word documents. Change-Id: Idf1999dbe9e641259e09eaafbebd347199cd5db4 Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
11 daysResolves tdf#142651 Writer: Next Change stopped workingJim Raykowski1-4/+5
by normalizing copy of PaM instead of reference Change-Id: If2c8664de18eb9473151c5961ad7654932ca37e2 Reviewed-on: Tested-by: Jenkins Reviewed-by: Jim Raykowski <>
12 dayssw image anchor type: add style UI for thisMiklos Vajna1-4/+4
A frame style contains RES_ANCHOR, and SwFormatAnchor::m_eAnchorId already describes an anchor type. This is even exposed on the UNO API as the AnchorType property and its ODF import/export is also implemented. Enable UI for this, so that templates can decide the default anchor type when inserting images. Still keep the "to frame" anchor type disabled as its meaning is unclear for frame styles. Change-Id: I5d8ef63af9c8f2efa6485c4ec827ba9aef9b8956 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
12 daystdf#141994 track changes: record insertion of imagesLászló Németh2-0/+17
by adding a SwRangeRedline to the anchoring point of the image inserted with Insert->Image... or "Insert Image" of the Standard toolbar. Note: Only images anchored as characters can be recorded this way, so change the default to-character anchoring at enabled change tracking. (In other office suites, as-character insertion is the default anchoring for inserted images with disabled change tracking, too.) Follow-up to commit d6322bcedc197a654abc7d64bfea8cf570f123bf "tdf#59463 track changes: record deletion of images". Change-Id: I593abbdb6f9f2b1a5265f112103479c1833166af Reviewed-on: Tested-by: László Németh <> Reviewed-by: László Németh <>
12 days-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-19/+0
For both aRelNullPt local variables in SwFEShell::ImpEndCreate and SwFEShell::CheckUnboundObjects the (only) reads were removed with 5f7d6695ab561758acb27a93f14e08ee960324d5 "INTEGRATION: CWS swdrawpositioning". (And nIdent in SwFEShell::CheckUnboundObjects thus becomes unused, too.) Change-Id: Ifb4851b4e10b7370f2fc2f25bcdba77d532e77a5 Reviewed-on: Tested-by: Jenkins Reviewed-by: Stephan Bergmann <>
12 daysdo not draw directly in SwViewShell in LOK modeLuboš Luňák1-1/+1
Online mode draws tiles as necessary, so there's no need to care about flickering, and this drawing is in fact not needed at all for Online. Change-Id: I19d981ad6ab6890ada1f415dc251a3492fd054ec Reviewed-on: Tested-by: Jenkins Reviewed-by: Luboš Luňák <>
12 days-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-2/+0
...since the (only) read of sXmlId got removed with c50357ff625972464d1a591afe4198d3f6f42a39 "loplugin:unusedfields in sw" Change-Id: I609eae60eb0e1d440a47f97b6387c833c1404518 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
12 days-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-3/+2
Since 20e5f64215853bdd32c5f16394ba7f2f36745904 "loplugin:unused-returns in sw" removed > return bChanged || bTabChanged; from the end of SwLayAction::FormatLayoutFly, bTabChanged is effectively completely unused (and now gets warned about by Clang), and the update of bChanged is apparently no longer used, either. Change-Id: Iab180e83070c45531aecf46d85a030463cf7b22d Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
12 daysNFC compat cleanup: no need to specify default TabOverflowJustin Luth1-1/+0
This really confused me because it lead me to think that this was something done for MS compatibility. Well, that is only true in an off-handed way. LibreOffice itself was changed to work similarly to MS Word. So there is nothing special about how DOC or DOCX/RTF are handled. Since the compat settings are not saved or loaded into MS Formats (i.e. it just takes the default value), and since on an ODT save it also will just save with the proper default value, there is no need to specify "TabOverflow = true" in non-ODT import filters. Only ooxmlexport16 has a unit test that reacts if tabOverflow is false. That one is mine and it indicates that the document would be better if tabOverflow was off, so there are no examples of how tabOverflow improves a doc. Change-Id: I97c25154108bc1ca0fcd3dfcff66fea0ea2bca7e Reviewed-on: Tested-by: Jenkins Reviewed-by: Justin Luth <>
12 daystdf#142721 restore SwShellTableCursor if the orig selection was a single cellCaolán McNamara1-6/+10
where the previous attempt of commit 4d52d2bc81f9d27472fe368785912a530489d046 tdf#142165 restore a SwShellTableCursor if the orig selection described that so that we are operating on the same selection that existed when the dialog was originally launched wasn't sufficient to restore a single cell selection. we continue to need to avoid the assert of commit 6db71f70a3b200d4074f6cda8ce445e9861d3296 tdf#140977 drop possible table-cursor before setting the new one and support the multi-selection of commit e08b446e46f56e15af58fdd4396afba1a316f9e5 tdf#140257 duplicate entire PaM ring when making copy and support not scrolling to a different location on changing a table page break style of commit 9c61732677d038e32b73fc9fb883aced14c0febf tdf#135916 just set the target table as selection and keep making it possible to remove a page break on a table of commit 81f91196b98af38e29af451b86c26a893a109abc tdf#135636 the selection at dialog-launch time is lost by dialog-apply time all of which is necessitated by commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98 lokdialog: Convert the Table -> Properties... to async exec. Though; since 4d52d2bc81f9d27472fe368785912a530489d046 where we started using rSh.GetTableCrs if IsTableMode() then in practice 6db71f70a3b200d4074f6cda8ce445e9861d3296 probably cannot arise. The scenario of rSh.IsTableMode() changing between launch of the dialog and applying the result of the dialog is presumably maybe theoretically possible in e.g. an online scenario, but not in the normal user case, but handled here anyway. Change-Id: I12f0b6bc7e0e2f5bad45a88007bf6fe2cd3d3b0b Reviewed-on: Tested-by: Jenkins Reviewed-by: Caolán McNamara <>
13 dayssw keep aspect ratio: add style UI for this settingMiklos Vajna3-3/+30
It's a per-document setting, but it was only possible to set/get this for a direct formatting dialog. Allow it for styles as well. Change-Id: Iafe1cab37be1eb741b895fe3c6613c21bc63f0d5 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
13 daystdf#137469 Implement and test excluding hidden text in text filterOleg Shchelykalnov1-1/+2
Uses filter options to manage whether hidden text output to file. Fixes filter options usage in test. Change-Id: I12a234438730795df6dd11bd6707dfa1fbfa4740 Reviewed-on: Tested-by: Jenkins Reviewed-by: Michael Stahl <>
13 dayssw: allow the width of a line portion to be larger than 65536 twipsMiklos Vajna7-14/+14
The line portion width can be quite large if the line contains an as-char image. Found by asking -fsanitize=implicit-unsigned-integer-truncation -fsanitize=implicit-signed-integer-truncation to flag the problematic conversions. Change-Id: I303b9c71dcd979d79b9c9aee5283b268cc4e3b8c Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
13 days-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-8/+0
...since the (only) read of sText got removed with 4e6be990eaf6a524740299e8d00fb5401c1a21c0 "weld SwTOXEntryTabPage" Change-Id: I24bceb37c106cc840cef60d6a08953ca25cc3d15 Reviewed-on: Tested-by: Jenkins Reviewed-by: Stephan Bergmann <>
13 days-Werror,-Wunused-but-set-variable (Clang 13 trunk)Stephan Bergmann1-10/+0
The only read of nChgFormatLevel (spelled "nChgFmtLevel" back then) back at 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import" was in a > #ifndef NUM_RELSPACE block that was removed with f917bb6900bad2c9382374a2cbc5678b278dde2e "INTEGRATION: CWS swnumtree". It apparently was dead code, as sw/inc/ had included > CDEFS+=-DNUM_RELSPACE ever since at least 7b0b5cdfeed656b279bc32cd929630d5fc25878b "initial import" (which was later removed with 58003f28fc09cb2021e145afa0d0d692a7a402a7 "INTEGRATION: CWS writercorehandoff" when all its remaining uses were also removed in that CWS writercorehandoff). Change-Id: I5972e2c949d21970e7f3f98a0a61600265ccb66b Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
13 daystdf#104995: Fix opposite cropping issue on flipped images in WriterBayram Çiçek1-4/+25
In Writer, cropping an flipped image crops the opposite side of the image instead of the selected side. Fix: update crop values after the flipping(mirroring). Change-Id: I55cfed086bbf63b0c516e1cb6b2624c02b04a6da Reviewed-on: Tested-by: Jenkins Reviewed-by: Muhammet Kara <>
14 daystdf#142404 DOCX c15: add compat flag TabOverSpacingJustin Luth6-8/+54
DOCX in 2013 (compatibilityMode 15) no longer supports TabOverMargin (i.e. the text margin), but it does a similar kind of thing if the tab goes into the spacing-after of a paragraph. So add a compat flag to handle this in-between kind of situation. I grepped -i "tab_*over_*margin" to see if I was missing anything. Decimal/Center proved to be only tabOverMargin. IsInSect shouldn't matter since it fits inside the printing range. The other places where I didn't insert TabOverSpacing didn't seem relevant based on a code read. Tab-after-tab still doesn't work great, but what we have is already a massive house of cards that will just collapse if changed. No real provision for handling tabs-over-paragraph-end. -auto-tabs are created instead of "beyond nMyRight" tab, unless it is the first tab defined. -doesn't allow auto-tabs to fill the remaining space. But on the other hand, MS Word's implementation of tabs follows some kind of incomprehensible bizarre logic, so just ignore the tabs completely, please. Change-Id: I3723107b29ec3e287ea8661544711c13eee3ca48 Reviewed-on: Tested-by: Jenkins Reviewed-by: Justin Luth <> Reviewed-by: Miklos Vajna <>
14 dayseditengine-columns: ODF support [API CHANGE]Mike Kaganski5-329/+104
This uses existing ODF markup, as used by Writer's text frame: style::columns child element of style:graphic-properties, its fo:column-count and fo:column-gap attributes. No ODF extension is required. Since currently only columns with same width and spacing are implemented, without additional settings, style:column child elements are exported, but ignored on import. This adds new property to css::drawing::TextProperties service: TextColumns (of type css::text::XTextColumns). Change-Id: I7e63293e5814b281ceec8a9632e696322d3629e8 Reviewed-on: Tested-by: Jenkins Reviewed-by: Mike Kaganski <>
14 daystdf#142128 sw: set author-color strikethrough for AS_CHAR imagesLászló Németh5-6/+16
(anchored as character) during change tracking instead of using always the same NON_PRINTING_CHARACTER_COLOR blue one. Follow-up to commit 76dc21860ce185bd5495adde8858d2f23284c78e "tdf#142128 sw: set author-color strikethrough for deleted images". Change-Id: I3fa02f6ec6cd1f71ae3b3c06644dd24f6c684f6f Reviewed-on: Tested-by: László Németh <> Reviewed-by: László Németh <>
14 daystdf#142128 sw: set author-color strikethrough for deleted imagesLászló Németh4-7/+14
anchored to character during change tracking instead of using always the same NON_PRINTING_CHARACTER_COLOR blue one. Follow-up to commit 1610eeef6f2312616fe5d3535475f27f7896bef8 "tdf#142196 sw: crossing out images anchored to character". Change-Id: I267a492dc6bb75327fb96ccdb51b784d00ba7a41 Reviewed-on: Tested-by: László Németh <> Reviewed-by: László Németh <>
14 daystdf#141805 sw: hide rtl gutter UI for ODF documentsMiklos Vajna1-3/+32
ODF doesn't track RTLness of the gutter explicitly, it infers this setting from the writing direction. This means that in case the UI is used to set it explicitly to a custom value, it'll be lost after export + import. Fix the problem by hiding the widget in the ODF case, so it doesn't confuse users; it's still visible for Word formats which store this explicitly. Change-Id: I1316dcf461429af72498957c9b3eebcbdac794bb Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
2021-06-07sw keep aspect ratio: add filter for this settingMiklos Vajna1-0/+18
SwViewOption::IsKeepRatio() was only in-memory, so ticking that checkbox and restarting soffice disabled it again. Handle this similar to e.g. the zoom factor which is mapped to a view-specific settings.xml key. Change-Id: I8d2de7d2c7ae0dbf34230e2011f6b07f63e02fbb Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
2021-06-07sw: WriteLong/Short -> SvStream::Write[U]Int[16|32]Vasily Melenchuk1-15/+17
Change-Id: I1c09a3bbf301166ccab16ecf0b57f22a335e0791 Reviewed-on: Reviewed-by: Vasily Melenchuk <> Reviewed-by: Thorsten Behrens <> Tested-by: Jenkins
2021-06-07sw: prefix members of CSS1Selector, HTMLStartEndPos, SvxCSS1MapEntry and ...Miklos Vajna7-58/+57
... SwHTMLPosFlyFrame See tdf#94879 for motivation. Change-Id: I4d1a427653aea5c6414f79c8eaea71336150bab7 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
2021-06-07Resolves tdf#142513 fix zoom caller handlingJim Raykowski3-11/+11
Calling ZoomPlus has always executed shell SID_ZOOM_OUT case handling. ZoomMinus, which replaced ZoomIn, does SID_ZOOM_IN case handling. This patch changes ZoomPlus to do SID_ZOOM_IN case handling and ZoomMinus to do SID_ZOOM_OUT case handling and makes appropriate changes required by these name changes to provide expected zoom results in all module shells that have handling for these calls. Change-Id: If148f4f7866bfc8fc6452ad1c1dace723a125ef6 Reviewed-on: Tested-by: Jenkins Reviewed-by: Jim Raykowski <>
2021-06-06tdf#142669 Consider BOM on text encoding detectiontobias2-2/+11
Return a flag if the auto detected text has a BOM. Save the flag in SwAsciiOptions so that BOM gets set correctly when file is written. Change-Id: I358c3ba243bc326a552c2dc24773c94f8319c700 Reviewed-on: Tested-by: Jenkins Reviewed-by: Noel Grandin <>
2021-06-04tdf#120574 Store Ascii Options for Later Savingtobias4-1/+47
store auto detected/configured ascii options in medium. use stored ascii settings for saving and text encoding settings dialog. Change-Id: I88e2d54923bfcf5d7c460ef3b89c36fc002c5097 Reviewed-on: Tested-by: Jenkins Reviewed-by: Mike Kaganski <>
2021-06-04lok: Re-Enable AnchorToPara context menu itemmerttumer1-2/+1
Change-Id: I0f1f4121c06b8f628f4fe49284737cea3d28e4b8 Signed-off-by: merttumer <> Reviewed-on: Tested-by: Jenkins CollaboraOffice <> Reviewed-on: Tested-by: Jenkins
2021-06-04sw HTML export: allow custom DPI for the bitmaps of shapesMiklos Vajna5-5/+63
But leave the CSS pixel size of them unchanged in the HTML markup. Also add some documentation on the various options, so one doesn't have to dig them out from testcases. Change-Id: I6c6ee4e9c98d674f44e7c5835f2e6a6737e13f34 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins
2021-06-04sw HTML export: fix pixel size of shapesMiklos Vajna1-3/+19
- the twips logic size was set, but it was consumed as mm100 logic size, so the pixel size was about half of the correct one - the HTML export didn't write a logic size ("CSS pixels size") for shapes Change-Id: I37f6b4acde9d1298fae81f9975e9db95485631ee Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Jenkins