summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/rtfattributeoutput.hxx
AgeCommit message (Collapse)Author
2014-06-17improve the inlinesimplememberfunctions clang pluginNoel Grandin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
2014-05-13sw: fix indentation in rtfattributeoutputMiklos Vajna
Change-Id: I9e9ac03a6e9eafc1aee787a95368a4b397d7375f
2014-04-22fdo#77600 RTF export: always close URL's before the end of runMiklos Vajna
In case the URL text has multiple portions, then MSWordExportBase generates multiple URL's anyway, and this helps to avoid loosing some direct formatting of the remaining portions of the paragraph. Change-Id: Ifd72741de610ce69b9ae0978aa8f9a532a3aeed2
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-02-26Resolves: #i119612# fix the order of Hebraic string are changed after..Lei De Bin
save as new .doc * when opening .doc in AOO, preserve the RTL property(property ID is 0x085A) and export. Reported by: Lou Qing le Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit daa4da26a7ba0c58c79af69fc6624729f7b22c10) Conflicts: sw/inc/hintids.hxx sw/source/core/bastyp/init.cxx sw/source/core/doc/docnew.cxx sw/source/core/text/atrstck.cxx sw/source/filter/ww8/ww8atr.cxx Change-Id: I2a1788452475e0deebf530aae41e543eae3cd45d Resolves: #i120935# Insert blank entry for RES_CHRATR_BIDITRL... and RES_CHRATR_IDCTHINT, to keep the identical res order (cherry picked from commit 919e99308395c572a7298e6db2b96df8bf7ec3fd) Conflicts: sw/source/filter/html/htmlatr.cxx Change-Id: I3c2a3513de3c146ece583ff40bf3ffb3845f971c Resolves: #i122867# HTML export - correct function pointer table... which holds the export functions for certain attributes (cherry picked from commit 5d963c0c996d50fa1033e7c2da48b5d1c3747f20) Conflicts: sw/source/filter/html/css1atr.cxx Change-Id: I7f31cfab8c654d5c549db1343d1e222f50a42c60
2014-02-12DOCX Export of 'Table Cell Redline' (like insert cell or delete cell)Adam Co
This patch adds support in the DOCX exporter for exporting the 'table cell redlines', such as 'inserted a table cell', or 'removed a table cell'. Change-Id: Ic37d2550691f1090a580dae57d597c8fd09c7ad9 Reviewed-on: https://gerrit.libreoffice.org/7877 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12DOCX Export of 'Table Row Redline' (like insert row or delete row)Adam Co
This patch adds support in the DOCX exporter for exporting the 'table row redlines', such as 'inserted a table row', or 'removed a table row'. Change-Id: If07e3496d8cab8b93b10c6ae3bcaec49369a8c2d Reviewed-on: https://gerrit.libreoffice.org/7825 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-30fdo#73550 : Fix for files having spacing issues due to missing pPr/rPrNikhil Walvekar
for empty paragraphs. Change-Id: I7e73a750982a0bd57da602379ea47c8bf9c194fe Reviewed-on: https://gerrit.libreoffice.org/7587 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-15RTF export: fix nested commentsMiklos Vajna
Change-Id: I9986855f3160ed6f5856aec9f7d33fc416962e77
2014-01-09sw: remove references to ODF_COMMENTRANGEMiklos Vajna
Fieldmarks of type ODF_COMMENTRANGE are no longer used, since we got annotation marks. Also remove two unit tests: they tested problems which are no longer possible by design (commented text ranges are no longer fieldmarks, and there is a single placeholder character for them, instead of 3). Change-Id: I14bf144c436329d2aa8c48493e5ad87db862cceb
2014-01-09RTF export of annotation marksMiklos Vajna
Change-Id: I079516ad0f30886d175748fdee19fbd71c2704f8
2014-01-08fdo#73034: Fix for Extra spacing in document.Rohit Deshmukh
Cause: - Extra space gets added in document due to default <rPr> is getting removed from <pPr>. Implementation: - The 'rPr' inside 'pPr' means the properties of the 'paragraph marker'. - In that case - the paragraph marker will have different formatting then the rest of the runs in the paragraph. - Added default rpr tag in pPr. Reviewed on: https://gerrit.libreoffice.org/7216 Change-Id: I5a1a1f251ccc5b555ea6bf3bac3e69af8b2b69b5
2013-12-20Support DOCX exporting 'Track Changes - Inserted Paragraph Mark'Adam Co
This patch adds support for the DOCX exporter to export the 'Track Changes' of type 'Inserted Paragraph Marker'. Change-Id: Iaab42c1b678bb83832f519a2f2a8fbc42b9d729d Reviewed-on: https://gerrit.libreoffice.org/7128 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-16Support DOCX exporting 'Track Changes - Deleted Paragraph Mark'Adam Co
This patch adds support for the DOCX exporter to export the 'Track Changes' of type 'Deleted Paragraph Marker'. Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Reviewed on: https://gerrit.libreoffice.org/7061 Change-Id: Ia4f5933c9058d74fe8f47fc578747be972774340
2013-12-16Export redline 'paragraph formatting changes' back to DOCXAdam Co
This patch adds support for the export of any redline of type 'paragraph formatting changes' properties that were imported from a DOCX file under the 'pPrChange'->'pPr' XML node. Reviewed on: https://gerrit.libreoffice.org/6993 Change-Id: Ieea5bbb219f444e382f22948944e038bb661ec7c
2013-12-04fdo#64232: Save font theme attributes back to the docxJacobo Aragunde Pérez
Font theme attributes were saved to an InteropGrabBag on import, and they have to be saved back to the document when exporting to docx. If the user modified the font in a text fragment during edition, the theme attribute should be discarded in favour of the font attribute. The attributes in the grab bag are processed in the last place so we can compare the font attributes with the original fonts to know if they have changed. Change-Id: I2502b4aa96213e74b46fccd1a20f99421f7cf98b
2013-11-23xub_StrLen to sal_Int32 and some optimizationsMatteo Casalin
Change-Id: I49d398ab9f086c769941767bb4431bbbb96f56b0
2013-11-05fixincludeguards.sh: swThomas Arnhold
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-10-22fdo#44689: fix for specific case of page restart-value 0Adam Co
This bug fix is for roundtripping a DOCX that has a specific 'start value' for the page numbers. In most cases LO imports it ok. However - until now - Word allowed you to start page number from 0, while LO only allowed starting page numbers from 1. This was because the 'start value' was stored in an 'unsigned int', and the value '0' was used to mark 'there is no start value'. This patch changes the way the 'start value' is stored from 'unsigned int' to 'optional unsigned int'. This way - if there is no value applied - the variable will hold NULL. However - if a value is set - it can be 0 or more. This meant also tweaking all the places that used to get this value, so that now they handle an 'optional uint', instead of a 'uint'. Conflicts: sw/source/ui/inc/break.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textsh1.cxx sw/source/ui/utlui/uitool.cxx sw/source/ui/wrtsh/wrtsh1.cxx Change-Id: I6ad9d90e03b42c58eed2271477df43c20ad6f20a Reviewed-on: https://gerrit.libreoffice.org/5681
2013-10-17sw: bool -> enum for style type in AttributeOutputBaseMiklos Vajna
For now just use what we have already: paragraph and character styles. But it enum should contain numbering styles as well in the future. Change-Id: Ifd2f918446537e04cb5ba2cd8df822c5a1f9099c
2013-10-10convert sw/source/filter/ww8/*.hxx from String to OUStringNoel Grandin
Change-Id: I8b26dcc671771f3a26c1270b94ef7e342074fa3c
2013-10-08DOCX export: ParaScriptSpace() should not contain handling of more items.Jan Holesovsky
They are not really related, so no reason to have one method for them. Change-Id: Id633c2a9e8d46c3a64dc9d5abe508a4da5ab2410
2013-10-08DOCX export: Move output of section breaks to a separate method.Jan Holesovsky
It does not really belong to StartParagraphProperties(), and also hinders re-uisng StartParagraphProperties() in DocDefaults(). Change-Id: I178f69a81fd65ad2d21916c45249357728c2629c
2013-10-04HighLight -> Highlight.Jan Holesovsky
Change-Id: I2db5102fbc441c0b79d8c28023f3e3bb5613b3cf
2013-10-04Implement DOCX export of paragraph outline levelMiklos Vajna
Change-Id: I5648454d50f1df61962fa1516ea62aee5cb3777e
2013-09-29fdo#65403, fdo#65404 DOCX export/import of character highlightZolnai Tamás
Steps -Add a new character attribute (RES_CHRATR_HIGHLIGHT) -Get this character attribute via SwFont class just like background -If has highlight, then paint that, otherwise paint background -Extend UNO API -Implement DOCX export and import filter Note: By now character highlight can't be set via UI. It's a next step to add a highlight option. Change-Id: I7f81e173744bf256891487f898d06dbf372a2f88
2013-09-09Avoid using in headerZolnai Tamás
Change-Id: I1365cf183a768f17dd2d16f695a27d9710eb4daf
2013-09-08CharBrd 9.3: RTF filtersZolnai Tamás
-Use sprm:CBrc attribute for all MS filter (for ooxml too). -Extract general code to FormatCharBorder() method, it selects the border side and decides whether add shadow to the border. -RTF export has a color table, which must be filled with border colors before the actual export.temp Change-Id: Ic3ceae6e19ddc2ed5aaa8de85617f9a592289b4f
2013-09-08CharBrd 9.2: DOCX filtersZolnai Tamás
- Modify HasTextItem() method to able to get character attributes during export. (in this case RES_CHARTR_SHADOW) - Only one side of the border can be exported. Selecting order: (top, left, bottom, right) - During import set all four side and use the Word default shadow type (back, bottom-right, border width wide) Change-Id: I3e1e27a2ef2d77b397f2ca8efe578e09271bcf8c
2013-07-24MSWordExportBase: handle SfxGrabBagItemMiklos Vajna
Change-Id: Iace2abaa0e933d7f4abf2feb146698bbf299be38
2013-07-11AttributeOutputBase::RunText: String -> OUStringMiklos Vajna
Change-Id: I413f0c4a270c5246dc87c5ff4f7042bc16330ed7
2013-04-15initial RTF export of Writer textframe gradientsMiklos Vajna
Change-Id: Ida9774a41964dbeb8840e79425811993a28588af
2013-04-13sw: fix frame size of textboxes in DOCX/RTF exportMiklos Vajna
In case the frame is AutoSize and the nominal height is less than the real height, we used to end up with textboxes having height small enough that some of the content was unreadable. Instead, do what the WW8 export does and relay on sw::Frame to provide the layout size. Change-Id: I2a6cf4373c8565eef780273745a6ef27ddc65753
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-07move BulletDefinitions() to MSWordExportBase to avoid copy&pasteMiklos Vajna
Change-Id: I56b077e978a41668ea274f1e12440d44af80b66f
2013-04-07export RTF_LISTPICTURE and RTF_LEVELPICTUREMiklos Vajna
Change-Id: I5aac0e49013ce0f4b2e8e227bf4a6b61138884d4
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-03-28export placeholder (RES_JUMPEDITFLD) to .docx (part of bnc#779630)Luboš Luňák
Change-Id: Idbf2b1e04eebab703ba3e6c3fac8e50829833c70
2013-03-19RTF export: add SAL_OVERRIDE where overriding non-pure-virtual methodsMiklos Vajna
Change-Id: I3b94f3a9e42f43fc290ac0da27446316545466b6
2013-03-13Fix #i120928: Import Graphic Bullets of MS Word DocumentJian Hong Cheng
* sw/inc/numrule.hxx * sw/source/core/doc/number.cxx * sw/source/filter/ww8/attributeoutputbase.hxx * sw/source/filter/ww8/escher.hxx * sw/source/filter/ww8/rtfattributeoutput.cxx * sw/source/filter/ww8/rtfattributeoutput.hxx * sw/source/filter/ww8/rtfexport.hxx * sw/source/filter/ww8/rtfexport.cxx * sw/source/filter/ww8/writerhelper.cxx * sw/source/filter/ww8/writerhelper.hxx * sw/source/filter/ww8/wrtw8esh.cxx * sw/source/filter/ww8/wrtw8nds.cxx * sw/source/filter/ww8/wrtw8num.cxx * sw/source/filter/ww8/wrtww8.cxx * sw/source/filter/ww8/wrtww8.hxx * sw/source/filter/ww8/wrtww8gr.cxx * sw/source/filter/ww8/ww8attributeoutput.hxx * sw/source/filter/ww8/ww8par.cxx * sw/source/filter/ww8/ww8par.hxx * sw/source/filter/ww8/ww8par3.cxx * sw/source/ui/wrtsh/wrtsh1.cxx Graphic Bullets Fidelity Patch by: chengjh,<chengjh@apache.org> Found by: chengjh,<chengjh@apache.org> Review by: Fan Zheng,<zheng.easyfan@gmail.com> Conflicts: sw/inc/numrule.hxx sw/source/filter/ww8/writerhelper.cxx sw/source/filter/ww8/wrtw8nds.cxx Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197 Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2013-01-30sw: handle RES_FILL_STYLE/GRADIENT in AttributeOutputBase::OutputItemMiklos Vajna
So that later in doc/docx/rtf export gradient background of textframes can be handled. Change-Id: I8f79cd0b63231c0551fc85c5cd1c06f5511326f1
2012-11-30re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Oliver-Rainer Wittmann sw34bf06: #i117783# - Writer's implementation of XPagePrintable - apply print settings to new printing routines http://svn.apache.org/viewvc?view=revision&revision=1172115 sw34bf06: #o12311627# use <rtl_random> methods to create unique ids for list styles and list ids http://svn.apache.org/viewvc?view=revision&revision=1172112 sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> - clear list structures completely http://svn.apache.org/viewvc?view=revision&revision=1172122 i#118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge as Java Mail is not used. http://svn.apache.org/viewvc?view=revision&revision=1197035 Patches contributed by Mathias Bauer cws mba34issues01: #i117718#: provide filter name in case storage of medium does not allow to detect one http://svn.apache.org/viewvc?view=revision&revision=1172350 cws mba34issues01: #i117721#: directly provide parameters retrieved from SfxMedium http://svn.apache.org/viewvc?view=revision&revision=1172353 gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1396797 http://svn.apache.org/viewvc?view=revision&revision=1397315 cws mba34issues01: #i117723#: convert assertion into trace http://svn.apache.org/viewvc?view=revision&revision=1172355 cws mba34issues01: #i117699#: keep layout alive until swdoc dies http://svn.apache.org/viewvc?view=revision&revision=1172362 cws mba34issues01: #i117943#: missing color attributes in RTF clipboard http://svn.apache.org/viewvc?view=revision&revision=1172363 Patch contributed by Henning Brinkmann imported patch i#103878 http://svn.apache.org/viewvc?view=revision&revision=1172109 Patches contributed by Michael Stahl sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes http://svn.apache.org/viewvc?view=revision&revision=1172119 Patch contributed by imacat Fixed the Asian language work count. http://svn.apache.org/viewvc?view=revision&revision=1241345 Patch contributed by Pedro Giffuni i#20878 - Add comment with BZ issue for reference. http://svn.apache.org/viewvc?view=revision&revision=1244517 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 add writerperfect dependency.
2012-08-10Bin RtfAttributeOutput::WriteHex(sal_Int32 nNum)Julien Nabet
Change-Id: Ibeb903c03a9c4c8638985847f527ebfa7c2756ce
2012-08-05Bin OString RtfAttributeOutput::WriteHex (unusedcode.easy)Julien Nabet
Change-Id: I6c76d43319aec669982a9694e7f98e5ae1d1a4de
2012-07-27add RtfAttributeOutput::FlyFrameOLEReplacementMiklos Vajna
This extracts ole replacement code from FlyFrameOLEMath() and makes FlyFrameOLE() use it as well, as the later didn't write png replacement, just wmf one. Also remove FlyFrameOLEData(), which is now unused (it was only used by math, but math export returns earlier). Change-Id: I5e88708cdad1468ccbc5c3c8bb77521785822832
2012-07-27implement import/export of RTF_MMATHPICTMiklos Vajna
to be compatible with readers not understanding RTF_MOMATH Change-Id: I8d6a28b03b740da372558f7aa245592be6ac70b9
2012-07-25export RTF_M{OMATH,R,F,FPR,TYPE,NUM,DEN,MATH}Miklos Vajna
Change-Id: If717d5d3b2179210516eec61959af0afa8b38319
2012-07-18implement export of RTF_ATNREF, RTF_ATRFSTART and RTF_ATRFENDMiklos Vajna
Change-Id: I829ec1fbca990f3d42121270f0bf3647dbd08a30
2012-06-27fdo#48335 RTF export: avoid fake page breaks on page style changesMiklos Vajna
The problem was that a page break has been always exported when the page style changed -- but in case the page style changes just because of "first page"-like styles, we don't need that. Change-Id: I15527c8d3a2d1c441b4817cf94d61ea68dc5f92c
2012-06-26fdo#48335 RTF export: don't try to end not started runsMiklos Vajna
Change-Id: I022556acd0891cf24963d667d34f366496453630
generated by cgit (git 2.34.1) at 2024-07-20 00:10:08 +0000