summaryrefslogtreecommitdiff
path: root/sw/inc
AgeCommit message (Collapse)Author
2017-07-23more related strings togetherCaolán McNamara
Change-Id: I0055000d1c92096c320ad52d553a7bdc19fcc025
2017-07-23sw: dummy handler for paragraph signingAshod Nakashian
Change-Id: If6e9f75dcf8c8628295fe013328b3b1630d064a2 Reviewed-on: https://gerrit.libreoffice.org/40319 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2017-07-21Eliminate DateTime::operator+=() and -=() with POD typesEike Rathke
And make some tools::Time conversion ctors explicit to catch more oddities like automatic conversion from sal_Int64 that might be unintentional. Change-Id: If275297d86d6657544c056a712b862523e310e44 Reviewed-on: https://gerrit.libreoffice.org/40275 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-07-21tdf#108867 sw: fix dangling text box frame format pointers in UndoMichael Stahl
If the text box is removed, the SwFrameFormat of the drawing shape still retains a pointer to the frame SwFrameFormat, and the latter is owned by the SwUndoFlyBase. This is pretty bad, so try to clear & reset the connection between them in SwUndoFlyBase::InsFly() and DelFly(). Hopefully nothing will actually delete the drawing shape SwFrameFormat while the Undo object is alive. Note that when the SwUndoInsLayFormat is created when the text box is added, the GetOtherTextBoxFormat() returns null as it's set later, that's why the constructor can't do anything. Change-Id: Iae562b6f8f272e47b2b5cf8ee80778db15d29ce0
2017-07-21can use the "real" type for RES_SRCTYPES nowCaolán McNamara
Change-Id: Ied1f7a8c4135d3fd6a4581ea5e92f89b2e6b3067
2017-07-21de-hrc various thingsCaolán McNamara
e.g. helpid[s].hrc -> helpids.h and insert include guards where missing move "ordinary" defines into .hxx files remove .hrc entries that are used as arguments to dialog factory when a dedicated method can be added instead Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
2017-07-21migrate to boost::gettextCaolán McNamara
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-07-20Added Test to check TableAutoFormat Style after Save/LoadVarun Dhall
Change-Id: I466d5c5536d4c4310356f38569f7a91e0f36ba1d Reviewed-on: https://gerrit.libreoffice.org/40104 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-07-20tdf#109123 Change SwDocIdle base class to IdleJan-Marek Glogowski
This hides SwDocIdle from SalInstance::AnyInput( VCL_INPUT_ANY ) on Windows. Otherwise Writer assumes there is more stuff to do, as it can't know the scheduled Windows event is just for itself, resulting in a busy loop, which freezes Writer. Change-Id: I919c40e8e1673eb09a69a3084203d1c4a6ecac8a Reviewed-on: https://gerrit.libreoffice.org/40189 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2017-07-19tdf#107975: Revert "fix deleting an image anchored to last paragraphMichael Stahl
... in document" This reverts commit 2903d85d6197829633d7f96c95cd55821c2c20ff. It was a good idea, but is not complete. Change-Id: Ia0da2640889ce6e78b89b27c75fae9d6508afd40
2017-07-18sw mail merge: add support for the new 'writer' connectivity driverMiklos Vajna
By mapping the .odt, .sxw, .doc and .docx extensions to sdbc:writer:. If we are at it, also accept xlsx next to xls. Change-Id: I8c6769b282adec1e7e8d191170e7aa9b324f2018 Reviewed-on: https://gerrit.libreoffice.org/40147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-17Fix typosAndrea Gelmini
Change-Id: I9d2c641b485c32ddccf0bfaaed1d0796572d1d33 Reviewed-on: https://gerrit.libreoffice.org/39477 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2017-07-17sw: prefix members of SwFormatAnchorMiklos Vajna
Members had "", "m" and "m_" as prefixes, standardize on the later. Change-Id: I468b3444e4918809bc9a07884c662af042abbd9e Reviewed-on: https://gerrit.libreoffice.org/40034 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-07-15emfplus: create a wmf/emf/emf+ primitive based importerArmin Le Grand
First steps to organize an importer that can read/interpret wmf/emf/emf+ and deliver a primitive representation for the content by parsing it. Use the same mechanisms as already applied for Svg, so to reuse abilities to keep original binary data to allow save again and embedding in files and have an implemented replacement bitmap based representation. For this, unify the used helper classes to handle more than just Svg. For 1st try, add test code and static bool switches Change-Id: I6e0a82943541d811a8f8d65a84115569fcd8cee7
2017-07-14loplugin:staticmethodsJan-Marek Glogowski
Change-Id: I40d08932115e07470de73b0f0dc9b9b03e608fbe
2017-07-14sw: make SwGrfNode::mpReplacementGraphic swappableMichael Stahl
Same as previous commit, but for sw. Change-Id: Id678de3f512204437e37aaedf24e24aff7a9e592
2017-07-13Don't update document stats for non-idle viewsJan-Marek Glogowski
This functionality should be merged into the DocumentTimerManager, which itself should run the different document idle tasks via seperate jobs instead of a single idle, if they don't depend on each other. To implement a non-busy, suspendable Idle, this adds an AutoIdle class, which is automatically re-scheduled after being processed. It also adds a SwDocIdle, which isn't ready to schedule for busy documents. Change-Id: I185137ed3423ecaae0f7edb39018d26c4244d359
2017-07-13improve useuniqueptr loplugin to find arraysNoel Grandin
Change-Id: I81e9d0cd4f430b11d20037054055683240792240 Reviewed-on: https://gerrit.libreoffice.org/39825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-10UI Wrap InBackground: transition to wrapthru transparency toggleJustin Luth
The UI for placing a frame in the background is confusing because: -in menus, the icon looks like a checkbox, but functions as a radio button -it isn't obvious that "in background" is the opposite of "wrap through" -it doesn't act like the checkboxes below it like "First paragraph" -in dialog boxes, it is actually implemented as a checkbox toggle. So it looks like a checkbox, and you can enable the checkbox, but once enabled it can never be disabled. (The currently designed way is to select wrap off/page/optimal/through in order to disable in background.) This patch creates FN_FRAME_WRAPTHRU_TOGGLE to replace most uses of the previous function. Change-Id: Ia46ddbd47899e8ca569bf3adb2b1c4ad7cfa1920 Reviewed-on: https://gerrit.libreoffice.org/39673 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
2017-07-09Added margin feature to the Draw's SideBarpv2k
Change-Id: I53b5430d1563fcceae29418fd5907ac42ea856e7 Reviewed-on: https://gerrit.libreoffice.org/37626 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-07-08tdf#108545 show an icon (DOCX inside DOCX)Szymon Kłos
If DrawAspect is equal "Icon", show an icon not document preview Document is opened in the separate window, not in-place. Change-Id: I3a8d81e7340b29d247f8ac440c06b0420bb65644 Reviewed-on: https://gerrit.libreoffice.org/39440 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-07-07Revert "use std::vector in BigPtrArray"Noel Grandin
which is causing crashes in the crashtesting in ooo119635-3.docx and ooo119568-2.docx It is definitely some kind of use-after-free error, but the compress and delete logic for BigPtrArray is too hairy for me to debug right now. This reverts commit 1eee0abd459a508a6dcf9e71cbf2c1be3725faa7. Also revert commit 4f743419a04375160437a910254c45dea396f70d "gdb pretty-printers: fix BigPtrArrayPrinter after recent std::isation" Change-Id: Id870876432a060f9347aafb43bf0df692ea24464 Reviewed-on: https://gerrit.libreoffice.org/39684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-07sw: convert SwTextInputField OSL_ENSUREs to assert() and simplifyMichael Stahl
Change-Id: I86df59e4b77d2ddc479144f32342113a6e29a725
2017-07-06sw: convert SwNumberTree::IsSane to assert() and simplifyMichael Stahl
Change-Id: Ib2087a53d2a22f5fdafa5c3d0d058dd0ad8ed643
2017-07-06sw: enable some SwNumberTree sanity testing codeMichael Stahl
__SW_NUMBER_TREE_SANITY_CHECK isn't defined anywhere. Change-Id: Ieb8c47d12c47a8a1ffcad0616382e4d2b55024a0
2017-07-06sw: comment cosmeticsMichael Stahl
Change-Id: I572bf8b28738e82e2f207b5201a0c27d9d9b623d
2017-07-06silence coverity#1414485 Uninitialized pointer fieldCaolán McNamara
Change-Id: If62f528b1118aee702f364aa448e36230512fac6 Reviewed-on: https://gerrit.libreoffice.org/39572 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-07-06rework as a shared_ptrCaolán McNamara
mostly to try and track down a crash on exit of sw uwriter under windows Change-Id: Id67e93863056da319dd8225038d60a7f5783b103 Reviewed-on: https://gerrit.libreoffice.org/39604 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-07-05tdf#108873 fix merge data handling in fieldsJan-Marek Glogowski
This is a regression from tdf#70346 / commit 4851cde7b98226b0f82ae2b191c290173e9b06c6 It added the whole DB row as variables to the SwCalc hash set. This works correct for conditionals when hiding sections, but not for conditionals used in fields - actually they break. Previously the field would do a fallback to query the DB again, if no variable was in the dict and the only possible variables in the dict could have been user-defined fields. This handles the added variables correctly for fields. Also fixes a bug to store the DB number values as number variables and adds the record number, as SwCalc::VarLook does. Change-Id: Ib0dbeda68234e671768ede55b2012235a3680276 Reviewed-on: https://gerrit.libreoffice.org/39509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-07-05rename some Kontext methods to ContextNoel Grandin
Change-Id: Ida1a75672d12a053dbc4fb2739d2ba6f1417463c Reviewed-on: https://gerrit.libreoffice.org/39502 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-04support for saving a modified image instead of original versionMarco Cecchetti
Normally when you save an image through the "Save..." entry in the context menu for an image, the saved image is the original one more eventually applied filters (which are not removeable). Further applied transformations like rotations, cropping, color effects are not included in the saved image. This patch offers the user to choose if saving the original image (with filters) or the modified version through a pop-up dialog. The new feature is available in Writer, Draw and Calc. Change-Id: I4f983e3a5e8a6839fa5789a96c4d8c44477c1fd7 Reviewed-on: https://gerrit.libreoffice.org/39480 Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Marco Cecchetti <mrcekets@gmail.com>
2017-07-03loplugin:unusedfields in swNoel Grandin
Change-Id: I807f93757bfddf17f71568f1e3c174229f169f18 Reviewed-on: https://gerrit.libreoffice.org/39409 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-02dbg_out(SwRewriter) is unusedStephan Bergmann
Change-Id: I2ebdba0a162bd02d0b36f6577af09b6f95b356d2
2017-06-28tdf#108826 sw: also handle RES_REMOVE_UNO_OBJECT in SwCallMouseEventMichael Stahl
This is sent from SwUndoFlyBase::DelFly(); the SwFrameFormat isn't deleted in this case but it's no longer part of the document, so an UI class like SwCallMouseEvent should stop pointing to it. Change-Id: I05349271d14bb1948ea30528cd85c68ed638f28e
2017-06-28-Werror=ignored-qualifiers (GCC 8)Stephan Bergmann
Change-Id: Icc576de378c27764aa50457f8d548564eb4a3aec
2017-06-28use std::vector in BigPtrArrayNoel Grandin
Change-Id: Ibf63213eb44ef2bb51042607cbdedcb66181b51a Reviewed-on: https://gerrit.libreoffice.org/39302 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27use std::array in BlockInfoNoel Grandin
Change-Id: I28a13592e5993454ae96b0a32ba328013da7856e Reviewed-on: https://gerrit.libreoffice.org/39296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-27inline ElementPtrNoel Grandin
Change-Id: I93a9527283a819a95563565a252a5088253c91c0 Reviewed-on: https://gerrit.libreoffice.org/39293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-21loplugin:unusedfields in sw part5Noel Grandin
Change-Id: I4111ed1dcb04e010ecfb93df3a7e7bf715abf585 Reviewed-on: https://gerrit.libreoffice.org/39044 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-21loplugin:unusedfields in sw part1Noel Grandin
Change-Id: Iabbf7f09c0d92b488d7e03f4436f077c5e6e87aa Reviewed-on: https://gerrit.libreoffice.org/39039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-21convert ErrCode to strong typedefNoel Grandin
would have preferred to re-use o3tl::strong_int, of which this is a modified copy, but there are lots of convenience accessors which are nice to define on the class. Change-Id: I301b807aaf02fbced3bf75de1e1692cde6c0340a Reviewed-on: https://gerrit.libreoffice.org/38497 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-18Typo: existance->existanceJulien Nabet
Change-Id: If6927f3b9e983d41ec957997a26d235b8be378a5 Reviewed-on: https://gerrit.libreoffice.org/38934 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-06-18remove unused osl/mutex.hxx includesJochen Nitschke
Change-Id: I3b50e45fdb99e9cd8bfda07356ee3ddb4dd0f8bb Reviewed-on: https://gerrit.libreoffice.org/38905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
2017-06-17TransferableObjectDescriptor::mnOle2Misc field is unusedNoel Grandin
which means that SfxObjectShell::GetMiscStatus becomes unused Change-Id: I5c89a2cd5c77c7f08a57fdac08237aab514fc7fa Reviewed-on: https://gerrit.libreoffice.org/38843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-14Let CreateItemSet return unique_ptrStephan Bergmann
...and address resulting loplugin:useuniqueptr Change-Id: Ia79eb8d59ce5092b2d93b656eab687096baedf17
2017-06-12cleanup unused css/frame/* includesJochen Nitschke
Change-Id: I173a29fd1ee889127369d2bc2fce8e010b89ca65 Reviewed-on: https://gerrit.libreoffice.org/38633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-06-12sw: prefix members of SwNotePropsMiklos Vajna
Change-Id: If1d50504d9d7efcb0f6b1b5ddf570d3016f40be5 Reviewed-on: https://gerrit.libreoffice.org/38686 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-06-12tdf#108427 Direct cursor: Add option to insert only spacesSamuel Mehrbrodt
Change-Id: I1136688ec8af44c533f4dd40a9a4b24ea59992ef Reviewed-on: https://gerrit.libreoffice.org/38685 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-06-10various extensions to REDLINE_ sequence not reflected in related resourcesCaolán McNamara
i.e. commit e52f14efaa53b496599b51fb064a933183731fca Author: Adam Co <rattles2013@gmail.com> Date: Sun Dec 8 17:14:14 2013 +0200 Export redline 'paragraph formatting changes' back to DOCX const RedlineType_t REDLINE_FMTCOLL = 0x4;// Style has been altered (Autoformat!). + const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes have been changed commit d688069023959ab97d14eb1dbfd5bf6ad3c1b160 Author: Adam Co <rattles2013@gmail.com> Date: Mon Feb 3 17:44:22 2014 +0200 Add support for 'Table Row Redlines' in SW core const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes have been changed. + const RedlineType_t REDLINE_TABLE_ROW_INSERT = 0x6;// Table row has been inserted. + const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been deleted. commit 06a887ca92f35b4e44dfc638a9a444fc636bc9d0 Author: Adam Co <rattles2013@gmail.com> Date: Wed Feb 5 13:37:45 2014 +0200 Add support for 'Table Cell Redlines' in SW core const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been deleted. + const RedlineType_t REDLINE_TABLE_CELL_INSERT = 0x8;// Table cell has been inserted. + const RedlineType_t REDLINE_TABLE_CELL_DELETE = 0x9;// Table cell has been deleted. all extend the REDLINE_* ranges, and SwRedlineData::GetDescr just adds GetType() of a value in that range to the STR_UNDO_REDLINE_INSERT baseline which just maps the new values to arbitrary unrelated strings Change-Id: I44d5050ef012ac44346a7164b89a2773fb33d4dc Reviewed-on: https://gerrit.libreoffice.org/38642 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-10there are *two* STR_REDLINE_INSERT sequencesCaolán McNamara
rename one of them to disambiguate Change-Id: I83eb6960bdb21c8ab04e62afd1427c8cc5731336 Reviewed-on: https://gerrit.libreoffice.org/38638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>