summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2013-01-28fdo#59779: Set the first page attributes on pooled styles creationCédric Bosdonnat1-0/+1
Change-Id: If599bc9d9b9a22c5500a0e39bcec76a6162bec3f Reviewed-on: https://gerrit.libreoffice.org/1864 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-01-25Resolves: fdo#59586 Missing comma in particular PDF fileCaolán McNamara2-6/+6
regression from d9e4c74811855de15f1bf2045c2c9b061a2d4dc6 - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) should obviously have been - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (!MsLangId::isKorean(aLang)) Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81 (cherry picked from commit e029e7394b972fd72930c8c475f3768dd99fe673) Reviewed-on: https://gerrit.libreoffice.org/1839 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f3a0e72261419554d0cd3984a0e8f800ed587d49) Reviewed-on: https://gerrit.libreoffice.org/1845 Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-01-22n#792778 DOCX import: parse group shapes in oox onlyMiklos Vajna1-12/+15
Previously textframes inside groupshapes were tried to be imported as TextFrames, but then their addition to a GroupShape failed, so the text simply ended up as a normal paragraph. Fix this by importing members of groupshapes as drawinglayer objects, just like how the WW8 import does. Also fix two testcases, which implicitely tested that the groupshape VML element is ignored on import. Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa Signed-off-by: Andras Timar <atimar@suse.com>
2013-01-18fdo#59428: SwPageDesc::GetUseOn(): mask PD_FIRSTSHARE.Michael Stahl1-0/+1
There is at least one call in SwDoc::ChgPageDesc() checks if the result equals PD_MIRROR. (regression from fa0f42bafbf24e9141ddee728b160b5ab47077f2) Change-Id: Id37ca46eec5885f7f5230337d8a8a594845f7842 (cherry picked from commit 8d301533f0c7764c94f8ad72fced2ce9d9de7585) Reviewed-on: https://gerrit.libreoffice.org/1748 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-01-18fdo#59437: SwFmtAnchor::SetAnchor: Anchors may be on StartNodesMichael Stahl1-2/+5
Assertion added in 90a0116ccb48388d91b21128fcac2e4609838581 wasn't quite right. Change-Id: Icac6c4e3932837ffaf170d9b18664e5b4ff579ff (cherry picked from commit 0ed73a0817ad0ff0107cb297208252c0afe3b4a9) Reviewed-on: https://gerrit.libreoffice.org/1747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-01-18sal_Bool to boolTakeshi Abe14-59/+61
Backport needed to fix build after backport of 2b9edadd637ea52293473e63062d334371bc83af . Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2013-01-18rhbz#818557: fix it differently: SwDocShell::_LoadStyles():Michael Stahl1-0/+9
Try to prevent pushing of SfxShells from this function via EndAllAction and SwView::AttrChangedNotify() by setting a ridiculous pre-exising global bNoInterrupt variable. Change-Id: I9c91ca882891c8dfcd9dc08ba197233cfefddefd (cherry picked from commit beacee6fad46aa2c8fc813bb0150e5c7a5175b26) Reviewed-on: https://gerrit.libreoffice.org/1722 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-17fdo#52286 fix RTF export of sub/super script font heightMiklos Vajna3-1/+19
(cherry picked from commit 796e9a796603397c79e160610c8541e16dfc4c82) Change-Id: If71cb6a20842f2fbe8eae94955da2d53842999a4 Reviewed-on: https://gerrit.libreoffice.org/1731 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-17Resolves: fdo#58998 insert section applied twiceCaolán McNamara1-1/+1
regression since 0157f0b1ba364f7f9af2aacd1be9fbb5ddec2b4d my belief was that OK_Impl was only called in one place, in sw/source/ui/fmtui/tmpdlg.cxx, so I merged the use there into OK_Impl, but of course there was another use in sfx2/source/dialog/tabdlg.cxx Given that OK_Impl only called PrepareLeaveCurrentPage originally... a) replace OK_Impl in sfx2/source/dialog/tabdlg.cxx with PrepareLeaveCurrentPage, a no-op from the original state. b) add an Apply method that does what I want, i.e. call ok without closing the dialog, so we can retain the fix of fdo#38606 to have "apply" immediately apply the effect of pressing "ok" without closing and reopening the dialog Change-Id: I57e2e41c07ab9bf89ada98d1b9c3336db3493f19 (cherry picked from commit 8fd85527981e3a6a915192aaea6f1595ea9f037c) Reviewed-on: https://gerrit.libreoffice.org/1729 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-16fdo#59275: docx export: fix regression on table borders exportPierre-Eric Pelloux-Prayer1-9/+0
The removed code was supposed to allow LO to write cell borders only if they were different from default cell border. Bug #59275 show that this is incorrect. Change-Id: If31914c412480fdadb775ca6675999ecde3e6bba (cherry picked from commit 6819f9b834581acd5507cd2301bda8b5395b937d) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-15make translatable a few more ui stringsAndras Timar2-2/+2
Change-Id: Ie4524269b353059df3c60afa9a48c1f1b5f51185 Reviewed-on: https://gerrit.libreoffice.org/1700 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-01-15fix mailmerge output as plain text, explicitly pick correct .txt export filterCaolán McNamara1-0/+4
Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de (cherry picked from commit a5dc04633d79f5abee85d919e097983117d2abd4) Reviewed-on: https://gerrit.libreoffice.org/1697 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-15fdo#40465 solve regression when zooming with cursor not visibleWinfried Donkers1-3/+4
Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70 (cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-15fdo#59338 fix RTF paste into footnoteMiklos Vajna3-0/+36
(cherry picked from commit b6a2083b9dfe5aceb0900315363ef41e2f3abef5) Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0 Reviewed-on: https://gerrit.libreoffice.org/1691 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-15fdo#58854 'Insert' button was untranslatableAndras Timar1-1/+1
Change-Id: Iedb17e216083fdb8990fe9dc663b27eaa352ecf3 Reviewed-on: https://gerrit.libreoffice.org/1680 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-14fdo#57938 SwPaM::HasReadonlySel allow editing before commented text rangesMiklos Vajna1-1/+8
(cherry picked from commit 50b6dc0099ff61050b82a2e37e70d643151e7ce7) Change-Id: I229602e7783c76e7fc57b78a408f90c1f6a8cda5 Reviewed-on: https://gerrit.libreoffice.org/1673 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-14docx export: add missing arg to impl_pageBorders callPierre-Eric Pelloux-Prayer1-1/+1
The missing argument could cause data loss due to ill-formatted document produced. Change-Id: I65dee7f42c633ae9602d454e2f03ebc821c9c0ab Reviewed-on: https://gerrit.libreoffice.org/1672 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-14fdo#53487 SwUndoInsert: take care of fieldmarks when deleting field charsMiklos Vajna1-0/+21
The problem was that while SwUndoInsert removed the field characters, it didn't remove the fieldmark, so after unding a comment insert, it wasn't possible to re-insert a comment. (cherry picked from commit ecce43877167c1cd6e24208208aed4274100c11a) Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55 Reviewed-on: https://gerrit.libreoffice.org/1652 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-11fdo#57938 SwPaM::HasReadonlySel: commented text ranges are not read-onlyMiklos Vajna1-1/+7
(cherry picked from commit fd0da52d371ca13d66be3b04d89f9d9cf73baddd) Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f Reviewed-on: https://gerrit.libreoffice.org/1629 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-11fdo#58793: re-implement SwpHintsArray::Resort():Michael Stahl1-41/+7
The previous implementation uses sorted_vector::insert, which relies on the array already being sorted. Change-Id: I4a2e49e7d8fcfd934f8990be61f83d00d1a09ddd (cherry picked from commit c59355e936446fe55960209e543b072acb6b2170) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-01-09fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cellsMiklos Vajna2-0/+40
Regression from 8063e36115a11ddf3db05928db9287947beee74d. (cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32) Change-Id: I9974368cfd9c38bbcce68f3b36e0eedfcbef5672 Reviewed-on: https://gerrit.libreoffice.org/1617 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-09fdo#58242: sw: fix more crashes when not on SwTxtNodeMichael Stahl4-6/+48
In getCrsrPropertyValue etc.; also add a unit test for the problem. Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007 (cherry picked from commit 68d40d2cae3700f4134375fcaf9649ac626ada7d) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-09fdo#58242: getCrsrPropertyValue: fix crashes when PaM not on SwTxtNodeNoel Power1-9/+19
Change-Id: I67042b5d689457921a928454c9051f0402be17e6 (cherry picked from commit 11b380874a36869452246cc77c392d1767e60e95) Signed-off-by: Michael Stahl <mstahl@redhat.com>
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 00:23:02 +0000