summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2013-02-25n#779642: Fixed floating tables import in writerfilterCédric Bosdonnat2-2/+24
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b) Change-Id: Id60a08811f238db505d51b0e1381427a8f5df9cf Reviewed-on: https://gerrit.libreoffice.org/2307 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-25n#779642: ignore framePr inside table or the table import won't workCédric Bosdonnat2-1/+10
(cherry picked from commit 874f0a1be443b8027d5aba2285866f31cf4169e5) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I72996da79ca22a09fb490d06bcd34f741d7093ac Reviewed-on: https://gerrit.libreoffice.org/2306 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-21Related: fdo#60920 various efforts to consistently apply HIG rulesCaolán McNamara1-4/+4
(cherry picked from commit 76bc43823a53d76e49260a601e893bc1a791fb03) Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88 Reviewed-on: https://gerrit.libreoffice.org/2301 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-20fdo#59928: sw: fix mouse selection of fields differentlyMichael Stahl2-25/+29
Unfortunately selecting the field in SwEditWin::MouseButtonDown() prevents the click field handling code in SwEditWin::MouseButtonUp() from running. Instead select the field in MouseButtonUp and SwWrtShell::ClickToField(), which seems to work better. (regression from 94721b2aec614e0d99504138d484b2ad6cd550c7) Conflicts: sw/source/ui/wrtsh/wrtsh2.cxx Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5 (cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671) Reviewed-on: https://gerrit.libreoffice.org/2286 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-02-19apparently there's no ssize_t on windowsLuboš Luňák1-4/+4
Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextOnlyMichael Stahl1-2/+15
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc (cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95) Reviewed-on: https://gerrit.libreoffice.org/2182 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextMichael Stahl3-19/+25
Also adjust SwUndoReplace to not assume that everything was inserted and use the stored indexes instead in Undo. Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847 (cherry picked from commit b6d45f26ea5bcc848737921b59a16253eb1d8587) Reviewed-on: https://gerrit.libreoffice.org/2181 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: make callers of SwTxtNode::InsertText more robust:Michael Stahl8-39/+83
Return the actually inserted string from InsertText(), so callers can check if the insertion was actually successful. Especially InsertHint() will likely cause problems if it cannot insert its CH_TXTATR; also Undo objects should not Undo more than was actually inserted. Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf (cherry picked from commit d47218d79a2440e71efb66b2224063801ba6623b) Reviewed-on: https://gerrit.libreoffice.org/2180 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: SwTxtNode: limit to less than STRING_LEN charsMichael Stahl3-13/+34
It's not a good idea to have STRING_LEN characters in a SwTxtNode because then there is no valid SwPosition at the end of the paragraph. Also it turns out that LO 3.6 and 4.0 do rather stupid things with a full SwTxtNode. So enforce a limit, at first in the usual places that are used during file import, SwTxtNode::InsertText() and SwCntntNode::CanJoinPrev()/CanJoinNext(). Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c (cherry picked from commit 549c0f785d4b6d4bc1b39b22827d77d66f48430a) Reviewed-on: https://gerrit.libreoffice.org/2179 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-18fdo#60710 SwXTextPortionEnumeration: filter out fields from the undo stackMiklos Vajna1-1/+2
The UNO API provides the annotation field associated to a comment range fieldmark when the fieldmark starts. To achieve this, it looks up the annotation field by name, but it failed to ignore the fields which are present only because the undo stack still holds a reference to them, making the ODF export filter fail to export the document. (cherry picked from commit f6a02947896e19160c137032a7fc2e56277656af) Change-Id: Ia3b738a1eca7ed9981e1963b3d70ea8e3dbe8db8 Reviewed-on: https://gerrit.libreoffice.org/2231 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-18fdo#60738 SwPostItMgr: let the cursor know if we're in annotation modeMiklos Vajna8-10/+21
This solves the conflicting requirements: If the annotation has focus ("in annotation mode"), then we want to be read-only only in case the comment anchor is inside a protected section, or so. Ignoring the fact that in the main document, the cursor is right before the annotation anchor, which is a read-only position. OTOH, if the annotation has no focus and the cursor position is before the annotation anchor position, then we do want to be read-only. With this commit, the first case passes around a boolean flag, so the annotation frame won't be read-only without a reason. (cherry picked from commit 9104d5e8905c2ec2b576b5ca452d3e23d5555e49) Conflicts: sw/inc/pam.hxx sw/source/core/crsr/pam.cxx Change-Id: I25781a4501f752f7c4d024795d57b884cb800547 Reviewed-on: https://gerrit.libreoffice.org/2163 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-18SwDoc::Overwrite: probably a bad idea to overwrite fieldmarksMichael Stahl1-2/+12
Change-Id: Iba94df67c21514cf4f5361bab28629c6d5d9d3e8 (cherry picked from commit 447bb5b5006051672ec526b75bec7db02d2db82e) Reviewed-on: https://gerrit.libreoffice.org/2175 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-18fdo#60842: sw ODF import: support value-type="string" on cells:Michael Stahl2-21/+64
According to ODF 1.2 part 1 19.385 office:value-type, the attributes of table:table-cell, namely office:value-type="string" and office:string-value="foo", should override the element content of the cell. Change-Id: Ic580307effb046d127c4d64a4f963f0e91b3a2d1 (cherry picked from commit 1b5839f49c07beb6fbde6c7370a5636d22f9ab77) Reviewed-on: https://gerrit.libreoffice.org/2177 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-18sw: do not crash when it's not possible to insert flyMichael Stahl1-3/+14
Change-Id: Idfcf54013107ba6b7ce3de0d0bddbef306698f33 (cherry picked from commit 5a80c24b145c8efe0dd384ef88e7d31173522fb8) Reviewed-on: https://gerrit.libreoffice.org/2176 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-14asynchronous word-count.Michael Meeks10-95/+166
Change-Id: Ie78819590bca52f36406022a3954651c42c52540 Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2013-02-14minimal change to fix fdo#57908 for backportLuke Deller1-4/+8
wwSectionManager::GetPageULData adjusts margins and header/footer heights according to whether there is a header/footer or not. It could be confused into thinking there was no header/footer when indeed there was, in the case where a first page header/footer was inherited from a previous section which contained but did not actually show that header. Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4 Reviewed-on: https://gerrit.libreoffice.org/2137 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13fdo#60092: fix STL regression in SwInsertDBColAutoPilot::DataToDocMichael Stahl1-2/+2
(regression from f7d681dc34e60eb8532403079d007ca1250f4941) Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40 (cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96) Reviewed-on: https://gerrit.libreoffice.org/2119 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13fdo#60668: filter out fieldmark chars from Index entries:Michael Stahl1-13/+30
SwTxtNode::GetExpandTxt must filter out all dummy characters used to represent fields, footnotes, field marks, etc. Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93 (cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc) Reviewed-on: https://gerrit.libreoffice.org/2122 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-12prefer my own cjk char-as-word countingCaolán McNamara1-49/+0
Change-Id: I120acd40b83cad074869b404d4e74b5ec69d493d Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-12fdo#59573 position after fieldmark and before annotation anchor is read-onlyMiklos Vajna3-5/+44
Also revert "SwTxtPaintInfo::_DrawBackBrush: draw dark border around comment highlight" (commit 57c8c34fcdc2d594d2da3593eb9d86d0daf4e18c), as it draws confusing vertical lines inside the comment when it has multiple runs. (cherry picked from commit bd505fdb9f669f365ff39b0ef46f0742c638e333) Conflicts: sw/qa/core/swdoc-test.cxx Change-Id: If0f60e4a28878c2b31327ae3c04ae11470bc1f52 Reviewed-on: https://gerrit.libreoffice.org/2101 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-11fdo#59953 RTF import: fix unreadable graphic and nested cell contentsMiklos Vajna2-0/+28
There were two issues here: 1) c3b0f13546b30e5db3aecd311c7178e4e0933208 added a mechanism to work around broken documents, but that didn't deal with nested tables. Additionally, the check compared the max row width with the width of the last cell, not the last row. 2) d276d3f3ae112a11c8cb5768650d147cbb94275e cleaned up implicit horizontal merge detection, but didn't deal with valid documents, where each row definition is available twice. (cherry picked from commit e15f9ceafdf6e8b21cd315936ab44edfa91dd8b2) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I1a32ec2fcb0d1a8fca7a7bd26501d3daf17880c9 Reviewed-on: https://gerrit.libreoffice.org/2044 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-02-07SwPageFrm::RemoveFlyFromPage: fix a11y problem:Michael Stahl1-11/+17
This problem can be reproduced with the bugdoc from fdo#60234, by dragging and dropping the lower left drawing object. The ATK bridge is notified of the change, and updates its list of children by calling getAccessibleChildCount() and then getAccessibleChild() in a loop. Unfortunately the count returned does not match the available children (the difference is the object that is being dragged). The implementations in SwAccessibleFrame::GetChildCount() and SwAccessibleFrame::GetChild() use slightly different iterators for the SwPageFrm, and the SwAccessibleChildMap one is implemented as a std::map, using the OrdNum of the drawing object as a key. On the dragged object, that OrdNum has been reset to 0 in RemoveFlyFromPage, but it is still in the pSortedObjs of the SwPageFrm, and so it is not inserted into the map, and iteration over the map is missing one element. 149 return _SwAccessibleChildMap::insert( aEntry ); Value returned is $22 = {first = {first = {eLayerId = SwAccessibleChildMapKey::HELL, nOrdNum = 0}, second = ...}, second = false} Fix this by removing the object from pSortedObjs before disposing the a11y frames. Change-Id: I4e4bb37759382e32150cff6def02d80a55e4a702 (cherry picked from commit 6bef95d0da47edf33f4c3fe3c7380977f8c1cf67) Reviewed-on: https://gerrit.libreoffice.org/2027 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-02-06Resolves: rhbz#907933 crash on removing second last para in cell...Caolán McNamara2-0/+22
if (basically) the last para is on next page Change-Id: Iaff610ea94a829e73bfb8c694a27e0e9b4f6e295 Reviewed-on: https://gerrit.libreoffice.org/2012 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 15d8b51bf82610c663f80fe552a1c0315e137ad3)
2013-02-06RTF import: fix import of \line symbolMichael Stahl2-0/+9
"Required line break" was eaten by the newly added code in text() to ignore \'0a. (regression from f593a2e4179b05ae1019372cde612cb242d1d27f) (cherry picked from commit c4696e7c0456df8d9466acbae3ea1fa9dcfa73f0) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Id32687c40a17ddb99196635cedfc850182705799 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-05fdo#59426: Don't try to repair package during flat detection phase.Kohei Yoshida1-0/+7
Change-Id: I35968241a79db0aabe06e25c0efac2aa3d1c5b84 Reviewed-on: https://gerrit.libreoffice.org/1984 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-02-05fdo#59393 fdo#44053 fix this again and this time add a testcase as wellMiklos Vajna2-0/+28
This was about importing RTF tables where different rows had different number of cells. In the meantime, a better implementation was added for DOCX, just using that for RTF fixes the import of this bugdoc. Also fixes a crasher while loading ooo43817-1.rtf. (cherry picked from commit d276d3f3ae112a11c8cb5768650d147cbb94275e) Change-Id: I0970275272eca7f33a442bd6acc97a4f8d9dabeb Reviewed-on: https://gerrit.libreoffice.org/1947 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-05fdo#60250: InsertNewPage: copy margins for mirrored pagesMichael Stahl1-0/+3
When there is no explicit first page, set the proper left or right margins, which are different for mirrored page styles. (regression from a964cf666abb0c4df4e29ea8709532b7d45c104f) Change-Id: I56ccc6f7987accefc27d627d2427ee37d83bd758 (cherry picked from commit 2fc87188bd4a73d25b64b32e0287cee5d6ee4a48) Reviewed-on: https://gerrit.libreoffice.org/1987 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-31fdo#59928: sw: fix mouse selection of fields:Michael Stahl1-16/+42
SwEditWin::MouseButtonDown: the selection of fields was messed up by a call to rSh.SetCursor near the bottom of the method. This used to be fixed up by SwEditWin::MouseButtonUp previously, but that was broken with commit dcb080347ca127044313bbb3c11c37761cc2a7a2. To fix that move the field selection code to a place where it prevents the other code from running, in the hope that it is not necessary. Also it does not make any sense to select whole words when clicking on a field, just selecting the field seems much better. Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e (cherry picked from commit 94721b2aec614e0d99504138d484b2ad6cd550c7) Reviewed-on: https://gerrit.libreoffice.org/1925 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
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-24Resolves: 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>
2013-01-24fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedescMichael Stahl1-5/+5
... otherwise the first page will not be updated on page style changes. (uncovered by commit c41675a7d13dac64540ad420f905e80dbcbc023d, which should have fixed this too) Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a (cherry picked from commit da1398c503784086ecd0a10dd8e809069d649653) Reviewed-on: https://gerrit.libreoffice.org/1830 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:52:00 +0000