summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2015-02-16add GetSelectEntryData to ListBox and ComboBoxNoel Grandin
to reduce code clutter like pLbSelect->GetEntryData(pLbSelect->GetSelectEntryPos()) since this is a fairly frequent operation. Change-Id: I41daf30fdeda2442ad1ac829e12f553233bae184 Reviewed-on: https://gerrit.libreoffice.org/14472 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-02-15RTF filter: handle mirrored marginsMiklos Vajna
Change-Id: I122f5f23e510ae42664d2b69504f4722aa05597e
2015-02-15Extract SwTxtFmtColls::dumpAsXml() from docnodeMiklos Vajna
Change-Id: Ie5d2865aeca0292044eaed72b8ea6c5e5316a3cb
2015-02-14tdf#87574 - Outline numbering "None" is not retained in docxMark Hung
Partially revert commit d30a8ec448bcd08c6a52a37d6ae41a4b71c235da (Correct number format mapping for CJK numbered lists in rtf/doc/docx filters., 2014-11-04). Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/14211 Change-Id: I0876ecd982cfd8d97887495b23af0e0370821101
2015-02-14related tdf#89004 move to std:set instead of std::vectorUrsache Vladimir
Conflicts: sc/source/core/data/document10.cxx sw/source/core/doc/docfmt.cxx Change-Id: I1312f476607ea3a78b162a7e59323b0a142f6629
2015-02-14related tdf#89004 improve performance of document data collectionUrsache Vladimir
Change-Id: Ieca50aa0920753cd952123e27d5355d32e82c918
2015-02-14Related: tdf#63690 - remove rtl_logfileThorsten Behrens
This was unused since the earlier cleanup. Change-Id: Ia56641c4242037a0ce501e43939b8dc862499f0e
2015-02-13tdf#49893 partial fix for blank rentangle problem in RTFVasily Melenchuk
* pib structure in rtf shape is processed always, if exists, not only for shape #75 (picture frame): it is possible for other shapes, at least for #1 (rectangle) * picture inside shape gets width and height from shape: this picture looks like pib object and should fit shape frame Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Reviewed on: https://gerrit.libreoffice.org/14396 Change-Id: I5cf2e692940c4ddd8ab8b291ef65c0cc44c45f5d
2015-02-13loplugin:unreffunStephan Bergmann
Change-Id: Id56bc94e95e59f9bfe1dca02ff1f5e16844de45a
2015-02-13cp#1000115 forgot to add bugdocMiklos Vajna
Change-Id: Ia9ac12c0d03d960aced5d7066306a6f68c95996b
2015-02-13cp#1000115 SwTxtFrm: don't join follow just because it has no contentMiklos Vajna
The problem was that the bugdoc had a table, and inside the table there was a long paragraph that flows to the next page, but only the paragraph mark of it does so. We first split the frame to have space for the paragraph mark, but later decided that all the content would fit the first frame, and this way the last hard line break and the paragraph mark was painted on each other. This is normally not a problem without tables, because SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to join it, and we're ready. However, when the paragraph is inside a table, then the paragraph was formatted multiple times, and next time when we already had a follow nNew was not set, so even if there was a correct split first, the new frame was joined later. Fix the problem by explicitly setting nNew for the "in a table and paragraph ends with a hard line break" case, that way we don't blindly join the frame, only in case there is enough space for the follow in the master. Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a
2015-02-13Work around -fsanitize=vptrStephan Bergmann
Change-Id: Id6e418fb6ae69c6e71e5e52e6e08c1411ea08b65
2015-02-13disable control shape grouping test for nowDavid Tardon
Change-Id: I29ca828a2049a72e2238986892c172e7c135b44b
2015-02-13Resolves: tdf#79569 crash undoing tricky cell mergeCaolán McNamara
Change-Id: I68d774d0d3758cdb67864d7939a7e1167dd9a7df
2015-02-13tdf#83955 enable insert comment and rearrange buttonsYousuf Philips
Change-Id: I57da2e38a555c75f674885d736a82adbc8f81224 Reviewed-on: https://gerrit.libreoffice.org/14450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-13Resolves: tdf#76636 crash on merging certain cells imported from a .docCaolán McNamara
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11
2015-02-13Extract SwTxtFmtColl::dumpAsXml() from docnodeMiklos Vajna
Change-Id: I3ffe83afa0e0e6f181f75319af3d5cbcc78de395
2015-02-13correct assertion messageLionel Elie Mamane
Change-Id: I934ef3cbe67bba7d7439e464f71b9fd4a1da4e50
2015-02-13add unittest for grouped control shapesLionel Elie Mamane
they should keep their control models Change-Id: Iaa27cd8a9bc3a1165db665e0ad172da622e00c6b
2015-02-12Resolves: tdf#89227 if no SwView then disable accept/reject change buttonsCaolán McNamara
e.g. if the context is an embedded draw ole then we don't have a SwView Change-Id: I6ba07f0ecf1c419e45f7e0ac628a82e6bd486668
2015-02-12tdf#89266 SwDrawShell::GetState: fix crash on adding textbox to fontworkMiklos Vajna
Till we find a use case where it makes sense to support this, just hide the menu item to avoid the crash. Change-Id: Ic1df38edc38495d7899038ec2b8ad753da87d352
2015-02-12Extract SwFrmFmt::dumpAsXml() from docnodeMiklos Vajna
... and move it where ~all the rest of SwFrmFmt methods are implemented. Change-Id: I69dd4456046f8d42b745e47e6fd42b2d45b81819
2015-02-11Resolves: tdf#89179 fix Undo of Numbering Level change crashCaolán McNamara
regression from long paras presumably Change-Id: Ib89169e52e42fcbe6f8e1ab0a2eb9871d38ff06d
2015-02-11Resolves: tdf#70062 avoid crash on ungrouping "ac char" groupCaolán McNamara
If you can't group a char-anchored thing with something else, then you can't ungroup a selection that contains a char-anchored group. You can group together non-char anchored things, then change the anchor type to get a char-anchored group to get into this situation. Change-Id: Id627bd11e2c749ad08fb902bf88f937ff5f06a12
2015-02-11OSL_ENSURE->assert when followed by unconditional dereferenceCaolán McNamara
Change-Id: Id3072473c1a4f52f606dbcfc87aa4a69ab2c012d
2015-02-11Related: tdf#70062 keep drawing anchor objects sortedCaolán McNamara
take attachment from tdf#70062, ungroup the bottom pair, anchor as char the left one, anchor as char the right one asserts with debugging stl on unsorted container Change-Id: I3ae763f6d61445f9118ee573a98c69d7a6ee6e4b
2015-02-11sw: identation fixes in swparrtfMiklos Vajna
Change-Id: I225464e2b517cd10fd055eaf1e5d23d660419628
2015-02-10OSL_ENSURE -> assert when followed by unconditional dereferenceCaolán McNamara
Change-Id: Ic118450e11ca6a4f705670dd71015ff74072fa05
2015-02-10Resolves: tdf#87083 images in help html stuck at default placeholder sizeCaolán McNamara
regression from the SwapIn work. The graphic size during SetGrfFlySize appears to assume its the pre-swapped in size, i.e. the old 0 by 0 "size is not set" for an html image used to be the value used here. So get that value (and update it if necessary) before updating the image data and pass that to SetGrfFlySize Without the swap-in in the html filter the data gets swapped in during the initial draw of the image which is too late to update the image size, so restore the equivalent of that swap-in via GetTwipSize commit 61a5abd5fab308c9e6580e752fa846f5bf0d7e51 Author: Zolnai Tamás <tamas.zolnai@collabora.com> Date: Fri Nov 7 10:43:34 2014 +0100 Make SwGrfNode swapping methods private Change the filter test accordingly. Change-Id: Ide3043f2f245c097a7b4c07ba2e0713510296b3e Change-Id: I0afe244f79d8628236b1e552036587a2b4540a76
2015-02-10coverity#1267646 coverity#1267641: sw: logically dead codeMichael Stahl
... in SwPageFrm::_UpdateAttr() It looks like SwFmtChg always is sent in pairs and shouldn't contain null pointers. Change-Id: Ib14650d5ac7ed579af915806e738aec8a92add32
2015-02-10coverity#1267654: sw: logically dead code in SwCrsrShell::GoNextCell()Michael Stahl
IsTableMode() should imply cursor is in table. Change-Id: Ibb94911430f947038abba2ebe013fc82fae7dd54
2015-02-10coverity#1267666: logically dead code in SwUndo::CanRepeat()Michael Stahl
Change-Id: I38ff790419562cf0e4f2b584696867eaf4614166
2015-02-10coverity#1267639: logically dead code in SwUndo::UndoWithContext()Michael Stahl
Change-Id: I5e41337705bb2952a98e7e5778a217cfb2caccdb
2015-02-10coverity#1267638: logically dead code in SwUndo::RedoWithContext()Michael Stahl
Change-Id: Iab669a18ed990a23c77b5bb3d6b0a935a8af2c5d
2015-02-10coverity#1267637: logically dead code in SwUndo::Repeat()Michael Stahl
Change-Id: I85b0d880b0579f33a6e874ca250d343f7761dbcc
2015-02-10Resolves: tdf#83073 use loaded graphic's width/height as defaultsCaolán McNamara
Change-Id: Idad25f82d884c40c55b886fd7634a6c6e51693c4
2015-02-10Extract SwNodes::dumpAsXml() from nodedumpMiklos Vajna
Change-Id: Ic94fceef0d4291a02bc3da7bcbeeb2c19670200c
2015-02-09sw: avoid temporary object creation to build GraphicPrimitive2DPierre-Eric Pelloux-Prayer
As drawinglayer::primitive2d::GraphicPrimitive2D constructor expects a GraphicObject ref, we can simply pass in rGrfObj instead of building a (implicit) temp GraphicObjet using the GetGraphic() result. Change-Id: I8c54f20804390c773fdf9406f534787ce7143e84 Reviewed-on: https://gerrit.libreoffice.org/14390 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Also fix other Ring ctorStephan Bergmann
...after 8b12e63b60530a2ad3769bc4983cc09bedd34c79 "Don't downcast from Ring<T> base class ctor/dtor to derived class T" Change-Id: I734841a78e272e985d784bd756412e1af90b2df5
2015-02-09sw: another LONG_MAX fed into LogicToPixelMichael Stahl
Can be reproduced by dragging the zoom slider. Change-Id: I4d32543370eccbda23d0a1ea449ee124148143d6
2015-02-09Resolves: fdo#88933 Labeling of images impossible without categoryCaolán McNamara
Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f
2015-02-09LOK: add LOK_CALLBACK_TEXT_SELECTION and implement it in swMiklos Vajna
Change-Id: I31662cb06add0d1a1c517b5f5416703aeaae1e77
2015-02-09lok::Document::postMouseEvent(): allow double-clickMiklos Vajna
Change-Id: Idaddd28d906e7508d4d2c5aab916b06fbe021beb
2015-02-09Don't hide cursor for Android anymore - makes cursor events workTomaž Vajngerl
Change-Id: I97caadf079c9a5e38c00c80fdc8185aee997f632
2015-02-09Combine DBG_UTIL and header version of Stt{End}CrsrMoveTomaž Vajngerl
Having 2 versions (debug and release) of one method (on top of that in different places - one implemented in header) which are mostly the same is a recipe for disaster. Change-Id: Ia38f900ac076d1c1765fea2c7326147b115e343d
2015-02-09SwView: SelectShell() is needed on Android, tooMiklos Vajna
Otherwise GetShellAndSlot_Impl() in SfxDispatchController_Impl::dispatch() will fail, as there is no SwTextShell on SfxDispatcher's shell stack, and that means nobody will invoke SwBaseShell::ExecDelete() when an SwBackspace command is to be handled. Change-Id: I62e3aff265784e8c73659d3e3c5f646d927338b0
2015-02-09SwDLL: RegisterInterfaces() is needed on Android, tooMiklos Vajna
Otherwise SfxSlotPool::GetUnoSlot() will have no interfaces and we ask what should be the UNO command for a backspace key in Writer, we won't find the needed SwBackspace command, so no action will be posted to the main loop. Change-Id: I62062fbc0e86db83e2b0ddac184bfd6d35d073b2
2015-02-09SwVisCrsr::Show: ignore VisArea() in case of tiled renderingMiklos Vajna
Which means that then we get the cursor update instantly and can again ignore all events generated by the client's paintTile() call. Change-Id: Ie22e20737c30bdd65d25bc6a84f59df4159b7dec
2015-02-09Add LOK_CALLBACK_INVALIDATE_VISIBLE_CURSORMiklos Vajna
So that clients can draw a blinking cursor at the cursor position if they want so. Change-Id: I662b8d28d7054f89c381c14333a51e1dc222f93d
2015-02-08sw: make sure that these headers are self-containedMiklos Vajna
Change-Id: Ifdfe85abe57b5873ab4641d3a592c4cf8d2e4e01