summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2015-05-19check for and handle missing base in mail merge (related: fdo#33266)Bjoern Michaelsen
Change-Id: I3e362a873c28026cbecf005c07def1295aa920e0
2015-05-19tdf#91261: DOCX import: snapGrid property of paragraphs are ignoredMark Hung
Fix the situation for OOXML import filter: a) While handling DocGrid type, SnapToChars was treated as None. Now it is implemented as described in the article: http://linpeifeng.blogspot.tw/2007/02/text-grid-enhancement.html Both LinesAndChars and SnapToChars will be translated to Writer grid type "lines and characters", and set SnapToGrid property to false or true accordingly. b) All the imported paragraphs snap to grid because SnapToGrid was appended to grabbag, now it allows SnapToGrid property in paragraph and paragraph styles to be imported properly. Change-Id: I446b4c64c0ed86960896bcd61a1006c9173a757a Reviewed-on: https://gerrit.libreoffice.org/15732 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-05-19LOKit callback for search not foundMihai Varga
Needed for signaling the user when no match was found for the searched input Change-Id: I171ee956d94d6fd83036ae34102c2f1bdd5661de Reviewed-on: https://gerrit.libreoffice.org/15798 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-05-19sw: prefix members of SwLayouterMiklos Vajna
2 members were prefixed, 2 not, it was confusing. Change-Id: I41940e5172ff1fcec8f90afc1b5389072d0869f4
2015-05-19Remove include stdio (part3)Julien Nabet
Change-Id: I0b44a33dc38b76130a7b230962de7ce86bd4574b Reviewed-on: https://gerrit.libreoffice.org/15793 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2015-05-18tdf#89794: sw: implement SwXFlatParagraph::getPropertySetInfo()Michael Stahl
(regression from d477ff4a81ecba8a77ead5ff1a33d3e3ceed622e) Change-Id: Ic49d2c14a27d2fb188a1ba5f9a7d8c0180b8de13
2015-05-18don't assert on export of ooo74510-1.odt to .docxCaolán McNamara
the math object is broken in the original .odt so we can't export its contents as it doesn't have any Change-Id: I8226cafed65b9e16a4aca6f48a4f711a55532975
2015-05-18don't fail on export of ooo96040-2.odt to docxCaolán McNamara
If we want to close a cell of a table which encloses another table, then close that enclosed table first. These are pretty pathalogical old-school tables. For now assume this can only occur when the row of the enclosed table is cleanly closed and assert if that isn't the case. Change-Id: I28e4d40072cb8d92be361716e82574075b15dd89
2015-05-18check for TableBox without StartNodeCaolán McNamara
Change-Id: I77b21c85716083029ab8873094621e0f8eceb48f
2015-05-18callcatcher: update unused codeCaolán McNamara
Change-Id: I43dd399368953c629916dad8104a296f837a6344
2015-05-18SwPaM::Find: if there is an active text edit, then search thereMiklos Vajna
Change-Id: Ic5d81aa1faca8f2190f87fc51eccdd7695d2c0ef
2015-05-18Include <cstdint> early to be sure to get SIZE_MAXTor Lillqvist
See a441d5fbe59436089e5f7b882a3482212c9ee208 for discussion. Change-Id: I456cb814ff032a06b0ae5fbc5717869f9845a1c4
2015-05-18tdf#89783: Allow more than 64k PageDescsKatarina Behrens
+ adjust related code using the functionality Change-Id: I6fa4ad04137643009ee39522c36d6c9e6f3d2502
2015-05-18SAL_WARN_UNUSED LinkStephan Bergmann
Change-Id: I646677611e46a7e33e977a5afeea9bf831b28733
2015-05-18loplugin:staticmethodsStephan Bergmann
Change-Id: I8ab9bc20ae293fc066239b81e80f4b62bafe9d35
2015-05-18-Werror,-Winconsistent-missing-overrideStephan Bergmann
Change-Id: Iabf4dda9f21d3b6cbcf74c0d51235c85d8f6e91a
2015-05-18refactor SwPagePreview to use RenderContextTomaž Vajngerl
Change-Id: I7e19aca13ebde8d18ecf4783e59d71f4ecabeed4
2015-05-18refactor SwAddressPreview to use RenderContextTomaž Vajngerl
Change-Id: I82d76c28a2326a41fe78a25d3efcea0196775881
2015-05-18setup fg/bg in Paint methodTomaž Vajngerl
Change-Id: I38c6018816254a92a144160d963fc90a48be739f
2015-05-18add fixme - to refactor settings laterTomaž Vajngerl
Change-Id: I224daf671c49bf4dd6250a486049c817247a6fcc
2015-05-18set background in paint method in evelope previewTomaž Vajngerl
Change-Id: Ie0c500c38aca9e47c98e0b8e7f4414e038ec0786
2015-05-18refactor optload / optpage to use RenderContextTomaž Vajngerl
Change-Id: I6b4897230963ecde335c5a04b1e34c8ca02d654c
2015-05-18cleanup SwDropCapsPageTomaž Vajngerl
Change-Id: Ied1aef1bd0b62b5d7af34d12f3165f7474dcf8ff
2015-05-18comphelper: the makePropertyValue<> template is useful outside swMiklos Vajna
Change-Id: Id6392d105bbc01bb38f5615621f4d852a94e5df9
2015-05-18tdf#86814 RTF import: fix sometimes lost bold styleMiklos Vajna
The problem was that commit 76c0d0abc89cd8948706083c2660b71a2dad670c (RTF import: adapt getProperties() to createStyleProperties(), 2014-09-07) only made the character style sprms/attributes a flat list, but not the paragraph style ones. Fixing that inconsistency avoids the tokenizer adding unwanted default sprms, which cause the bold sprms go away in the bugdoc. Change-Id: I86bd1b26af18cd968375c9b39be9c8e71d51271f
2015-05-18refactor how font, fg. and bg. are applied in widgets/controlsTomaž Vajngerl
- Move vcl::RenderContext to outdev. - Change some methods on vcl::Window to accept RenderContext as parameter. - Add ApplySettings to vcl::Window - This method is called before painting. Refactor existing classes that use InitSettings to have ApplySettings or mark the classes to be refactored later. - Add RenderSettings for adding defered settings to rendering. This is similar to ApplySettings but for more ad-hoc calls. Change-Id: I4ea58461f3b6b08ccfa3e0ddd1a4a3e04f8c4f45
2015-05-17loplugin:staticmethodsStephan Bergmann
Change-Id: I441cafcd641477626eb8de9d4b35212fd29af248
2015-05-17cppcheck: noExplicitConstructorCaolán McNamara
Change-Id: Ie7e0a036c223f9576be3798feb0df95131c1803a
2015-05-17tdf#90883 WRITER: Insert button with multiple rows/columns selectedPhilippe Jung
Compute the number of rows/columns to insert based on selected cells. Change-Id: I489bca715dcf31d191f9a875ac5d59a6140a14d7 Reviewed-on: https://gerrit.libreoffice.org/15741 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-05-16tdf#90150 : Page numbering in the status bar which may cause confusionmassinissaHamidi
Changes : - The page number changes when a certain amount of the previous page is reached. This is done in SetFirstVisPage. - Since the page number (and pFirstVisPage) changes before the entire previous page disappear from VisArea, there is still a portion of it which is visible and must be added for paint. This is done with GetPrev. Change-Id: If7704011bc11efe88321bf448d61708097334d7d Reviewed-on: https://gerrit.libreoffice.org/15657 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-05-16tdf#90808: sw: fix detection of duplicate CrossRefBookmarksMichael Stahl
The check for existing bookmark positions is using the wrong position. It must use the Start of the pam, because the constructor of CrossRefBookmark only uses the Start of the pam. Change-Id: I343f1c0e3571847a965a27571f01136810e83485
2015-05-15tdf#91140: ODF import: try to ignore invalid draw:fill="solid"Michael Stahl
... which was apparently written by LO >= 4.1 on a frame with image background, under unknown circumstances. Change-Id: Ie86643ab67f58bfe5c19d6a1f80a7af8f793edf2
2015-05-15tdf#91064: Revert "tdf#89790 DOCX: saving LO version number in app.xml"Joren De Cuyper
This reverts commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5. Change-Id: I69a16425fc36979d49f409bbd7921495a22a35dc Reviewed-on: https://gerrit.libreoffice.org/15737 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
2015-05-15avoid crashing on load of fdo54724-1.rtfCaolán McNamara
Change-Id: I3df326eadc2f137c75e87835caf12266dbd011b5
2015-05-15SwDBManager::LoadAndRegisterDataSource: fix indentationMiklos Vajna
Change-Id: I62645c02c556cb52d53e76c93ae17b41dfd43820
2015-05-15SwEditWin::SetCursorTwipPosition: support creating a selectionMiklos Vajna
The Android LOK client always creates a text selection by double clicking on a word, and then the start/end of the selection can be adjusted using handles. In the GTK LOK client, it makes sense to allow the desktop-style selection, where you click somewhere, move the mouse and finally release the mouse to create a selection. That can be mapped to settextselect-reset on mouse-down, and settextselect-end on mouse-move easily. The only problem was that SetCursorTwipPosition() assumed that there is a selection already -- fix that by adding the missing Stt/EndSelect() calls and limiting the lifetime of the SwMvContext instance. Change-Id: Iaeeadd8e4d9030614ee069b9fcfa269ce74ed58a
2015-05-15refactor BmpWindow (frmpage) to use RenderContextTomaž Vajngerl
Change-Id: Ia2e946b272c587cbbdfdbc0935204c5854aa2a41
2015-05-15refactor NumberingPreview to use RenderContextTomaž Vajngerl
Change-Id: Iacc9b85851ed3a8ad1bada5331dc850dc564ba5b
2015-05-15cleanup GetGraphicSizeTwipTomaž Vajngerl
Change-Id: I5f3c3c7826c867eaca8af0e2aa35c9919d8b1319
2015-05-15refactor SwDropCapsPict to use RenderContextTomaž Vajngerl
Change-Id: I6a68d22f9b7ded9d58a69057bf0f4197a67fd2e8
2015-05-15refactor SwEnvPreview to use RenderContextTomaž Vajngerl
Change-Id: Iebbcd09dcca109539ef32d44816b621b90624fb8
2015-05-15refactor SwLabPreview to use RenderContextTomaž Vajngerl
Change-Id: I3cf9be2e84904f88ab820d97ee56c39e990c8737
2015-05-15refactor AutoFmtPreview to use RenderContextTomaž Vajngerl
Change-Id: I25e93ffd474d821a6b92f99327fe99e06bb89a62
2015-05-15refactor SwColumnOnlyExample to use RenderContextTomaž Vajngerl
Change-Id: I4c15bb0428005031ea3b4766eb4221ff48d91514
2015-05-15refactor swruler to use RenderContextTomaž Vajngerl
Change-Id: I16e1888900478c000c4437299357276e20c197c0
2015-05-15conver MENU_FLAG_ constants to scoped enumNoel Grandin
Change-Id: I969d99fa8881cc89601696a2d8621905a82b147b
2015-05-15convert POPUPMENU_ constants to scoped enumNoel Grandin
Change-Id: I4cdaf36581d1e1daa39929e621070d18a9996852
2015-05-15tdf#91260: add missing test documentLászló Németh
Change-Id: Id83d8a1c26afba5a19cdab555fa40b5ed73e46d1
2015-05-15tdf#91260: unit test for textbox shrinkingLászló Németh
When the textboxes extend beyond the page bottom, the fix for tdf#91260 keeps the original vertical position of the text frame by changing its height. Change-Id: I691b46640876bd082bd83da1bbd43f1e33ec807d
2015-05-14convert INPUTCONTEXT_ constants to scoped enumNoel Grandin
Change-Id: I5b99e42a3e85527b27d515c468d2ed66386fc9df