summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30fdo#82577: Handle RegionNoel Grandin11-27/+27
Put the VCL Region class in the vcl namespace. Avoids clash with the X11 Region typedef. Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
2014-09-29fdo#79269: sw: more cleanup of SwXStyle's FirstIsShared propertyMichael Stahl1-29/+23
Some of the checks for it can never be true given the preceding list of WhichIds, but there is one other case that needs the special handling. Change-Id: Iaf396960d064d0c9f2a950c2d02db1654a669d45
2014-09-29fdo#79269: fix ODF import of style:footer-firstMichael Stahl3-4/+40
The implementation of SwXStyle's FirstIsShared property is busted, and that causes xmloff to write the footer-first content into the master footer. Change-Id: I520a4929d9d7313da65bcdcf4094f8244382377d
2014-09-29Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::GetCaolán McNamara1-0/+0
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
2014-09-29SwModelTestBase: allow validating only a subset of the test filesMiklos Vajna2-8/+32
Also, as a start, enable export validation for zoom.docx. Change-Id: I4620fbd516eeb4001770a4d69a89e7831566af92
2014-09-29test for mso-position-(horizontal|vertical)(-relative) (bnc#884615)Luboš Luňák2-0/+37
Change-Id: I692de6c6d3cf2b932ba96cd9978cf56f75b8cb3e
2014-09-29map FRAME to VML's textLuboš Luňák1-2/+2
Again, that's what this file does elsewhere, that's what (incomplete) import did before my changes, and it seems to match better the position that such an element gets in Word. Change-Id: Id09150eaaa505e6ddcd4baaf4a833000d52dd71d
2014-09-29map PAGE_PRINT_AREA to VML's marginLuboš Luňák1-2/+2
That's what the code does elsewhere in this file, and also import does it. Change-Id: I30e608f86a9cae66eed48dbb2e719b1455327ae3
2014-09-29proper reading of mso-position-(horizontal|vertical)(-relative)Luboš Luňák1-2/+6
Change-Id: I50f537c697f6e73c1fd150f3f03fc65b85ccbeaf
2014-09-29export in .docx also vml mso-position-(horizontal|vertical)(-relative)Luboš Luňák1-81/+83
Change-Id: I65321bb6244e0e37ef673d726b698c3708711d53
2014-09-29docx ST_VAnchor does not know "column", it should be "text"Luboš Luňák1-1/+1
Change-Id: I3a5ab08e349c5c071373cda2f62e3cea593e263c
2014-09-29DOCX export: fix order of paragraph mark properties child elementsMiklos Vajna1-0/+4
Change-Id: I9e272996b478abe138448d305a54920b762a89b5
2014-09-29DOCX export: avoid duplicated w:sz child elementsMiklos Vajna1-1/+10
sw/qa/extras/ooxmlexport/data/zoom.docx is a reproducer for this, DocxAttributeOutput::CharFontSizeCJK() is just a wrapper around CharFontSize(), and both produce a <w:sz> element, but to produce valid OOXML, only one child element should be written, so ignore the second one. Change-Id: I7474fccadccf573f706c9b148b7e450c39ad5efb
2014-09-29drawingML export: fix remaining rotation / flip combinationsMiklos Vajna2-0/+11
With this, each rotation = 0 / 90 / 180 / 270 and flip = none / horizontal / vertical / horizontal+vertical combination (16 cases) are exported perfectly. Also, this matches what the (binary) [MS-ODRAW] export does, see ImplEESdrWriter::ImplWriteShape(). Change-Id: I04030c8c6819c35c06ce97400eb7e2f1f7389a5f
2014-09-29Set relative heights for all default heading stylesLászló Németh1-1/+1
The relative height "100%" (used only by Heading 3 now) is converted silently to absolute height (btw, also in the dialogs and in OOo, too). Using 101% instead of 100% fixes this problem, so setting a new height in the parent style "Heading" (for example, by Tools->Options-> LibreOffice Writer->Basic fonts (western)->Heading->Size) can change the heights of all default headings, including Heading 3. Change-Id: Ia44ac9d24041b75f0aedd7b56340dd41caf0020e
2014-09-29Resolves: fdo#80468 and fdo#81223 image/frame backgrounds wrongCaolán McNamara3-2/+15
writer has code to fill in missing new properties from the old properties if they exist. But xmloff is stripping them out before they get there. Don't strip them out, and add in a missing check for one of the archaic bg colors and add a regression test for fdo#81223 Change-Id: I9a541a9bee0a01c90f2c33383f1144ecd8b0bfff
2014-09-29revert hunk that makes sw_ooxmlexport tests failCaolán McNamara1-4/+12
though it did seem on the face of it a good additional safety check Change-Id: I76e613c0f42662d87f976d9b3bf98a4cb44b3c4e
2014-09-29MSVC 2012 apparently isn't ready yet for std::vector<std::unique_ptr<T>>Stephan Bergmann10-45/+45
...producing error messages about trying to access private undefined unique_ptr copy ctor etc. Partial revert of 014e7933af751bfe0a03867373b82efa806f3a3d "svtools: std::auto_ptr -> std::unique_ptr: ...changing HTMLOptions to std::vector<std::unique_ptr<...>> because boost::ptr_vector<...>::push_back only supports auto_ptr, not unique_ptr," going the awkward std::unique_ptr x(...); push_back(x.get()); x.release(); route instead (which could be simplified if boost::ptr_vector::push_back ever started to support unique_ptr). Change-Id: I15693030a0bbfdedbfdfbe76ede5d0c74f4e5b41
2014-09-29svx: std::auto_ptr -> std::unique_ptrStephan Bergmann1-3/+5
Change-Id: Ib70d974817bcdd9a582e9be28d28b007cdc3a7a7
2014-09-29Resolves: fdo#81277 missing table cell background color in doc/html importCaolán McNamara13-33/+82
a regression from one of the DrawingLayer FillAttributes changes of... commit 7d9bb549d498d6beed2c4050c402d09643febdfa Author: Armin Le Grand <alg@apache.org> Date: Mon Jun 2 15:00:50 2014 +0000 Related: #i124638# Second step of DrawingLayer FillAttributes... for Writer objects, now added support for Paragraph and PageStyle (including Header and Footer) for direct attributes and style attributes commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c Author: Armin Le Grand <alg@apache.org> Date: Thu Apr 17 16:44:58 2014 +0000 i#124638 support for DrawingLayre FillStyle for GraphicFrames and ... ... EmbeddedObjectFrames in Writer commit 6e61ecd09679a66060f932835622821d39e92f01 Author: Armin Le Grand <alg@apache.org> Date: Wed Mar 19 16:17:02 2014 +0000 Merge back branch alg_writerframes to trunk all of which set all RES_FLYFRMFMT and RES_FRMFMT SwFmts to use the new fill attributes, but a) didn't change the aTableBoxSetRange for SwTableBoxFmt to include the XFILL attributes, so importing cell bgs from .doc got dropped b) didn't make any effort in the uno api for XCells to do the same sort of mapping that was done for XFrames its unclear to me if SwDrawFrmFmt is actually adapted or not, I've assumed that it is here Change-Id: I8d71def2aef6163099a16591f9e53ba2b430bd06
2014-09-29svtools: std::auto_ptr -> std::unique_ptrStephan Bergmann10-45/+45
...changing HTMLOptions to std::vector<std::unique_ptr<...>> because boost::ptr_vector<...>::push_back only supports auto_ptr, not unique_ptr. Change-Id: Ie5f92bc40ce5425dc1c634b17addc2b0dd9bbda3
2014-09-29fdo#70998 Fix capitalizationSamuel Mehrbrodt4-8/+8
Change-Id: I17d3f512309ab0cd5d717b2e7ca3e8d51165c8a4
2014-09-28fdo#70998 Termchange: Picture->ImageSamuel Mehrbrodt3-4/+4
Change-Id: I4113d35e2a4778c9833e659b1e4ff4fbb1ab9734
2014-09-28border_width from 12 to 6, as the rest of dialogsAdolfo Jayme Barrientos2-2/+2
Second pass. Change-Id: Ic4702d2ca7a9d54ee4712dcd073006f16b2d5d1d Reviewed-on: https://gerrit.libreoffice.org/11669 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2014-09-28Resolves: fdo#73608 bail out on loop in style sheet hierarchyCaolán McNamara1-0/+0
Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb
2014-09-28Related: fdo#73608 don't crash on missing table stylesCaolán McNamara1-0/+0
Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540
2014-09-27border_width from 12 to 6, as the rest of dialogsAdolfo Jayme Barrientos16-86/+62
I know the old GNOME HIG mentions extra spacing for queries, but I’ve never understood why -- not even GNOME itself respects that rule. It just looks inconsistent and wastes space. Change-Id: I181f800957f69b0943369791e460c7273b6b08f6 Reviewed-on: https://gerrit.libreoffice.org/11658 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2014-09-27HIG: Correct spacing for several UI options in Print dialogAdolfo Jayme Barrientos1-10/+7
Change-Id: I2492274d5114a26ce802343a3bb9078d0556588b Reviewed-on: https://gerrit.libreoffice.org/11656 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2014-09-27fdo#53682 Merge 'Insert Image' and 'Insert Audio/Video' in submenuSamuel Mehrbrodt6-7/+11
Change-Id: I4ddbd134ba15a48c0c529a11bcb1cd1f71f3a51a
2014-09-26DOCX drawingML import: fix remaining rotation / flip combinationsMiklos Vajna4-6/+17
With this, each rotation = 0 / 90 / 180 / 270 and flip = none / horizontal / vertical / horizontal+vertical combination (16 cases) are imported perfectly. Also adjust a few testcases -- now that in many cases we only set the position in oox, some rounding errors went away. Change-Id: I5567a7d6964775f2caf10a0e539f3eb84d10461e
2014-09-26tools: change INetURLObject::getData to return std::unique_ptrMichael Stahl1-2/+1
Life-cycle becomes a lot more obvious this way. Change-Id: I1ca99607f609a2223011c40447ad1cd9ca5ccaa5
2014-09-26AddressSanitizer: alloc-dealloc-mismatch (operator new vs free)Michael Stahl1-4/+4
Change-Id: I500e70e64c478210bc6da0c13894995a0984c018
2014-09-26remove unnecessary casts in misc calls to SvStream.Write*Noel Grandin2-3/+3
left over from our conversion of the SvStream output operators to more specific methods Change-Id: Ib80032e8626f5476a89b958f590441994594f4e4
2014-09-26remove unnecessary casts in calls to SvStream.WriteUInt32Noel Grandin3-9/+9
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I1d848f19f82783e6eabf2da37dbde78fe36ea1e0
2014-09-26remove unnecessary casts in calls to SvStream.WriteInt32Noel Grandin1-2/+2
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I0c0172519479be0535a447e41a592fbf782751bd
2014-09-26remove unnecessary casts in calls to SvStream.WriteUInt16Noel Grandin5-15/+15
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I482ca7abb84613971e7e8f839f7aa67a65cd71ff
2014-09-26remove unnecessary casts in calls to SvStream.WriteUCharNoel Grandin5-8/+8
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I2ea4c7d97e745b3e6a3834f41ac7bfefa4883c7a
2014-09-26remove unnecessary casts'sNoel Grandin5-15/+15
left over from our conversion of the SvStream output operators to more specific methods Change-Id: I63f18be8e940098c2acbbc73ee49ede3a949fcb2
2014-09-26remove unnecessary static_cast'sNoel Grandin5-12/+12
left over from our conversion of the SvStream output operators to more specific methods e Please enter the commit message for your changes. Lines starting Change-Id: Ibfe7635451ef7b8813d7a59c78c5223092a17ad5
2014-09-26DOCX drawingML import: fix handling of rotation in case of horizontal flipMiklos Vajna2-0/+11
Change-Id: I95f74c3d3222a4d713c8d71bcd3263ecb16dba54
2014-09-26coverity#707302 Uncaught exceptionCaolán McNamara1-1/+1
Change-Id: I43761e1c06ca4ccc394b13b4ce9f82d390971533
2014-09-26coverity#1241340 Unused valueCaolán McNamara1-3/+6
Change-Id: I5fc73cfab0295cb2d2fd1f895bf2974c473ea30e
2014-09-25fdo#83465 RTF import: handle font of numberingMiklos Vajna2-0/+29
Change-Id: If0da6e0e34ce50bbe7dceda089b6bb81b4a63f36
2014-09-25editeng: std::auto_ptr -> std::unique_ptrStephan Bergmann1-3/+1
Change-Id: I25e3599a37d720cbcf70ea13ab30234e54637d53
2014-09-25DOCX drawingML filter: avoid fake rotation on vertical flipMiklos Vajna3-1/+15
This also improves positioning a bit, in the changed testcase the perfect position would be 211.663888889, and reality is now 210 instead of 208 (100th millimeters). Change-Id: I5226f2165224a8bbfebfd11d9c612f72d83b8c69
2014-09-25Resolves fdo#84283: Export to PDF with footnotes in tables crashJulien Nabet1-1/+5
Don't crash when there's no rectangles Change-Id: I7e713025cacd449f708176254e05d40c0929577f Reviewed-on: https://gerrit.libreoffice.org/11634 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-25coverity#1240270 Copy-paste errorCaolán McNamara1-1/+1
regression from commit 03fe839d6e76ed8b1dfb65093ab59a8904852ff6 Date: Sat Sep 20 15:41:13 2014 +0200 html export: rework image output to use HTML writer Change-Id: If50d4e3cc2d19ea35d41e848cb5b9f92f356bc59
2014-09-25Revert "fdo#73151 Always open Styles&Formatting dialog in the sidebar"Stephan Bergmann3-1/+9
This reverts commit 473ed449a4b6f550dc1af47a07c6e0ef243a98b2, which made JunitTest_toolkit_unoapi fail, as AccessibleDropDownListBox.createTestEnvironment (qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java) was no longer able to find its AccessilbeRole.COMBO_BOX AccessibleDropDownListBox, which it apparently expected to find in a docked stylist (cf. DesktopTools.dockStylist in AccessibleDropDownListBox.initialize).
2014-09-25fdo#83465 writerfilter: import font of numberingMiklos Vajna2-0/+7
Change-Id: I0afe389fa6ea8b4c701232c6ecb425d5fdcde5fe
2014-09-24fdo#75757: remove inheritance to std::vectorTakeshi Abe6-46/+62
from SwLabRecs, by typedef'ing it as boost::ptr_vector<SwLabRec>. This is also a supposed fix for possible memory leaks in SwLabDlg::_ReplaceGroup(), since erasing elements did not delete pointers in the original code. Change-Id: I1c8a0393cb5bdcfca3408e9c8dc770d306f6d334 Reviewed-on: https://gerrit.libreoffice.org/11597 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>