summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2013-01-09fdo#58074: store page number in SwPageNumberFieldMichael Stahl3-24/+48
Should hopefully fix the problem, which is essentially that all SwPageNumberFields share a single SwPageNumberFieldType, which is only updated properly in SwTxtFormatter::NewFldPortion, hence all expansions of a SwPageNumberField other than that return wrong values. Does not fix the problem for fields in headers though, which appears much harder... Change-Id: Iecf363c8acbc2aaa418cc0c980e0b62c8e0e7d14 (cherry picked from commit 741e8b7b9d8e1a8f758edfe1c017801aa3d51247)
2013-01-08fdo#58671: Remove accelerators from Undo action textsKorrawit Pruegsanusak1-1/+1
These three texts appear in Undo dropdown list, so they don't need accelerators (cherry picked from commit 93a9e52dccf15b53fc1935145df24306e3a4fc3e) Change-Id: Icec8e199c7cc3990b6316937e49aacb7eb1015fb Reviewed-on: https://gerrit.libreoffice.org/1596 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-01-08Make LO buildable again after the GraphicFilter move.Jan Holesovsky19-19/+23
Conflicts: svtools/Library_svt.mk q# Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c Signed-off-by: Cor Nouws <oolst@nouenoff.nl> Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org> Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com> Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-01-08n#793998 sw: add TabOverMargin compat modeMiklos Vajna8-2/+35
In case the right margin is larger then the tab position (e.g. the right margin of 7cm, there is a tab position at 16cm and right margin begins at 9cm), we have a conflicting case. In Word, the tab has priority, so in this conflicting case, the text can be outside the specified margin. In Writer, the right margin has priority. Add a compat flag to let the tab have priority in Writer as well for Word formats. This is similar to TabOverflow, but that was only applied to left tabs and only in case there were no characters after the tabs in the paragraph. (cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1)
2013-01-08fdo#40465 fix to maintain correct focus whilst zoomingWinfried Donkers1-0/+3
Change-Id: Ifed6e9a1fcb23e3565843842c3db695ab51b3d54 (cherry picked from commit d14f7e4ec48f9a9eee0585fb5ee72512e9f4bd19) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-07Fix wrong bracketingWerner Koerner1-1/+1
Wrong bracketing, item is put at a which-id of sal_false. Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d Reviewed-on: https://gerrit.libreoffice.org/1498 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 06bdc1e3ae8e93154dc9b9487691b547348c8634)
2013-01-07Fix for rtfexport subsequenttestLeMoyne Castle1-1/+1
was re-using previous data buffer in later write to file fixes segfault in rtfexport subsequenttest should correct WMF image garbling, rtf breakage Change-Id: I9a296da5cfd29dc88c8e3e1352a6e9b38aeba4ef Reviewed-on: https://gerrit.libreoffice.org/1545 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-05rhbz#890080: crash in SwXTextDocument::getRendererCountMichael Stahl1-1/+4
No idea how to reproduce it; pSwView is checked before use except here. (possibly regression from 2f9f480b22f2fff59d9c48b4b46706c3d5223e66) Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0 (cherry picked from commit 1c52268a5bc6d79c6ee1344e4e341c7e3820d4e0)
2012-12-31fdo#54612 don't crash on RTF_DPPTX before RTF_DPPOLYCOUNTMiklos Vajna2-0/+44
Change-Id: I35bf580df157dee429d9dca193945ea95616d678 (cherry picked from commit 08b4efb4e1cd01311719caffea4117fd8770f20f)
2012-12-28fix the sw_swdoc_test crashLuboš Luňák1-1/+1
Keeping a reference to an expired temporary is a rather bad idea. Change-Id: I4d93d644b7db957ea49bcf1127647b7e5427f469
2012-12-28fdo#45183 fix RTF import of tables with different row widthsMiklos Vajna2-0/+49
(cherry picked from commit c3b0f13546b30e5db3aecd311c7178e4e0933208)
2012-12-24fdo#57678 fix import of RTF_PARD between RTF_CELL and RTF_ROWMiklos Vajna2-0/+44
(cherry picked from commit c58981ca3dbf65c998acf979fb104534991b08c4)
2012-12-23fdo#58076 fix import of RTF page margins vs partial section propsMiklos Vajna2-0/+17
The problem was that \sbknone (being a section property) triggered creating a section, but the document doesn't have multiple sections. Make sure we don't send section properties as long as no \sect control words present. (cherry picked from commit 07c80d23fadcc2334fe7c6f9ce7b5dafeb88d623)
2012-12-22fdo#57886 fix import of RTF_MLIMLOCMiklos Vajna3-0/+34
The RTF spec says control words are case sensitive, and page 252 of the v1.9.1 spec defines \mlimloc, but earlier page 118 and 125 also defines \mlimLoc, so let's accept both. (cherry picked from commit 71061656d459abecfe55e8725900d699174325df)
2012-12-21fdo#53604 fix RTF export of empty footnotesMiklos Vajna3-0/+14
Regression from d4069372484f18b242a42a1996767f57b031fff6 (cherry picked from commit b91fa392bc731376cff205d6d3e5cb245dc4179c)
2012-12-21Templates Manager: removed the old dialogs and menu entriesCédric Bosdonnat9-53/+0
Conflicts: basctl/uiconfig/basicide/menubar/menubar.xml extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml sfx2/inc/docvor.hxx sfx2/inc/orgmgr.hxx sfx2/source/doc/docvor.cxx sfx2/source/view/orgmgr.cxx sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/swform/menubar/menubar.xml sw/uiconfig/swreport/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml Change-Id: I5aa9dd8c0bfb95c26bca14962f60041e892ea2ea
2012-12-20improve padding on character dialog pagesJack Leigh1-0/+2
Change-Id: I778dd8e427618a9761cc90683e7d8ac986e27c94 Reviewed-on: https://gerrit.libreoffice.org/1429 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4b0a9e7ce34c8c0870c119cef18d7e1b7565cd8c) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-12-20Partially reverted 786f15e605867668d88ab23d66cabb18f18bdcf9Cédric Bosdonnat6-0/+6
This dialog is still of some use with some Writer Wizards and templates. Re-added the dialog, but moved the menu entry to Tools menu in Writer. The menu entry has not been added back in the other applications. Change-Id: I1388d955752e99ab6d39dfc81bb41a97b33bdfcd
2012-12-20fdo#57881 sw: make UseOnPage independent from SvxPageUsageMiklos Vajna1-2/+32
UseOnPage got changed in commit fa0f42bafbf24e9141ddee728b160b5ab47077f2, but SvxPageUsage got unchanged. Given that right now other applications don't support first page headers / footers, leave SvxPageUsage unchanged and provide conversion methods between the two types. (cherry picked from commit bee957fc48867aa1b98b8672b02a187a461f4e38)
2012-12-18Removed File > Templates > Address Book Source... menu entry and its codeCédric Bosdonnat6-6/+0
Change-Id: Iaec660c2d8da109bd644f5c88213fdb0c51a9c0f
2012-12-18fdo#58376 SwFrm::CheckPageDescs: fix crash on fallbackMiklos Vajna1-1/+4
The problem was that fallback worked like this: if we have no page style, then right falls back to left, and left falls back to right. This is no longer enough when 'first' is missing: for odd 'first' pages, first we should fall back to right. (cherry picked from commits 1b67d91b0065c46ca7b36db0836c9159ca8b50cf and 5b7810581c573c4406a0e4529193dd3a7871a56c)
2012-12-18fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .docLuke Deller1-0/+4
Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce Reviewed-on: https://gerrit.libreoffice.org/1251 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/1386 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-12-17fdo#58286: sw HTML export: fix missing end tags on FrmFmtsMichael Stahl1-1/+2
SwHTMLWriter::OutFrmFmtOptions must return a value that includes the parameter rEndTags. (regression from 3852a6f54880af8ed9161227baa555580c7d4517) Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec (cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)
2012-12-17118878: Writer crash after column number and width of frame are modifiedYong Lin Ma1-2/+2
Patch by: Lin Yuan Review by: mayongl Reported by: Ji Yan
2012-12-17fdo#53525 - Revert "writer:crash(i118878) when addingMichael Meeks1-27/+19
columns and chang. properties in a frame" This reverts commit de1c42d9f552bc57b28d50f4313bc982c63b84d4.
2012-12-17Resolves: fdo#58237 set listbox to be expandableCaolán McNamara1-1/+5
which is currently also a synonym as shrinkable so the listbox is shrunk to fit. we do need to get around for forcing widgets to stay within their available space in boxes (should work fine in grids) Change-Id: I38a570b2d59952f3457252c57399e2d6ab9e12c6 (cherry picked from commit 1b0591e934540db3bb31342ccc7849ed49338a96)
2012-12-17sort style list in outline numberingCaolán McNamara1-0/+1
Change-Id: I17139da65d0adbdaaa2c7bafb066fc6f74c42700
2012-12-17Resolves: fdo#58284 outline numbering list is of wrong typeJulien Nabet1-0/+1
Change-Id: Ifb1fa41bef033b4f0624f46a945d5a5c47bada4a (cherry picked from commit ec1f1c16e36b1fa5138604ca08fff1888cf7513c) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-12-14Related: fdo#38606 keep style dialog open when apply is clickedCaolán McNamara6-111/+155
i.e. don't close and reopen, just stay open Change-Id: I11cdc492e3c4adfb75c9a0dfa52e5ba351914858
2012-12-14Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf modeCaolán McNamara1-1/+3
which means that they are not there to be underlined Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a (cherry picked from commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9) Reviewed-on: https://gerrit.libreoffice.org/1327 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-12-13SwFmtAnchor::SetAnchor(): assert that position is on SwTxtNodeMichael Stahl1-0/+5
Change-Id: I1c2a1cc2de4984cdcf1e5b8d0eafbd1471538e4a (cherry picked from commit 90a0116ccb48388d91b21128fcac2e4609838581)
2012-12-13fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:Michael Stahl1-6/+8
The function does not handle the case where a paragraph was hit but no background frame was hit properly, which may or may not (depending on the platform) cause it to return a position of a frame when that is undesirable, such as when called from SwWrtShell::UnSelectFrm(). When UnselectFrm() leaves a frame selected pasting multiple pictures leads to a crash. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 (cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee)
2012-12-12Resolves: fdo#57469 allow tab to traverse into custom widgetsCaolán McNamara2-5/+5
The magic WB_TABSTOP bit is the one that allows a widget to be accepted as a candidate for getting focus when pressing tab (cherry picked from commit 166d8257979aac6775319a9e1f305bc94df97e29) Conflicts: svx/source/dialog/fontlb.cxx Change-Id: I7d964bae6b84184ccbc4652d66cf3d2637566405
2012-12-11fdo#57320: sw: HTML export: hidden text should not be visibleArne de Bruijn4-2/+17
Change-Id: I974675b43b56d064a693bcb2d356580243c19393 (cherry picked from commit 45ca417bf90ea7873c4d75cd0611fcf0cf7a33a9) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-11docx import/export non-breaking hyphen and soft hyphenLennard1-0/+8
God made non-breaking hyphen and saw that it was gone he told us to fix it as soon as hell we promised that we would Change-Id: I1d2bb8f7542f5ffec36fafdbdb07ace1cb62fb4a Signed-off-by: Lennard <Wasserthal@nefkom.net> Reviewed-on: https://gerrit.libreoffice.org/1279 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1b0d9fa747c4a7fcdcd1c057bc2b31345f4bfe76) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-12-10fdo#57780: sw: lcl_ArrangeLowers: register drawing ...Michael Stahl1-2/+2
... objects at the right page. This was effectively disabled for all anchor types except FLY_AT_PARA by a misplaced ! in the conditional, and C++ not being a type safe language. Change-Id: I64af2141e577ac896292eecd9f8c46c62a0548db (cherry picked from commit c479ccc438edeb7197a2d05bdb99067365d7bac0)
2012-12-08fdo#49934 fix RTF import of column break in case no columns are definedMiklos Vajna2-0/+15
It turns out on that case the column break should be parsed as a page break. Change-Id: I5dddc8f334fab35bc2ff03fd8127989ab6a601f3 (cherry picked from commit 257a4090af068085143d71d60e6032ba0b998804)
2012-12-07fdo#55289: fix crash in SwXShape::setPropertyValue:Michael Stahl2-1/+49
In the libreoffice-3-6 branch the docx import crashes here when setting the anchor position of a shape, because the previous setting of the AnchorType was not done properly: the position of the anchor in the SwFmt did not match the actual position of the text attribute, so we get these assertions: "Missing FlyInCnt-Hint." and crash. This cannot be reproduced with the docx import on master, because on master a different intermediate AnchorType is set, and transitioning from that happens not to cause the crash. But it can be reproduced with a unit test. The regression was introduced in libreoffice-3-6 with backport commit bbbb10a0774b9da546557632cd09c4f6958f8939. Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c (cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a)
2012-12-05restore swdoc testCaolán McNamara1-0/+1
4b586bd622c94e617075f4e176087584ae5fe47d (presumably accidentally) removed it Change-Id: I7c9ce15f5393a31bdc33aad8edc91375859501c1
2012-12-05Disable a unit-test block for WindowsFridrich Štrba1-0/+4
Change-Id: I2657f0986b6cbbe0a387c2a5d1931103ed2c73de
2012-12-05correctly parse range in cond format dlgMarkus Mohrhard1-1/+0
Change-Id: I92d19cd71f7f1c9e90b2d3039a5c3c6a0143d1c7
2012-12-04Writer styles: add the non-hidden pooled styles if mask is SFXSTYLEBIT_ALLCédric Bosdonnat2-13/+17
Change-Id: I36054bf58f857b104abd83913d45f32f0c930c19
2012-12-04Added numberformat.ui and modified labels of present uigokul1-0/+462
Change-Id: I1a58b92044a6db54cffbabc46e054c9638367000 Reviewed-on: https://gerrit.libreoffice.org/1234 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04converstion of Printer setup widgetgokul1-0/+286
Change-Id: Id53e0e9b0e1ca92497bc994f6bd30ba191f9f5ef Reviewed-on: https://gerrit.libreoffice.org/1236 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04WaE : call base copy constructorNorbert Thiebaud1-1/+2
Change-Id: I6a31d51e8c20d2f8d8b2d14092e2ce84bf2aa95d
2012-12-04Styles & Formatting: added Show menu item on hidden stylesCédric Bosdonnat3-1/+15
The command to show hidden styles again was missing. Change-Id: Ic25b0cfc4d021d949124b8c4ef4016d6dba7e39f
2012-12-04Export finely dashed borders to docx.Eilidh McAdam1-0/+3
Change-Id: I4a65f8e874abe406a9cd2d3a088ea52f0850088f Reviewed-on: https://gerrit.libreoffice.org/1124 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04docx fine dashed table border import test case.Eilidh McAdam2-0/+15
Change-Id: I27ee8e360b8fd530f8cfefc58c8a0f96d706b979 Reviewed-on: https://gerrit.libreoffice.org/1125 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04fdo#54473 fdo#57133 fix RTF import of character stylesMiklos Vajna2-0/+19
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
2012-12-04i#25473: this was fixed by previous commit, so enable...Michael Stahl1-4/+0
...those tests again. Also there does not appear to be a reason to exclude MAYBEVOID properties. Change-Id: Ic73adb8800aee7f65e86394cecfe13b7b24eed13
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 10:36:56 +0000