summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-11-06init fieldmark mode from options, TODO fails sw_layoutwriterprivate/mst/sw_fieldmarkhideMichael Stahl1-1/+3
Change-Id: Ied4302a60c0d7e0937b647e4e3a6a5f78ee31dc2
2020-11-06WIP draftMichael Stahl1-4/+8
Change-Id: I1e059c41ad0c82fa3d7c17ab324b87fc3b840861
2020-11-06move cursor outside of hidden fieldmark when togglingMichael Stahl1-4/+46
Change-Id: If76331fa5a65376fd210171b967736f4d356462e
2020-11-06SwViewShell::ImplApplyViewOptions()Michael Stahl1-1/+8
Change-Id: Ie7b41048fe6c222272b345995fcdca4129be8ef0
2020-11-06sw_fieldmarkhide: Copy: bookmarks before MakeFramesMichael Stahl1-26/+33
DocumentContentOperationsManager::CopyWithFlyInFly() needs to copy bookmarks before creating new layout frames. Change-Id: Ib085cd230008149a55f1527b0bbd7bb7323340a0
2020-11-06SwCursor::LeftRight()Michael Stahl1-0/+28
Change-Id: Iff6680249dfe66d6d5b1a39c4543b51a5238b075
2020-11-06clean up CheckParaRedlineMergeMichael Stahl1-96/+21
Change-Id: I1d557a6bd72df576038c178ac470995ad702b6f1
2020-11-06CheckParaRedlineMergeMichael Stahl1-2/+210
Change-Id: I4c6eac864da4b4bf531437e555a3994fd2670367
2020-11-06sw_fieldmarkhide: replace IsHideRedlines() with HasMergedParas()Michael Stahl24-59/+59
... where obvious. Change-Id: Id941d59feea5a3539da9006725ef376b14bc7d1c
2020-11-06sw_fieldmarkhide: add FieldmarkMode to SwRootFrameMichael Stahl3-16/+43
Change-Id: I366fe171fbcadad7643c54d76c3e28cc4b6b5dfa
2020-11-06sw_fieldmarkhide: SwRedlineItr assumption that Show means no MergedParaMichael Stahl1-14/+32
... in SwRedlineItr::CheckLine() and also SwRedlineItr::Seek() Change-Id: I711ec37bd345cbf5f5f5339b8d792bcb56c425c7
2020-11-06writerfilter: remove leftover commentMichael Stahl1-1/+0
Change-Id: Idb6dbb7ccb9a254def6029bb9ba84a3b02015d70
2020-11-06sw: return SwXFieldmark in SwXFieldEnumerationMichael Stahl11-22/+265
* Implement text::XTextField in SwXFieldmark * That requires overriding XTextContent, just forward to SwXBookmark * Also override XServiceInfo implementation in SwXFieldmark * Add a PropertySetInfo for SwXFieldmark, which doesn't support "Hidden" or "Condition" properties of SwXBookmark * in SwXFieldmark::setFieldType(), only allow sensible new types * fix DomainMapper_Impl assumptions that if it implements XTextField it can't be a fieldmark, which caused CppunitTest_sw_ooxmlexport10 testTdf92157 to fail with a SAXException caused by some disposed SwXTextCursor Change-Id: I1ae2e9cb99ea784040874517e4d1af7e59d24405
2020-11-06tdf#135202: Mysql use openssl libs to be able to use caching_sha2_pwJulien Nabet3-5/+18
Change-Id: I7552b65022b725c6e87fef61478dc6e9c4322559
2020-11-02make SvXMLImport capable of mixing fast- and slow- contexts adhocNoel144-1137/+478
so I can convert even *ImportContext subclasses in the middle of a context stack, and thus break the cyclic dependency nature of the writer import. and adjust the xmlimport loplugin for the new rules. As a consequence of the loplugin:xmlimport's checking, we remove a bunch of now unnecessary overrides of startFastElement. Change-Id: I97464522ede8ec5e345e928cdafa4b18364b1b80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104730 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-02use officecfg or MacroRecorderModeNoel Grandin4-45/+10
Change-Id: I2a8d4f401ddfd4368a7b50b4c3c8a72724f9afa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105154 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-02Sidebar Area alignment updateandreas kainz1-5/+7
Change-Id: Ie8155e73adc2c52e8f3ec3455a5cdb4ed596c352 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105160 Tested-by: Jenkins Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2020-11-01fix build with ICU 68Rene Engelhard1-1/+8
use standard true. /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); | ^~~~ /usr/include/unicode/umachine.h says: @deprecated ICU 68 Use standard "true" instead. Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105151 Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2020-11-01Colibre: Update navigation, mail merge, gallery component, info iconsRizal Muttaqin85-42/+43
Change-Id: If785dc620122ce2acd1b33ffe84d2e6b6294e2b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105149 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-11-01Colibre: Update image/picture/graphic iconsRizal Muttaqin104-56/+48
Delete redundant/unecessary icons Change-Id: Ibd2d54585f328f199050f962ef6919e471fd5269 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105135 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-11-01move UpdateAttr sanity check to DBG_UTILBjoern Michaelsen1-0/+4
Change-Id: I9a6fd1ef8ea704a0ea3f8182d06cbbe938fd1937 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105137 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01use officecfg for ShowLinkWarningDialogNoel Grandin6-76/+21
Change-Id: I92a42eb2ff48bff4e635f1a37a25c8ecb9ac1347 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105153 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01Make SwClient::ModifyNotification non-virtualBjoern Michaelsen4-12/+15
Change-Id: Ic34b0b7a3ad906da5f25103f32a28e2a3efd82fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105150 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01Resolves: tdf#135108 Allow link updates if loaded document so far had noneEike Rathke3-1/+16
It is the current user who'll add external references, not the creator of the loaded document. Change-Id: I59a6d0b8600a9b299aa54a1efeedfccc16ad69d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105152 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2020-11-01tdf#137620 support surrounding text for impress outline viewCaolán McNamara2-24/+29
Change-Id: I7136ec4237fe41bd7e795594d66413fc7d8c311c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105146 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-01dynamic_cast followed by static_castCaolán McNamara2-14/+6
Change-Id: I29daabb250d72403ccf751aeeb5fd2fa755e895c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105145 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-01cid#1468697 Uncaught exceptionCaolán McNamara1-1/+1
Change-Id: Ibc589c87356781b143088d4231a8c0a2a2671961 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105143 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-01use officecfg for IsPluginsEnabledNoel Grandin3-50/+10
Change-Id: Id80ba8a87af7f87b8232949b70804b1a021b23d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105147 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01sw/source/core/txtnode: ModifyNotification no more ...Bjoern Michaelsen5-25/+23
Change-Id: I380b6c173d35865188c6d65f356a6e5d1165bd1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105138 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01sw/source/core/crsr: Stop abusing observer pattern for code obfuscation.Bjoern Michaelsen2-11/+11
Change-Id: I2423b70b2d6a9e90388bb7c83d886181cb268c0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105136 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01Transport Pixmap from GetNativeSurfaceHandle via css::uno::Any as sal_Int64Stephan Bergmann5-6/+6
The values returned from GetNativeSurfaceHandle are only used in cairocanvas::CanvasBitmap::getFastPropertyValue (canvas/source/cairo/cairo_canvasbitmap.cxx), whose consumers in turn are (at least the ones I could identify): * OGLTransitionerImpl::setSlides (slideshow/source/engine/opengl/TransitionerImpl.cxx), passing the values on to X11SalObject::SetLeaveEnterBackgrounds, which extracts the Pixmap value to pass it on to XSetWindowBackgroundPixmap. * X11SalBitmap::Create (vcl/unx/generic/gdi/salbmp.cxx), which extracts the Pixmap value to pass it on to X11SalBitmap::ImplCreateFromDrawable (as a Drawable) and to XFreePixmap. While Pixmap XIDs are apparently 32-bit in the X11 protocol, see e.g. <https://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html>, Xlib and the underlying /usr/include/X11/Xdefs.h appear to be somewhat confused whether the typedef for XID should be unsigned long (presumably stemming from times when long was universally 32-bit) or CARD32, see e.g. <https://gitlab.freedesktop.org /xorg/proto/xorgproto/-/blob/master/include/X11/Xdefs.h>. So conservatively stick to a 64-bit type here, even if it should only ever contain 32-bit values. Change-Id: I26c3a2ff74cef092042a6e3648cd9a6f4a9e3aac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105144 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-01use officecfg for UseSystemFileDialogNoel Grandin6-83/+30
Change-Id: I1419af229a67d6ebb1cf2c63757656beb3f512db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105142 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01std::set->o3tl::sorted_vector in SwpHintsNoel Grandin1-3/+3
Change-Id: I6affafb9733495c07c322abc9ac7456862df1332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105134 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01use officecfg for UseSystemPrintDialogNoel Grandin3-58/+10
Change-Id: I0e0bdc925f106884cbcede6405cc6ef7152ad405 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105139 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01std::set->o3tl::sorted_vector in writerfilterNoel Grandin1-2/+2
Change-Id: I8b4527c8e40687918b3d5193f6c14ee86addab53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105132 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01std::set->o3tl::sorted_vector in ExportFramesNoel Grandin1-8/+6
Change-Id: Ic82a1aad7df2b0088a78c8d82ceb487d8b9e0571 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105133 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01use officecfg for Experimental flagNoel Grandin42-139/+143
move IsShowOutlineContentVisibilityButton out of header to avoid having to add extra include paths to all the unit test makefiles. Change-Id: I2763390e07cd85b8f09b6f2ad7702039daecb22f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105100 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-01Resolves tdf#137880 - Fix for Windows installer imageHeiko Tietze1-0/+0
Change-Id: I0d57fb54343059bc30d032ae7d4bdbbd3c4c5c70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105131 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-11-01tdf#136814 Fix border padding in Word exportSven Lüppken6-3/+25
While converting twips to points in the Word export filer, information is lost due to integer division. This patch tries to fix this by using floating-point division and (hopefully) proper rounding. The example document attached to the bug ticket works as expected now. Change-Id: I4b5b2163e42932b5e877726d16635d9f02a43cb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105128 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-11-01Use save_CFLAGS etc in a uniform wayTor Lillqvist1-13/+9
Restore the old CFLAGS (etc) as soon as possible. Always use the same variable names for the saved values. Change-Id: I523bbf66ec5400d24993b7e11e444bb63d61751e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105130 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-01Don't try to include hicolor SVG mimetypes icons in rpmChris Mayo1-1/+0
The icons in scalable/mimetypes were multi-image developer files removed from installation in: f9ddaae9caa5 ("tdf#132737: Don't install SVG source icons or locolor theme", 2020-10-14) Change-Id: I6c7eda89a145365ffb598a066b7e817f27f4ea9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105081 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-11-01Colibre: Update Thesaurus iconsRizal Muttaqin6-3/+3
Change-Id: I8ef183715fa328788ecb2aceef9e9f274b098b25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105129 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-11-01Find ODBC headers when building for Windows on WSL, tooTor Lillqvist1-1/+1
Change-Id: I3a05def839c14d59545c4891418577ed36f2b8cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105099 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-01sw/source/core/doc: Stop abusing observer pattern for code obfuscation.Bjoern Michaelsen15-50/+71
The old SwClient/SwModify combo is a questionable implementation of the observer pattern (among other things). The one thing the observer pattern is good for is dependency inversion: The creator of the message does not need to know the type of the receiver. Calling the message handling on the receiver directly introduces tight coupling and entirely defeats the purpose, leaving us with the worst of both worlds. In such case, at least be honest about the tight coupling and call a somewhat more explicit member function of the target. Thus introduce SwFootNoteInfo::UpdateFormatOrAttr, SwContentNode::UpdateAttr, remove some useless SwFormatChg clutter in Set{Foot,End}NodeInfo, and check for some invariants in SwContentNode::SwClientNotify to limit some of the "a message are two void pointers" madness. Change-Id: I32a8d6973231bb5f65c9e144be72d5bcf98f3f44 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105104 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01SwFormat: remove last ModifyNotificationBjoern Michaelsen1-1/+1
Change-Id: Iaa2b7710c7848855541bd3ea5fd83122077253bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105105 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-11-01Fix typoAndrea Gelmini1-4/+4
Change-Id: If2f4e9af927be2f335bdbbf0d81f8a89cc8b9019 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105127 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-11-01Update git submodulesSeth Chaiklin1-0/+0
* Update helpcontent2 from branch 'master' to 79d9996623c1896170aec53c788f9623df7731e0 - Mostly resolved: tdf#135668 - Help for Navigator context menus in Content View 1. Placed under "Content View" control, because seems most closely linked to that. 2. Separate rows for general categories (e.g., "Headings", "Tables") and specific items in the categories (because (a) there are context menus for both and (b) they are different). 3. Provide links to items already explained in the Navigator page (e.g., Outline Level). 4. Collected Frames, Images, OLE Objects, Bookmarks together, because they have identical context menus, but the ones that follow are different. 5. Collected "References" and "Indexes" together, because they have identical context menus. 6 Provide links to other pages when relevant (e.g., Send Outline to Clipboard). 7. Make new page for Outline Content Visibility (separate patch), with link from Context Menu. 8. "Outline Tracking" (new feature in 7.0) - add a heading and explanation at end of help page (Thanks to Jim Raykowski for advice and accuracy control). Design decisions: 1. Do not explain "Go to", "Select", "Edit", "Delete", "Rename" (because it is contextual; should be easy to understand their meaning in context) 2. Do not explain "Collapse/Expand All" (should be understandable from use/context) Result: Handles all context menus for Categories in Navigator. Added: "Related Topics" Section, with links to: Arranging Chapters in Navigator Navigator for Document Overview Inserting Hyperlinks with Navigator Showing, Docking and Hiding Windows Changed: <note> about context menus to <paragraph> and moved from top of page down to heading on Content View. Moved: <note> about hidden items to end of "Content View" section. Revised: <paragraph> about searching with Navigate by, which replaced a tearaway Navigation toolbar. Change-Id: I965753234b9faec32fdf6d75766023b2f4b36643 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104596 Tested-by: Jenkins Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
2020-10-31Update git submodulesSeth Chaiklin1-0/+0
* Update helpcontent2 from branch 'master' to a83bcba219360d50b1b38de99be6ae08a49ce500 - tdf#137724 repair access command to Basic Macro editing in Calc * change two menu command sequences + add step about selecting where Module is stored. - remove a word from a menu sequence + <menuitem> Change-Id: I694e544de5977a1ca74b5a3ae572a944f148b830 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104951 Tested-by: Jenkins Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
2020-10-31Enquote sheet name if necessary, tdf#137896 follow-upEike Rathke1-1/+6
Change-Id: I9ebdc30bf0b8b1531d57da299146fda9871442ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105126 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2020-10-31tdf#121553: Firebird, fix datatypes managementJulien Nabet3-37/+11
In Firebird, BLOB and CLOB are both "BLOB" types but can be distinguished with SUB_TYPE - BINARY for BLOB - TEXT for CLOB ("C" = "Character" -> Text) To deal with this, the enum "BlobSubtype" has been created in connectivity/source/drivers/firebird/Util.hxx it contains: - Blob = 0 - Clob = 1 but also - Image = -9546 This last one is to deal with LONGVARBINARY which doesn't exist in Firebird It has been added with: see https://cgit.freedesktop.org/libreoffice/core/commit/?id=0217031a98508731f15df9d361a6e5b584db5716) When creating a table, Tables::createStandardColumnPart was adding SUB_TYPE part in request part but only when creating table not when altering table. So let's deal with subtypes in the 2 mappings: - ODatabaseMetaData::getTypeInfo from DatabaseMetaData.cxx - ColumnTypeInfo::getColumnTypeName from Utils.cxx and let's remove the SUB_TYPE wrong management part from Tables::createStandardColumnPart Also, BINARY and VARBINARY were wrongly mapped since they should be respectively: - CHAR CHARACTER SET OCTETS - VARCHAR CHARACTER SET OCTETS It also showed that DataType::VARBINARY was missing in ColumnTypeInfo::getColumnTypeName() change from my previous commit see: https://cgit.freedesktop.org/libreoffice/core/commit/?id=5b33b1a6b0f251202e89cef436efd4719c3fc0c4 Change-Id: I5589fd4f781671076f534865cfe9d30943738fd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105107 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins