summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-04-12RTF export: fix position of at-character-anchored textframesMiklos Vajna
Our importer could deal with the frames without these, but not Word. Change-Id: I6f7d13aba45129357fcf8c11e60d5a9dbc7a8ca2
2013-04-12use EditView::CheckLanguage() instead of duplicated codeEike Rathke
Change-Id: I0ff75f1dc084f426846ac4f67db85a5d932d7bee
2013-04-12sw: remove usage of boost::bind for IMarksMichael Stahl
Apple llvm-g++ 4.2.1 with _GLIBCXX_DEBUG won't eat boost::bind with IMark::StartsAfter, and MSVC 2008 with _DEBUG even doesn't like IMark::StartsBefore. They evidently try to call the comparison operator with arguments in the wrong order. Change-Id: Ib11a79a459e84ac9d7046824678ad4ccdacc67d0
2013-04-12i#23187: Fix crash of the document.Jan Holesovsky
The mbLayoutInProgress bool was effectively unused - only set and reset, but the only place that was checking for that was in lcl_RecalcRow(), again, only to set and reset it. Worse - with the document from i#23187, the mbLayoutInProgress was set / reset on a page already disposed in SwFrm::InsertPage() which was causing the crash here. So let's get rid of all this mbLayoutInProgress, its getter and setter, and NotifyLayoutOfPageInProgress class. Valgrind, thank you that you exist, would have never found it without you! :-) Change-Id: I9a9b604f8a21bb50e21af1b20b8db76d2c0504bd
2013-04-12sw: rework RTF export of text framesMiklos Vajna
Export these as new-style frames. Not counting future possibilities, this commit finally fixes the following problems: - borders: spacing to contents wasn't exported at all - wrap: top/bottom and left/right spacing exported even in case they do not equal Change-Id: I058e00e677e20bc9501b8de320f941f256e8b6f1
2013-04-12fix build, "touch" headers only on !HAVE_FEATURE_DESKTOP platformsCaolán McNamara
Change-Id: Ie0a40b5aaf26185546916843a913d4be47f7b6fb
2013-04-12Resolves: #i119632# Macro button lost if save template to .doc fileLei De Bin
Add export MACROBUTTON field codes in AttributeOutputBase::TextField Found by: yan ji Patch by: Lei De Bin Review by: Chen Zuo Jun(cherry picked from commit b51d354f043d19c1a8f22e1cfff6d0b43eb62b5e) Conflicts: sw/source/filter/ww8/ww8atr.cxx Change-Id: I419ce091bb676aecfe8b53660549da40eec6057f
2013-04-12i#101884: Fix crash on load.Jan Holesovsky
This was originally fixed in commit 792cbc03aef3873ba89c61db708898d96d6a52f8 due to fix of i#99564. But later we reworked the handling of empty paragraphs in tables in commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c, which caused the fix from i#99564 to regress. Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1
2013-04-12Start implementing on-demand keyboard display for non-DESKTOPTor Lillqvist
Change-Id: I9321dcf9d863cb59eee9b2a012d887a17cb1b454
2013-04-12Related: #i119624# GetUpperSpaceAmountConsideredForPrevFrmAndPageGridOliver-Rainer Wittmann
- consider upper space amount only for page grids in squared page mode Found by: louqle <louqingle at gmail dot com> Patch by: Oliver-Rainer Wittmann <orw at apache dot org> Review by: zjchen <zjchencdl at gmail dot com> (cherry picked from commit 53ba60618af3977f5e5488225dcf050a517fb5b8) Change-Id: If6592a41f0ef67cc20fa8b3ddaefa36571561f85
2013-04-12Related: #i119624# method <SwWW8ImplReader::IsObjectLayoutInTableCell(..)>Oliver-Rainer Wittmann
- correction of condition interpreting <LayoutInTableCell> attribute - include support for Microsoft Office 2010 version Found by: louqle <louqingle at gmail dot com> Patch by: Oliver-Rainer Wittmann <orw at apache dot org> Review by: zjchen <zjchencdl at gmail dot com> (cherry picked from commit 3b8b3136a51af56321a1a35fcdd9ec1d7126daa3) Conflicts: sw/source/filter/ww8/ww8graf.cxx Change-Id: I065ba88f0e08c5c5e892665933587fa2b796226e
2013-04-12consume hectares of empty space on outline and numbering tab pageCaolán McNamara
We now have hectares of empty space in the English ui on the right side because the other tabs are wider than this one. What to do with the extra space, leave it on the right, or consume it in some other way ? I'm inclined to spread things around the available space. If we set our elements to expand to consume it (but left align the spinbuttons within their expanded space) then we get a page that looks very like the original. I'm not entirely sure if I prefer it this way because it's genuinely more pleasing to the eye, or because it's just familiar looking this way. Change-Id: Iafe60713eb8c6f0bd1ecd70e3f288d52b453a247
2013-04-12use a size-group for the labels to get things to align nicelyCaolán McNamara
It appears I have a small bug in how size-groups and/or generic size-requests work. It seems that margins should be part of the request, but I'm adding those on after the request, not as part of the request. But we can workaround that by putting a one element box around the elements with margins and put those boxes into the size group instead. That way it works now, and will continue to work after I change the request+margin logic tristates are a pain, They are always set to "state unknown" on .ui load, while in .src load they default to "state nocheck". So to be super sure that the logic is unchanged set them explicitly initially in .cxx to "state nocheck" restore accessibility relationship between tristate used as a label and the labeled thing. Change-Id: Ibf4879c3e9a4ecc4726896479377f51bf727b238
2013-04-12Convert Paragraph Outline&Numbering tab page to Widget UIOlivier Hallot
Conflicts: sw/UI_swriter.mk Change-Id: I5280ddaa714db0f9ffd61cf400acf9a9fcc1087b Reviewed-on: https://gerrit.libreoffice.org/3337 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-12Resolves: #i119912# Crash when redo split pasted table used by chartJürgen Schmidt
fix: While deleting any box from chart data provider, verify whether there are any invalidate chart data sequence inside, if so, catch the exception and remove it. Patch By: Peng Chen Found By: yanji Review By: jsc (cherry picked from commit a92e353922d63d785e3d46aa1a4783846a9dea18) Change-Id: I239824e92d13e42b83674dbdeaeef053f1e6ea9a
2013-04-12sw/qa: add new script to make sure all files are testedMiklos Vajna
When some import filter fix arrives in, and the submitter submits a test file, but doesn't provide a matching testcase, we accept the patch, as it's better than nothing. This script will search for such files, providing kind of a TODO list for what testcases have to be implemented. Change-Id: I713fe2f0aef4cbca66ba913baf54b7bd28ba2471
2013-04-11Resolves: fdo#48039 use same algorithm for assigning get/set replacement idsCaolán McNamara
i.e. use the same algorithm for assigning replacement ids for both get and set exp fields. Otherwise, consider for ex. 1. fields exists with ids of 1 and 2 in master document 2. a field exists with id of 1 in subdocument and must be reassigned a new id to not collide with the pre existing master ids In get orig algorithm assigned first unused slot of master to subdocument field i.e. 0 unused in master, so subdocument:1 converted to master:0 In set orig algorithm sorted all used master slots and assigned largest used id plus 1 (therefore unused) to subdocument field i.e. largest id used in master is 2, so subdocument:1 converted to master:3 so get can't find set and error's out with: Error: Reference source not found Change-Id: Ie8758dc22cf8deeeeff079532284e57eeaf4a9bd
2013-04-11Resolves: #i119653# Crash after delete column(s) from chart's source tableJürgen Schmidt
It crashes after adjusting the table size. fix: Recorrect the logic of code in SwChartDataSequence::Dispose(), release the relationship inside. Patch By: Peng Chen Found By: yanji Review By: jsc (cherry picked from commit 3977937c2d96133c7d53c289cc9e218bb13095f4) Change-Id: I09e9c390527402e5f91031e7370910e93cf70fa7
2013-04-11restore missing mnemonics of writer print options pageCaolán McNamara
as pkacer points out, also use the 12 pixel indent for dependant controls that mduffy suggested as the best default Change-Id: If854ec394b4233bb821f37be9c784c1ccd80b912
2013-04-11Restore original mnemonics for view pageCaolán McNamara
And remove the remaining SetPosPixel calls of layout controlled elements, they are now unnecessary and get overridden by the layout anyway. Including the ones left over from the printer options conversion. Tweak things for 6/12 spacings. Change-Id: Ifb460fb966452c10a9ac08c6f8cd57b96a2166f0
2013-04-11Converted Tools->Options->(Web/)Writer->View dialogue.Pavel Kacer
Change-Id: Ifa11da48867303dbecd2ef104f2c0842aaeb5d72 Reviewed-on: https://gerrit.libreoffice.org/3325 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-11i#29679: Return early not to crash on ooo29679-57.odt in dbgutil build.Jan Holesovsky
Change-Id: I467f6383ec469f5719fd49914d81605b2a5679a1
2013-04-11deliver all uiconfig files by UIConfigDavid Tardon
Change-Id: Ie78b7ce399ba34485146ca7622c59d31f8105d02 Reviewed-on: https://gerrit.libreoffice.org/3229 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11rename UI to UIConfigDavid Tardon
I plan to use it to deliver all */uiconfig files, not just .ui, as a preliminary step to get rid of postprocess/packconfig. Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149 Reviewed-on: https://gerrit.libreoffice.org/3225 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11fdo#39468 Comment translation GER-ENG in sw/source/ui/wrtsh/wrtsh4.cxxMatthias Freund
The last file in this directory with german comments. Change-Id: I7856e383e032a98fb08a1299a77eb41636549a65 Reviewed-on: https://gerrit.libreoffice.org/3319 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-04-10Resolves: #i120077# Memory leak fixed in ScXMLFontAutoStylePool_ImplArmin Le Grand
also checked and fixed memory leaks caused by not deleting SfxStyleSheetIterator instances. Found by: Chao Huang Patch by: Chao Huang Review by: alg (cherry picked from commit aee8221b3fbe64d8e88aa3a1b630214807cd86f0) Conflicts: sc/source/core/data/stlsheet.cxx sc/source/filter/xml/xmlfonte.cxx sfx2/source/doc/objcont.cxx svl/source/items/style.cxx sw/source/core/unocore/unostyle.cxx Resolves: #120077# ALG: Reverted r1354011, adapted all usages of SfxStyleSheetIterator and CreateIterator to use boost::shared_ptr (cherry picked from commit ec1819f218b94bed1556653e1b2b816a65da61ef) Conflicts: sc/source/core/data/stlsheet.cxx sc/source/filter/xml/xmlfonte.cxx sfx2/source/doc/objcont.cxx svl/inc/svl/style.hxx svl/source/items/style.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unostyle.cxx 26937d4d65562b14de0aea59a7b01cc4334f73c1 Change-Id: If99bf3ee399292ec269d68b36ee78ed63f033215
2013-04-10add msfilter::util::ConvertColor to avoid copy&pasteMiklos Vajna
Change-Id: Ia5507f8d1ec18a45d3128c809d03f8f41849f93c
2013-04-10coverity#1000869: use of unitialized variableMarkus Mohrhard
Change-Id: I3640f4c791e09e39998ec25858baebc37b58b6f6
2013-04-10restore disabled rtfimport testsMiklos Vajna
There were two problems here: - Writer textframes don't have an AnchorPosition property, use compareRegionStarts() instead - turns out DOC/DOCX import doesn't create Write textframes when the shape has no text, doing so in the RTF import fixes the other two testcase as well. Change-Id: Ib2b4a0b7f8317d300fd532daea22568e33eceb53
2013-04-10CppunitTest_sw_rtfimport: disable 3 checks for nowMiklos Vajna
I'm not sure yet if the tests should be updated or they signal real problems, I'll came back to this later. Change-Id: Ie2570f01e07e557281d2577471a49a730a894393
2013-04-09Get the whole thing to build after the SfxFilter interface change.Kohei Yoshida
Change-Id: I62122e298f1434aa9e44c8f3fdfb7f710513617d
2013-04-09Revert "add fwl, scui, sdui, swui to Library_merged"Matúš Kukan
This reverts commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f. Conflicts: solenv/gbuild/extensions/pre_MergedLibsList.mk Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b
2013-04-09move Python tests in-processMichael Stahl
This is nice to make them more easily debuggable. A series of crude hacks are employed to bootstrap enough services from python so the current tests run. This is only tested with system python3 on Fedora. Change-Id: I5e06741e55ead7fddec41ff776ff8ca5d2399469 Reviewed-on: https://gerrit.libreoffice.org/3215 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-04-09set up python unit test infrastructureDavid Ostrovsky
Extract boostraping code from convwatch.py to unotest.py. Use python builtin unittest module as unit test framework. Specify the unit test modules in make file. Another option would be to use discover mode of unittest module. Add __pycache__ to global .gitignore to keep the source directory clean. Another option would be to deliver the unit tests to workdir prior to test execution. Currently only system python3 is supported. Change-Id: I2692817673f786e950e1176a17c7675f989755b6 Reviewed-on: https://gerrit.libreoffice.org/3214 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-04-08WaE: private field 'm_pGridTypeFL' is not usedTor Lillqvist
Change-Id: I9d0143cc55471eb70d4c16ff1fbb33b2ae74eaff
2013-04-08tweak text grid page for non-square vs square modeCaolán McNamara
Change-Id: I977e37931a221d1a104b13a21171e50117985c02
2013-04-08Convert Writer asian text grid page to Widget UIOlivier Hallot
Change-Id: If016e387aae1a36d6d78bbefd52b231a49201617 Reviewed-on: https://gerrit.libreoffice.org/3270 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-08test RtfAttributeOutput::StartURL()Miklos Vajna
Change-Id: I66f527ff7463852f65e1a3f02ddcea60d329147a
2013-04-08fdo#46808, Convert frame::Frame to new styleNoel Grandin
Change-Id: I74427d1e0059808f04960c648b93245b06c20f7f
2013-04-08fdo#46808, convert embed::MSOLEObjectSystemCreator to new styleNoel Grandin
the service already existed, it just needed an IDL file Change-Id: Iccd283f3537f8c8d57b2c2d68609dd9ef025da0b
2013-04-08fdo#46808, convert xforms::XForms to new styleNoel Grandin
the service already existed, it just needed an IDL file Change-Id: I4410dbd1e047e5e7e83c84f0b0de7155cc4fa41c
2013-04-08fdo#46808, cleanupNoel Grandin
Change-Id: I45164d4d669894888417c24a1bb95c7b5b88a35b
2013-04-08test RTF_BKMKSTART and RTF_BKMKENDMiklos Vajna
Change-Id: I00b258ef3ed89db3b9b8c97bea5ad6673b006398
2013-04-08delete commented codeChr. Rossmanith
Change-Id: Ia144e7b6e567d39816a4baa68187c157f7d8776e Reviewed-on: https://gerrit.libreoffice.org/3267 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08Use OUString and sal_Int32 in swChr. Rossmanith
source/core/text Change-Id: I29cce32f8f6ae760397ae0633ebfa56942a7cd6d Reviewed-on: https://gerrit.libreoffice.org/3266 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08remove code that was commented out many years agoPhilipp Riemer
Change-Id: I45292b157b5ea278ec9e0d9a18bf185276ba78c1 Reviewed-on: https://gerrit.libreoffice.org/3264 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08more work on comments in sw/source/core/docPhilipp Riemer
Change-Id: I4fbf683da081ad04dfd1b9ea830aa94c38f33d43 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fdo#62475 - remove pointless comments and ASCII art in sw/source/core/docPhilipp Riemer
Change-Id: I15f0af451a2259ddfeaa5e7964317e6c0537e4db Reviewed-on: https://gerrit.libreoffice.org/3262 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08doxygen-ize comments in sw/source/core/docPhilipp Riemer
Change-Id: I6956b834936db57bdb29a704ee75351ef84b46f4 Reviewed-on: https://gerrit.libreoffice.org/3261 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08fix indentationPhilipp Riemer
Change-Id: I6102b08a03349c4bdc6316f578dc2c90a4569716 Reviewed-on: https://gerrit.libreoffice.org/3265 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>