summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2020-11-19loplugin:stringview: Flag empty string converted to string viewStephan Bergmann
Change-Id: Idf412dc5f235230512160cb4fb7e1a00baa1cfa7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106085 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-19sw replacement image creation: fix this when an ODT's settings.xml is invalidMiklos Vajna
This builds on top of commit c123bfff501229f398a1b679fc7434b82d53685c (Bin overly eager early return that stops replacement image creation, 2020-08-20), and handles a similar case, when SwView::ReadUserDataSequence() is not called at all. The result is the same: no shell is selected on the command dispatcher stack, so .uno:UpdateAll is ignored and the replacement images are not created. Change-Id: If8b74424b0ad88e63129fd8f7efd09f85e300895 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106068 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-11-19tdf#123936 Formatting files in module sw with clang-formatPhilipp Hofer
Change-Id: I6243bc95129bf81a124d006ce0fc1aa1b5f618bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105718 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2020-11-18crashtesting: export ooo88744-1.odt to .doc and loadCaolán McNamara
intermittently on ctrl+end the layout crashes Change-Id: I4b9b5ab8d1514a3847b4993afd6f4de414544d05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106059 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-18Fix typoAndrea Gelmini
Change-Id: I0331154fa1a56d13cb6200856814393d4d444e5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106035 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-11-18sw_redlinehide: use correct node in SwPaM::InvalidatePaM()Michael Stahl
(oopsie from 93b1adf7442839dcfbf16660b1fbe1139f14a4d0) Change-Id: Id48ee8686aa9a6268838fe572ccc321482314442 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106046 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-18This doesn't depend on SAL_TYPES_SIZEOFLONG anymoreMike Kaganski
Change-Id: I0848a30073613df32da9321def0662272f03f61b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105996 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-11-18Remove unused GraphicObject::SetGraphic pCopyObj and rLink parametersStephan Bergmann
The defaulted pCopyObj parameter of the first SetGraphic overload became unused with ea3d755ac949c1b6dada5c341e018f8c23f5d395 "vcl: detach usage and remove GraphicManager and GraphicCache", and then the rLink parameter of the second overload became unused with e4eb416c3ef81d098ed61caabd2077cbbb2418bc "remove swapping and link from GraphicObject and Graphic" (removing the need to have two different overloads). Change-Id: I15a648845ed474ee302e2a9836776ba74b9c44a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106045 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-18loplugin:stringviewparam: No good reason to exclude operator functionsStephan Bergmann
(at least not in general) Change-Id: I71337b53dc9735e90a37ee532d0a8a08797b518c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106043 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-18Remove unused SdrGrafObj::SetGraphicLink rReferer, rFilterName parametersStephan Bergmann
unused since 9fb7aaf570c03c8a26d763f1205fb8c890e8211a "Make linked graphic register into LinkedManager again", and remove further function parameters and class members that turn out to be unused now, too Change-Id: I3dd2b138fd8787d12b89547526da751ea5954845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106041 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-18tdf#130629: sw: Add UItestXisco Fauli
Change-Id: Ifd9baa0d39b5e767158b1f45be40500f66b97887 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105956 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-18tdf120290 sw: move cursor behind comment at line endJustin Luth
If the comment was the last item on the line, clicking the mouse button in the whitespace on the right did not place the cursor on the right side, but on the left side. For comments in the middle of a line, this change will mean that it will move behind the comment 1 unit earlier (1 TWIP I assume), but I would hope that wouldn't matter. This only works for the first comment for now. A followup commit will do this for multiple simultaneous comments, along with another edge case consisting a very thin portion. Change-Id: I49b15252441bc9e661644778dd417ef91f2447db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105746 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-17sw_redlinehide: replace bogus implementation of SwPaM::InvalidatePaM()Michael Stahl
Sending SwInsText will mess up merged paragraphs. Instead, send SwUpdateAttr with which-id 0, which results in InvalidateRange_() being called with at least 1 character. This appears to be called only by fieldmark UI, and now asserts in UITest_writer_tests5 DateFormFieldPropertiesDialog.dateFormFieldDialog.test_date_field_with_custom_format Change-Id: I948ddefa3acece8809e4bf3d2beee6cec3ed56f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106022 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: Copy: bookmarks before MakeFramesMichael Stahl
DocumentContentOperationsManager::CopyWithFlyInFly() needs to copy bookmarks before creating new layout frames. Change-Id: Ib085cd230008149a55f1527b0bbd7bb7323340a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105986 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: adapt cursor movement in SwCursor::LeftRight()Michael Stahl
Jump over the hidden part when moving in from either side. Change-Id: Iff6680249dfe66d6d5b1a39c4543b51a5238b075 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105985 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: let CheckParaRedlineMerge() hide fieldmarksMichael Stahl
HideIterator finds the next delete redline or fieldmark, whichever is closer. Change-Id: I4c6eac864da4b4bf531437e555a3994fd2670367 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105984 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: replace IsHideRedlines() with HasMergedParas()Michael Stahl
... in wsfrm.cxx Change-Id: Iaa552f2527d47f475165a3f9da073052fc76ac51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105983 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: replace IsHideRedlines() with HasMergedParas()Michael Stahl
... where obvious. Change-Id: Id941d59feea5a3539da9006725ef376b14bc7d1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105982 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: SwRedlineItr assumption that Show means no MergedParaMichael Stahl
... in SwRedlineItr::CheckLine() and also SwRedlineItr::Seek() Change-Id: I711ec37bd345cbf5f5f5339b8d792bcb56c425c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105980 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17sw_fieldmarkhide: add FieldmarkMode to SwRootFrameMichael Stahl
Change-Id: I366fe171fbcadad7643c54d76c3e28cc4b6b5dfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105981 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-17tdf#130629 Don't add object insert undo twiceJim Raykowski
Change-Id: I074afd4397b6fc4631bd00655de56b8a154d7dff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105955 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2020-11-17tdf#138232: sw: Add UItestXisco Fauli
Change-Id: Ic0e3d6e055fc2ff30042424f461acbd33ecc70ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106010 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-17tdf#137802 tdf#84691 sw: sync anchoring of textbox with UNOAttila Bakos (NISZ)
It was possible to anchor the textbox both to page and paragraph, resulting crash during file saving. Change-Id: I0c95a13c0d8d58cd7cc1fa86de1b80bf088ba782 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105046 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-11-17uitest: move findBar tests to their own folderXisco Fauli
Change-Id: I083b5c63a1c96e36d958e3071d9a7b2be14373bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105973 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-17tdf#138018 don't show leader lines inside pie chartTünde Tóth
Show leader lines to data labels in custom position only outside of pie chart, as intended. Change-Id: I87dee2d33f4f876ffca208f69a069e1f0bcee688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105920 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-11-17loplugin:stringviewparam check methods tooNoel
not just functions Change-Id: Icca295dd159002b428b73f2c95d40725434f04d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105789 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-17tdf#88608: sw: Add UItestXisco Fauli
Change-Id: I5c0f06a402b32e1f879a0c01ec9d206788781667 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105954 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-17tdf#137980 sw textbox: fix automatic size of shapes with rotated textMiklos Vajna
If a shape+fly pair has automatic size for the fly frame, then only the sw layout knows the necessary size, this is then sent to the shape and SdrObjCustomShape::AdjustTextFrameWidthAndHeight() is meant to respect those "suggestion", instead of sizing the shape based on the contained editeng text, which is always empty for shape+fly pairs. Improve this mechanism so it works better when the writing direction of the fly frame is tbrl ("rotate to the right"): make sure we always grow to the left and to the bottom, so the shape and the fly geometry matches. Also improve the testTextBoxSizeAtBottomOfPage "change detector" test which had a hardcoded height, but which did not clearly derive from any in-bugdoc value. Rather just test that the shape wider than taller, which was probably the intention. Change-Id: Ic6a77a1125bbf31b198aaf9048dc4812c87b4d9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105960 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-17SwGrfNode: Remove graphic arrived hackBjoern Michaelsen
Change-Id: Ib8fb5b223a1b3cc05a75ecfcc7c763bbb3928fae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105965 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-17SwGrfNode: Replace needless SwClientNotifyCalls with CallSwClientNotifyBjoern Michaelsen
Change-Id: Ib11b55cc800299947c1172ca47f84d3bc8833dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105961 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-17tdf#137777 Writer: fix keyboard navigation of NavigatorJim Raykowski
This patch: -Splits the first row of the Navigator panel into four toolbar controls to make keyboard navigation possible. -Makes an Escape key press, when focus is in the sidebar Navigator 'Navigate By' control, result in keyboard focus on the content panel title, which in the Navigator deck/panel case is the deck title bar. -Fixes spacing issues of first row controls. -Fixes 'Navigate By' listbox/combobox keyboard use. -Keeps focus on previous/next scroll button when enter key is used to activate the button. Gtk3 has problems with focusing to title bar and wrapping keyboard focus. This has been left to be fixed by a separate patch. Change-Id: Ic9d3a35f2b8c31a209947a1fe61094ddafee4f42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105574 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2020-11-16tdf#136941: sw: Add UItestXisco Fauli
Change-Id: If0d76d6821e2b69da64674b114ffe5a6af40f84f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105952 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-16Replace needless SwClientNotifyCalls with CallSwClientNotifyBjoern Michaelsen
Change-Id: I967d458be7cd7c68ff410357da0cb0163dcb454e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105908 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-16tdf#137771 sw ChangesInMargin: fix end of paragraphLászló Németh
Deletions at the end of the paragraph weren't shown on margin, including the vertical "Changed line" mark. Change-Id: I2b79d1619cca891feab2f99eedad79ba330e75b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105931 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-11-16tdf#134298 sw: layout: remove left-over page frame without contentMichael Stahl
Once tdf#138039 is fixed, this bugdoc has an additional empty page 3. This is because it first goes to 3 pages, and then the SwTextFrame on page does a MoveBwd, leaving behind a page frame with just a body frame and nothing else. It turns out that SwRootFrame::RemoveSuperfluous() only removes empty frames at the end of the document, but here there's a non-empty frame following it. Also, this function doesn't handle cases like right/left page styles so it can't delete pages in the middle. SwFrame::CheckPageDescs() doesn't remove page frames that don't have content, it only removes those that have the intentionally-empty flag set. Extend CheckPageDescs() to also remove page frames that don't have content, and make sure it is called when SwContentFrame::Cut() removes the last content from a page frame (it will be called after all pages are valid in SwLayAction::InternalAction()). (Alternatively it might be possible to prevent the problem from occurring in SwTextFly::ForEach() by ignoring the fly so that the first paragraph never leaves page 1, but we didn't explore that.) Change-Id: I3a3f1efe6d7ed28e05dc159a86abc3d702cc272b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105810 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-16(related tdf#134298) sw: layout: avoid infinite loop in InternalAction()Michael Stahl
The condition IsInterrupt() && pPage && (m_nCheckPageNum != USHRT_MAX) isn't handled properly and the while loop will never terminate with the fix for tdf#134298 in several UITest_writer_tests*. If m_nCheckPageNum is set, then it must result in a call to CheckPageDescs() here; it's a member of SwLayAction so won't survive until the next idle layout invocation. There is a funny history of these loop conditions with commit 9eff9e699e17cc5a8a25895bd28dc8e4ceb8071e and cee296066ab780217395201ab84c2150c8840d25 so we can only hope this time we got it right... Change-Id: I91b63540bf4280296d747cb8e841594f8dd3b140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105927 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-16tdf#138039 tdf#134298 sw: layout: fix overlap of fly and tableMichael Stahl
The layout is horribly borked, the fly anchored in the body-level paragraph messed with the preceding table: page id="1" top="284" width="11905" height="16837" bottom="17120" tab id="3" top="794" row id="4" top="17121" fly id="8" top="16725" txt id="7" top="1394" fly ptr="0x6ce5510" id="10" top="1302" SwTabFrame::CalcFlyOffsets() detects an overlap with the large fly, and since it has wrap NONE it resizes to below the large image. Then the SwTabFrame doesn't fit on the page, so it is split, but the split fails because nDistanceToUpperPrtBottom is -720 (negative); hence it is joined again. Meanwhile the fly was invalidated, so now CalcFlyOffsets() ignores it and the table shrinks again. Once the fly is positioned again, the process repeats from the start. Fix this in SwTabFrame::CalcFlyOffsets() by ignoring flys with wrap NONE that extend below the body of the document and are anchored in a frame in the next-chain of the table frame: these must move to the next page with their anchor frame. For the bugdoc this gives the same layout as LO 5.2. Reportedly this problem started to happen since commit 6f5024de2e1a5cc533527e45b33d9a415467c48d, but it's not obvious why. Change-Id: Iafb8a6afcba634f11c5db73869313ded0fe13bbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105809 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-16replace std::min(std::max()) with std::clampNoel
Change-Id: I76e34e8020d98292e8ffde387542b7029f85a42d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105754 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-16sw: fix misleading comments - SwFlyFrame::m_bAtCnt is set...Michael Stahl
... for both AT_PARA and AT_CHAR. Change-Id: I13a9c9cc6f4c45b08bf178336826a37126055b3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105808 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-16sw: prefix members of SwEndnoter, SwLayCacheImpl, SwLayCacheIoImpl and ...Miklos Vajna
... SwLooping See tdf#94879 for motivation. Change-Id: I4cf118cd7e68069ef3a73077b5340f7b93d87319 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105911 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-11-16Replace needless SwClientNotifyCall with CallSwClientNotifyBjoern Michaelsen
Change-Id: If1286c3271038be3ad69739b54d5ed5ce1167818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105894 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-16replace std::max(std::min()) with std::clampNoel
Change-Id: I890d19f5e2177294dc1175c90c98b964347f9e85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105751 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-15add <!-- n-columns=1 n-rows=1 --> before every GtkGridCaolán McNamara
for a in `git ls-files '*.ui'`; do sed -i 's/^\( *\)\(<object class="GtkGrid".*\)/\1<!-- n-columns=1 n-rows=1 -->\n\1\2/' $a; done so we get the same behavior in glade as before 3.38 in that the grid preview don't show any unoccupied grid squares replace all existing n-columns=X n-rows=Y lines because they are all wrong, except for cui/uiconfig/ui/additionsfragment.ui sw/uiconfig/swriter/ui/pageheaderpanel.ui sw/uiconfig/swriter/ui/pagefooterpanel.ui which are correct. Change-Id: I401bbe8e098c26e7f57d6a872d3b70fc1ce85a00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105846 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-15uitest: Rename the "SET" to "TYPE" for Edit boxes + implement the real "SET".Jan Holesovsky
To be consistent with the other controls: "TYPE" actually enters the characters one by one, while "SET" sets it as a whole. Change-Id: I967dc270b1d92fe76107732a511cc3e70d3d65c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104435 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105739 Tested-by: Jenkins
2020-11-15tdf#135198: fix unittestXisco Fauli
The problem was reintroduced in f2eef84ff03660cbb46a76c317e640e054ed0a56 and the previous unittest didn't fail. Change-Id: I7e25afd265d8f19fdced17efe5815fb93321a9ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105805 Tested-by: Jenkins Reviewed-by: Dániel Arató <arato.daniel@nisz.hu> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-14tdf#136868, tdf#136912, Styles Inspector: Translatable categoriesAron Budea
...and "Direct Formatting" renamed to "Character Direct Formatting" Change-Id: I9fe711bfebfaa90a9797b6e1a47e41a5f307170b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105843 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-11-14tdf#138135: sw ChangesInMargin: join characters at backspaceLászló Németh
Words deleted by pressing multiple backspaces weren't shown on margin, only their first letter. Change-Id: I2f5d0bb057250d3bfd788e1007f1ad24f8c3c2fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105807 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-11-14Fix unit tests involving tools::LongMike Kaganski
Change-Id: Id32e6cfee81b2b59dc38bc1abcbeeb42cc376bfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105840 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-11-14Revert "tdf#137881 sw: fix text box size regression"Xisco Fauli
This reverts commit f2eef84ff03660cbb46a76c317e640e054ed0a56. Reason for revert: https://bugs.documentfoundation.org/show_bug.cgi?id=135198#c9 This also reverts part of 768cfcee178b284be6d96d384364e59e40ecb375 without breaking tdf#137960 nor tdf#137964 Change-Id: Ifa418e66b8a45c6204babfae6513ca67aed93289 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105545 Reviewed-by: Dániel Arató <arato.daniel@nisz.hu> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-14DOCX export: handle conditional fieldsMiklos Vajna
At least the subset where the condition syntax matches between Writer and Word. Change-Id: I107f2b4caeda6f7777696af8d5c5b455854cfa92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105798 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>