summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-12-12DOCX: when writing a group shape, require wpgMiklos Vajna
Change-Id: I046c778cd998582446e96ac1e55f3e2da1e61081
2013-12-12DOCX export: declare wpg namespaceMiklos Vajna
Change-Id: If204d95142826d4cc194aed8a97c68a121187b8a
2013-12-12Do not use C++-UNO internal static_type functions in client codeStephan Bergmann
...use cppu::UnoType instead. Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31
2013-12-12oox: allow a callback to be registered for shape text DML exportMiklos Vajna
Change-Id: Ice4dea8da117f61d947ad14ebbfccae0d2ed94df
2013-12-12Add new 'SwRedlineExtraData_FormattingChanges' class for formatting changesAdam Co
This class is for use in the 1st step with the DOCX importer\exporter, to hold information about 'track changes' that relate to formatting of text portions. Change-Id: I3f5231d0e49e0b493ec22efaac1c90b0d415f3ea Reviewed-on: https://gerrit.libreoffice.org/6901 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-12Don't hold css::uno::Type instances by pointerStephan Bergmann
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the arrays of such need to be initialized dynamically anyway, also change their name members to proper OUStrings while at it. Plus some const clean-up. Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
2013-12-12DOCX: fdo#72560 better solution for exchange alignment for RTLFaisal M. Al-Otaibi
Change-Id: I39462fc722a58b32e8829a9f2005a411871f255d
2013-12-11fdo#60698: Merge fastsax and sax_shared into expwrapMarcos Paulo de Souza
Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4 Reviewed-on: https://gerrit.libreoffice.org/6967 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2013-12-11fdo#64232: export w:themeFontLang setting to docxJacobo Aragunde Pérez
We store the values of themeFontLang tag to the document grab bag so we can save it back to the document on export time. Added unit tests to check that the attribute is properly set back and also that the theme fonts are correctly applied to the text. Change-Id: Ia54c513796ba38a571396ca7b72dfd28463c15fd
2013-12-11DOCX textframe export: when in experimental mode, use DML instead of VMLMiklos Vajna
Change-Id: Idf6a849b08fd76841d0dd5555e75b698e5d730cb
2013-12-11Add DocxAttributeOutput::WriteDMLTextFrame that can export a textframe in DMLMiklos Vajna
Change-Id: I9600d4fffc4cde7046b43729f95d5a96aa1cdf38
2013-12-11VML export: factor out TextFrame handling code to its own methodMiklos Vajna
Change-Id: I2158aed3dfe71370add52759976232647286fa7e
2013-12-11Revert "Don't hold css::uno::Type instances by pointer"Stephan Bergmann
This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now: Ach, old GCC doesn't like plain string literals to initialize members of OUString type... Change-Id: I50563a00406259bb5d41831e2a2796762450d097
2013-12-11Don't hold css::uno::Type instances by pointerStephan Bergmann
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the arrays of such need to be initialized dynamically anyway, also change their name members to proper OUStrings while at it. Plus some const clean-up. Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
2013-12-11DOCX export: write mc:AlternateContent around drawingml shapesMiklos Vajna
Change-Id: Ie4cacea61f84aa1e24df9fc39b9467d08f9ca4f0
2013-12-11WaE: unused variables [loplugin]Tor Lillqvist
Change-Id: I7856fd7417ed2ae19774bd20d48b4a5232301728
2013-12-11Removed 'XML_lang' tag being auto-written in redline caseAdam Co
When there was a redline in a DOCX file that relates to formatting - the DOCX exporter automatically assumed that if the 'after' properties contains an 'XML_lang' node - then also the 'before' properties should also contain the 'XML_lang' node - and this is wrong. Change-Id: I383e10c11c228dd6847fd8eecb35c5c23c5f955e Reviewed-on: https://gerrit.libreoffice.org/6900 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-11moved 'mergeTopMarks' out of 'WriteCollectedRunProperties'Adam Co
The reason for this - is that the function 'WriteCollectedRunProperties' needs to be used by the redline exporter (to export collected 'redlined' properties) - and the 'mergeTopMarks' is not needed there. Change-Id: I10063b2f28adab53949b4d9de8acd0dab66553b0 Reviewed-on: https://gerrit.libreoffice.org/6899 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-11sw/qa/tiledrendering/tiledrendering.ui is not for translationAndras Timar
Change-Id: I74122f5a1fb48f9615f7364d3ee5015f0d7e72a6
2013-12-10Related: #i33737# correction: assure the selections does not...Oliver-Rainer Wittmann
start/end inside a table while end/start of the selection is outside the table (cherry picked from commit 382814ccb30bfe71f093e55e23802447caca235d) Conflicts: sw/source/core/crsr/swcrsr.cxx Change-Id: Ibcbd9b18538ce04abfae11e75b30d6897a62e268
2013-12-10DocxTableStyleExport: whitespace fixesMiklos Vajna
Change-Id: I2888be395e137ebc1f25cdc13626ec4265461523
2013-12-10DOCX shape export: when in experimental mode, use DML instead of VMLMiklos Vajna
Change-Id: I8a07b74c047dfa2c4b1096e3cd3ace3bd5f93d0a
2013-12-10DOCX export: add method to write wp + dml markup for an SdrObjectMiklos Vajna
Also, factor out common code from FlyFrameGraphic() and WriteDMLDrawing() to lcl_startDMLAnchorInline() and lcl_endDMLAnchorInline() to avoid code duplication. Change-Id: Ic1bed48e45b1cdb2d061ed7099206c0b1aa4f9f7
2013-12-10fdo#70198: sw: don't truncate Time values on 32bit platformsMichael Stahl
SwDoc::SetFixFields() uses sal_uLong to store Time.GetTime() which needs 64 bits. Also fix same problem on Time fields in HTML import. (regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a) Change-Id: I5d0388cbc364e1f9dfb60ff9e83c7d2f101c69d8
2013-12-10DOCX export: add a method to write an XShape as drawingmlMiklos Vajna
Change-Id: Ibe6bee0d8fc251c47a362e71dcfd4543da28f3c4
2013-12-10DOCX export: number drawingml objects from oneMiklos Vajna
For some reason for drawingml shapes Word doesn't like the "0" identifier. Let's do the same trick that works for font identifiers already. Change-Id: I30ebc33ab927becc1bbf146577eb36b914bf7edb
2013-12-10Don't bother with the red/green rectangle on non-desktopTor Lillqvist
It just makes it harder to debug low-level drawing stuff if LO insists on drawing stuff by itself all the time while idle... Change-Id: Ied22aa5c94fbe43ef34063ee865223cc7467a3d3
2013-12-10i#23357 RTF export: fix crash on groupshapesMiklos Vajna
Change-Id: I3329663060aeb06ac552bd5d1615d19efe160091
2013-12-09fdo#54938: Convert sw to use cppu::supportsServiceMarcos Paulo de Souza
Change-Id: Ic27bf31e5eb991ccceb8b97713d1e50a736709c8 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-12-09GetBasic and m_pBasic are unusedCaolán McNamara
which is probably a good thing because it is zeroed in the copy ctor which looks rather dubious Change-Id: Ia082601982aaea5df92cf7aa9724cbe187716e0c
2013-12-09drawingml import: handle w:b (found in docx groupshape textboxes)Miklos Vajna
Change-Id: I105d068a6b8d454fac963cd30f6f812cf2b96170
2013-12-09drawingml import: handle wps:bodyPr inside a groupshapeMiklos Vajna
Change-Id: I1f059ae653ab13a7c867f77b2b1b4265e9e71b4e
2013-12-09drawingml import: read w:colorMiklos Vajna
Change-Id: I6ae7ea8b58e262e5b6226f8f789e39ebcc6077ca
2013-12-09fdo#72488: Broken text when showing visible spaceKhaled Hosny
Turning on showing nonprinting characters replaces the space with bullet character, but still draws the text with the original kern array, this works fine until there are ligatures involving the space character as the number of glyphs after replacing the space with the bullet will be different and the kern array will be completely off. This is a hack that gives up on replacing the space with a bullet when its width is zero, not sure if it would interfere with other legitimate uses. Change-Id: I5ed17132ead7cd141a4e8b0372e37541c163be30 Reviewed-on: https://gerrit.libreoffice.org/6995 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-09RTF export: unused forward declarationMiklos Vajna
Change-Id: Ida8e4d9e9b6ea7e1009b8cf617363d31e895a5a2
2013-12-09abi#10201 RTF export: fix crash when handling table::BorderLineStyle::NONEMiklos Vajna
Change-Id: I811820c0d550ce24ad2180a8917ef0087968c30b
2013-12-09Fix for Column Break if it appears in w:r which is not the first run.Vinaya Mandke
Explicitly ended paragraph when the column break appears in a run (which is not the first run in the paragraph), as Writer adds a column break only for new paragraph. Also the created paragraph must have the same para properties as the earlier one. Hence avoided pushing new para properties if paragraph is split to adjust a col break. Added UT for the same. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/6953 Change-Id: If7d503b7a4bfab31f40ceb0119876e5909252b2f
2013-12-08put comment for the previous patch.Faisal M. Al-Otaibi
Change-Id: Id9cee84530d00d6d2528d038464e885e1286dfe5
2013-12-08docx: fdo#44029 export the right alignment when locale are RTL.Faisal M. Al-Otaibi
Change-Id: I771eb0d0a90816f0c4cbd66cfcb755f67455bb9b
2013-12-06sw: fix more cases of SwDrawTextInfo::GetText()/SetText() not restoringMichael Stahl
Change-Id: I9625958e4139dd595f269ebac72b9a037118a9f5
2013-12-06fdo#71714: sw: fix small capitals renderingMichael Stahl
So f22006dc6ac34a35a060e15466cf6b2d2058617d changed the SwDrawTextInfo to contain not a pointer but an actual OUString, and then d908422f5763ed8ea79af81336ca564f46435baf changes SwSubFont::DoOnCapitals() thus: - const XubString& rOldText = rDo.GetInf().GetText(); + const OUString& rOldText = rDo.GetInf().GetText(); rDo.GetInf().SetText( aTxt ); That used to _copy_ the string, but now it just references the member, and so the SetText(aTxt) below overwrites rOldText. Change-Id: I06d7ee7084c15d88b3e748ef18877b62e79bdd0e
2013-12-06sw: remove unused zorder data from bugdocsMiklos Vajna
Expecting that the shapes are on the drawpage in the same order as they are in the file and providing zorder info at the same time doesn't work. Either using names is required or the simpler way is not providing zorder info. Fixed earlier bugdocs not to provide zorder info, so when zorder will be handled, these tests will still work. Change-Id: I771b0574eba489322998c84a60d5acb94fd09189
2013-12-06DOCX import: fix import of wpg shapes after a wps textframeMiklos Vajna
Change-Id: I30844062bf4d4f15ca70d9f441f0505fa4f26bb7
2013-12-06DOCX import: fix relativeFrom=page, align=right handlingMiklos Vajna
Change-Id: I9c1df594457a8ccbbebf4ede61cc3a637ecc7023
2013-12-06DOCX import: handle groupshapes inside wpg elements (groupshapes)Miklos Vajna
Change-Id: Icb44f91219f75103f469f38f96d843b8e8251e92
2013-12-06fdo#71784: Invalid Sections getting added to the document after RTTushar Bende
Description: There was a problem for some documents, during export Invalid sectPr were getting added. The root cause was faulty calculation of PageDesc value. This was the reason for increasing number of pages in RT doc. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I0700c735545614730d26be187d9047fd20ebf134 Reviewed-on: https://gerrit.libreoffice.org/6813 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-06Default OMultiTypeInferfaceContainerHelperVar equalImpl parameterStephan Bergmann
...and assorted OUStringHash clean up Change-Id: I779904e1275e8df88f567beb388d1d11af9e9671
2013-12-06Santa Claus brings fixed background color of textframes in drawingml importMiklos Vajna
Change-Id: Ie2b6885aae5e26c3d29d372da730837cb7dc97ce
2013-12-06fdo#71784:Preserve prop "allow row to break across pages" during exportTushar Bende
Description: If in original doc for table if "allow row to break across pages" is checked then during export it used to write <w:cantSplit w:val="false"/> in trPr which was causing problem that all the cell data was getting displayed on same page. Change-Id: I5a20976ca91099de191eb1e2a7290b96dcdc6777
2013-12-06Get rid of DECLARE_STL_USTRINGACCESS_MAPStephan Bergmann
Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c