path: root/sw/source
AgeCommit message (Collapse)AuthorFilesLines
2015-12-15sw: replace OUStringBufferMichael Stahl1-5/+2
Change-Id: Iebb4ac4a7307bb8482ca735096503da03448fee7
2015-12-15sw: move ProgId parsing to DocxExport::WriteOLEObjectMichael Stahl3-95/+105
Change-Id: Ieb308d717aa661fa51bd1b9dd3d0a12ca61337c1
2015-12-15tdf#96125 Fix broken Writer paragraph text-to-text alignment feature.Mark Hung1-1/+1
Revert "Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue." This reverts commit b14861e1dfb9f83d26d6032ae96b664845528f2a. Conflicts: sw/source/core/text/itrpaint.cxx Change-Id: I4b7f7437014032566227f745e5e81b6a01ba022f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Christian Lohmaier <>
2015-12-15fix paint table border in DOUBLE_THIN styleaqcoder1-0/+18
it always paint partial table border which have line style of DOUBLE_THIN. Becouse the partial of the border line is out of the invalid window rect. so, we extend it. Change-Id: I9d95ca71a96cfa869c68d9d2200f29c7cd447eca Reviewed-on: Tested-by: Jenkins <> Reviewed-by: jan iversen <>
2015-12-15tdf#96113 sw: don't overwrite fo:background-color on ODT frame importMiklos Vajna1-1/+1
The situation is similar to commit 79fb61efb847405fa47235002b52ee8efad5e339 (tdf#92379: svx: don't overwrite fo:background-color on ODF import, 2015-08-21), except that here text frames had the problem of loosing colors when transparency is set. Fix the problem by informing getSvxBrushItemFromSourceSet() about if we're in XML import or not. Change-Id: Id1adf60b14a3762f0a2a43c49caeed9f6ea039be
2015-12-15Bin silly 'STATIC DATA' commentsTor Lillqvist3-4/+0
Change-Id: I50e3772b7b479d2cf1eb644c7334d0f987874ccb
2015-12-14Move var decl to where it gets actually usedStephan Bergmann1-18/+20
Change-Id: I8f9e74f7fbbff055c67cafba5d534db4635e5399
2015-12-14DOC export: fix writing multiple smart tagsMiklos Vajna1-2/+2
No testcase as our importer doesn't read this structure, but Word complained about this. Change-Id: I91f947233802ea6fb103c32fd774bad09c56764e
2015-12-14DOC filter: mark SmartTag support non-experimentalMiklos Vajna1-28/+18
And also relax two import conditions, as it turns out Word accept those. So instead of checking for each offset/length one by one, only check once. It's now as good as the DOCX one, I believe. Change-Id: I1890ef61fdbbd2ab6facaf3e787f75b791adcfdc
2015-12-14Related: rhbz#1289394 always provide the screen area the tip applies toCaolán McNamara2-11/+12
this will make it easier to implement native help tips Change-Id: I984dfadaf02e9b7bf542ba82cf070911c89cb699
2015-12-14DOC filter: tokenize PlcffactoidMiklos Vajna2-2/+11
Change-Id: Icef8c521d6a0ad1ee1fa1eadf2e472910c9193f2
2015-12-14DOC export: write propBags in SmartTagDataMiklos Vajna3-0/+33
Change-Id: I1d1f8aa28438209fbe3258b4b4418fcdfaabf78c
2015-12-14DOC export: write stringTable in SmartTagDataMiklos Vajna1-3/+18
Change-Id: I05eda6067308119a388238eed356531851000691
2015-12-14DOC export: write factoidTypes in SmartTagDataMiklos Vajna3-1/+61
Change-Id: I30ba25e035fae08c06b17e2bafcb8a1147d4e12d
2015-12-14DOC export: write SttbfBkmkFactoid structureMiklos Vajna3-2/+25
This contains the name of the bookmarks, except that factoid bookmarks don't really have names... Change-Id: I0fe3b983edf206d51e4d1cf4a66919fce0167738
2015-12-14DOC export: embed factoids when writing factoid bookmarksMiklos Vajna2-0/+5
Change-Id: Ibefc4b908c752a6256b168b4045afb400ba8b17a
2015-12-14tdf#91083 - .doc: emulate table kept-with-next not splittingJustin Luth1-1/+1
An .odt table can “keep with next paragraph”. This means that the entire table may shift to the next page and all the rows will keep together as the table attempts to stay on the same page as the following paragraph. There is no “keep with next” property for .doc tables, but each row CAN be kept with the following one. When exporting an .odt file to .doc, setting each row like this will keep the text flow similar to the original .odt's layout. This commit only hinders the table from splitting - it does not actually affect keeping with the following paragraph. This functionality already exists in the code, but was broken by a variable that “changed meaning” almost as soon as the functionality was introduced. A followup commit will deal with "full page" situations when the kept sections are too large to fit on a single page and so the table should split instead of start a new page. The only situation that can't be handled nicely is a single table kept-with-next that spans more than one page. Such tables ought not be marked as keep-with-next anyway. Change-Id: I401772b3fa2e329b7b0890e67639cbca8c845206 Reviewed-on: Reviewed-by: Justin Luth <> Tested-by: Justin Luth <>
2015-12-14tdf#93837 Convert MN_PPREVIEW_POPUPMENU to xmlMaxim Monastirsky1-2/+1
Change-Id: If490e8523dbedabdf4124b1bd1a5ba08678dc06e
2015-12-13tdf#93837 Convert MN_TAB_POPUPMENU to xmlMaxim Monastirsky2-4/+2
Change-Id: I8bf4557094bc32ad58760e822689c3f1d5f33c8f
2015-12-12TyposJulien Nabet2-2/+2
Change-Id: I7a161afb520c3f26be0d5846a3ef2300c558a7d2
2015-12-12coverity#1341876 Untrusted loop boundCaolán McNamara1-2/+9
Change-Id: I5191a48d3cadc8b9e4c1cc5f4ea99adb0071002f
2015-12-12tdf#36722: Enable footnote separator line style NONEOliver Specht1-1/+1
adds detection of css::table::BorderLineStyle::NONE to the LineListBox and stops painting NONE style lines Change-Id: Ib24fa25a9e3e3ae685f2000685f01cae42d1653f Reviewed-on: Reviewed-by: Oliver Specht <> Tested-by: Oliver Specht <>
2015-12-12replace homegrown map with std::map<>Bjoern Michaelsen1-104/+41
Change-Id: I5f35e0aeb6cef5920891eaa338c1d9b29e0ce554
2015-12-11use preincrement here for graceBjoern Michaelsen1-1/+1
Change-Id: I7141510fbda1158511698f73c48274008f0a41dc
2015-12-11add test for UNO writer style families ...Bjoern Michaelsen1-8/+7
... and fix the breakages it finds. Change-Id: Ibc7289cc0cd7fb5648d686bd55afff9016f58b3b Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Jenkins <>
2015-12-11tdf#96075 Frame alignment buttons not using correct tooltipsSamuel Mehrbrodt2-28/+17
Tooltips change on state change, and they were taken from another source. Unify this to reuse the existing strings from the uno command. Change-Id: I8ff6fc43bc0469f15c9e930695d950f6d664bfdf Reviewed-on: Reviewed-by: Samuel Mehrbrodt <> Tested-by: Samuel Mehrbrodt <>
2015-12-11tdf#69977: uno::Sequence is expensiveNoel Grandin17-119/+111
when used as a mutable data-structure. Plain std::vector halves the time taken to display the chart dialog Create a class to represent the std::vector we are going to be passing around, and move some of the utility methods into it to make the code prettier. Also create an optimised append(&&) method for the common case of appending small temporaries. Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485
2015-12-11DOC export: register the smart tag offsets/locations in the FIBMiklos Vajna1-1/+17
With this, a reader can actually find them in the table stream. Mark as experimental till all the related structures are written, so Word doesn't consider the file corrupted. Change-Id: I3f997dcdb14557b1f8eed78bd873b121068d9712
2015-12-11sw: clean up no longer needed SwViewShell::isTiledRendering()Miklos Vajna9-31/+30
Change-Id: Icd719c461613f8c59cad81b256678307f69974e1
2015-12-11tdf#34774: enabled double click in input list field dialogOliver Specht2-0/+8
Change-Id: I4a08016859b0afa95d8bf3a42be41bbe72c31570 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Oliver Specht <> Tested-by: Oliver Specht <>
2015-12-11tdf#33338: enable autocaption position 'above' for all object typesOliver Specht1-3/+1
Change-Id: Idf82c1d7f1b5e149c3796f5999fd09cf2c31299f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Oliver Specht <> Tested-by: Oliver Specht <>
2015-12-11tdf#34375: resizing of drawings with shift key fixedOliver Specht1-1/+1
Change-Id: Ibd3b0e76484cf22a8d36f457f4b3c398ed1b85d1 Reviewed-on: Reviewed-by: Oliver Specht <> Tested-by: Oliver Specht <>
2015-12-10mailmerge: Make this more readable, and prefer a constructor over assignment.Jan Holesovsky1-4/+5
Change-Id: I9296964902c3490c73ecf7ee9c2a3623c195c386
2015-12-10DOC export: write smart tag locations to table streamMiklos Vajna3-0/+89
With this, the PlcfBkfFactoid and PlcfBklFactoid structures are written correctly to the table stream. Similar to the DOCX export, write a subset of RDF graph statements as smart tags in the resulting document. Change-Id: I1e86d5361af2af5501493bae9c386ea55444d556
2015-12-10More loplugin:nullptr automatic rewrite (within templates)Stephan Bergmann1-2/+2
Change-Id: I9bc06cfb5eeb38fd7ae7fb25f876ea9f96e4a65a
2015-12-10tdf#91665 l10n: replace string lists - by separate stringsJuergen Funk2-73/+157
Convert the stingarray in resource strings. A lot of need a translation in other language Improve a lot of stuff Change-Id: I1c97949fa3a3de17efe0a358370b5a7b6a772686 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2015-12-10sw: accept a const text node in SwRDFHelper::getTextNodeStatements()Miklos Vajna1-1/+4
It's an implementation detail that the used UNO API needs a non-cost text node, even if only read methods are called on the wrapper object. Change-Id: If15eaca48339f1531fd54da3422a6b7c41eb48f7
2015-12-10writer: Defer update, until post first render to avoid flicker.Michael Meeks2-1/+10
Change-Id: Ib16f5b345901adc7036a8a90d0f46aa3499d66ae
2015-12-10tdf#94816: fixed some problems in the mail merge wizardOliver Specht6-10/+13
Some disposeAndClear have been added as calling dialogs in the wizard like select address list, new address list, match fields crashed in dbg build in shutdown because the dialogs were still alive. The wizard is now deleted on Cancel which didn't work anymore. The timeout of the preview control of page 5 has been changed as the preview didn't even appear on Windows in a debug build The timeout handler was called after the wizard has been closed and lead to a crash. Change-Id: I9cd01f39347744bda31a312f695d27eefa077721 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Oliver Specht <> Tested-by: Oliver Specht <>
2015-12-10loplugin:nullptr: More NULL -> nullptr automatic rewriteStephan Bergmann1-1/+1
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d
2015-12-09coverity#1341777 Resource leak in objectCaolán McNamara1-0/+1
Change-Id: Ic8ca5764095699423d9a16cbbbcb7f085a006e0a
2015-12-09sw: RES_FLTR_RDFMARK always implies SwFltRDFMarkMiklos Vajna1-1/+5
Change-Id: Ic437cdbc6a21e84a0fa8f4ff68bc5d1202c9da7e
2015-12-09tdf#92623 Handle StartOfContent node for copying bookmarksJan-Marek Glogowski1-1/+9
For SwDoc::AppendDoc we use the StartOfContent node as the starting copy node to prevent merging of the first node in CopyRange and to get a 2nd node needed for CopyRange in case of single content node documents. This correctly counts StartOfContent as a non-copy node when adapting the bookmark ranges for copying. Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Björn Michaelsen <>
2015-12-09DOC import: initialize RDF metadata before importing document propertiesMiklos Vajna1-0/+18
With this, it is possible to import part of the document as RDF statements later when SwFltControlStack::SetAttrInDoc() gets an SwFltRDFMark. Previously SfxBaseModel member functions like getMetadataGraphsWithType() and addMetadataFile() failed, as they tried to find the already imported document in UCB, which failed, as the import was still in progress. To prevent that, do the same as the ODT import in XMLReader::Read(), part "RDF metadata". One trick here is the call to comphelper::OStorageHelper::GetTemporaryStorage(), which gives an empty storage. Ideally a wrapper class would be needed that works on a SotStorage, but implements embed::XStorage, but that would be only used to find that the real storage doesn't provide a manifest.rdf stream, which is always the case. So instead of writing such a wrapper, just give loadMetadataFromStorage() an empty storage, which will have the same result without writing lots of dead code. Change-Id: Id1897838b1477eee0489b706d51cb6f59898877b
2015-12-09sw: implement addition of statements in SwRDFHelperMiklos Vajna1-1/+18
With this, the only thing that blocks the DOC import to handle smart tags is the lack of RDF metadata initialization in the filter. Change-Id: I33ab74c7d6ceaac42cc94fdf0b1dfcb0eaf61ab4
2015-12-09sw: handle RDF mark in SwFltControlStack::SetAttrInDoc()Miklos Vajna3-2/+33
Change-Id: I13e510e305c4aa24c37b1c25b4c3116ef3f06a8a
2015-12-09SwWW8ImplReader::GetSmartTagInfo: read from SmartTagDataMiklos Vajna3-4/+39
With this, SwWW8ImplReader::Read_FactoidBook() gets exactly the matching key/value strings for the smart-tag bookmark, so now only SwFltControlStack has to store the item and process it. Change-Id: If799d7d0bd1d69ddf8325d05f2b7c6e55112bba2
2015-12-09sw: initial SwFltRDFMarkMiklos Vajna2-0/+67
So that SwWW8ImplReader::Read_FactoidBook() can put this as an attribute on the import stack instead of CntUInt16Item. Change-Id: I1753bc4a94f49332a945a4c6de7f58768d35ff16
2015-12-09tdf#94377 RTF export: support comment formattingMiklos Vajna4-10/+27
The core of this change is that RtfAttributeOutput::PostitField() now uses WriteOutliner() to handle comment text, instead of trying to output the plain text as-is. To have working roundtrip of the comment text, a few more changes are needed: 1) When emptying the Styles buffer, also empty the StylesEnd one. 2) Annotations don't want a trailing \par, so don't write one for the last paragraph. 3) Inform the MSWord_SdrAttrIter about where the editeng content will end up, and make WriteOutliner() accessible outside RtfSdrExport. Change-Id: I9cbcf4ce5dc3a099d310c6f321ea8e52f8644f9b
2015-12-09Use unique_ptr out-arg to in SfxBindings::QueryState to avoid mem leaksStephan Bergmann2-13/+7
Change-Id: I35df02de675068478a36ef05266ffc2d3054b07f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Stephan Bergmann <>