summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-06-28sal_uInt16 to sal_(u)Int32Matteo Casalin
Change-Id: I20c3715bcfb5212977699d661fd3acf1be28499f
2014-06-28Micro optimizations: pre-increment and constifyMatteo Casalin
Change-Id: Icefef960e1ecc0f6529e8f1b5f903c676b62e154
2014-06-28sal_uInt16 to SwTwips and delay downcastsMatteo Casalin
Change-Id: I4a8a05905a779bb8c7fad830c049d1e403d79711
2014-06-28sal_uInt16: constify and avoid unneed castMatteo Casalin
Change-Id: I78fe90f24805c5bca3548cf4c005d2c44574aa5c
2014-06-28sal_uInt16 to shortMatteo Casalin
Change-Id: I6d39bc1a1132972eece99f1ea05cb25962805351
2014-06-28Return value (sal_uInt16/size_t) is never usedMatteo Casalin
Change-Id: I6342a407878e24e671615b0c12a9badcfc774f37
2014-06-28sal_uInt16 to size_tMatteo Casalin
Change-Id: I8b045cf44b3e62616c8c3e0a896524af13310dd3
2014-06-28sal_uInt16 to sal_Int32 and remove/fix commentsMatteo Casalin
Change-Id: Icf49a339fb23d6217dd0bc41c9012233717ad808
2014-06-28sal_uInt16 to size_tMatteo Casalin
Change-Id: Ib4a3f8401e2ddd4cb76c76c968151799c86b5845
2014-06-28sal_uInt16 to size_tMatteo Casalin
Change-Id: I5fe887cdb800a5f5cc6f6277b52a5f02c1b9bb84
2014-06-27fdo#80167 RTF export: don't loose page breaksMiklos Vajna
DOCX export tries to write accurately both <w:br> and <w:pageBreakBefore>, while DOC/RTF prefers just the page break before paragraph attribute. Given that these later two exporters are not adapted to write their equivalent of <w:br> at all, add a virtual method to determine if writing page breaks as "page break before" is preferred or not, that'll give the expected RTF export result. This conditionally reverts commit a31fbb53dba76736b37213b98b64937f05929a67 (fdo#74566:DOCX: Preservation <w:br> tag for Break to Next Page, 2014-02-06). Change-Id: I4a5dd295b07739a570cd8cc6709561e64d031273
2014-06-27identation fixesMiklos Vajna
Change-Id: Ie9a95b99e1f6de65985b295076f5f89e5d99ec93
2014-06-27OSL_ENSURE->assert where guaranteed deref followsCaolán McNamara
Change-Id: I6e007cc3a9fd222c1c1381c8b4f890966c05cbab
2014-06-27Related: #i78498# Do not keep OutlineLevel attribute at paragraph...Oliver-Rainer Wittmann
when a Paragraph Style is assigned. (cherry picked from commit 6a1564284d90c7e175f7848520924f7f6a5884b7) (cherry picked from commit 4a381b1124f60b76cabb558fa24827448a1caab0) Conflicts: sw/inc/doc.hxx sw/inc/editsh.hxx sw/inc/fmtcol.hxx sw/inc/ndtxt.hxx sw/source/core/attr/format.cxx sw/source/core/doc/docfmt.cxx sw/source/core/doc/docglbl.cxx sw/source/core/doc/doctxm.cxx sw/source/core/doc/fmtcol.cxx sw/source/core/edit/edfcol.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/undo/unfmco.cxx sw/source/core/unocore/unosett.cxx sw/source/core/unocore/unostyle.cxx Change-Id: Ifa1214876df296f2e1210cc4a35f2df67f9f6bc4
2014-06-27SwTextBoxHelper::create: handle TextAutoGrowHeightMiklos Vajna
Without this, in case TextAutoGrowHeight is set before TextBox, the textbox of the shape won't have automatic height. Change-Id: I2ebf77eacbe1f1d10ccf64ef833c39ee965245d3
2014-06-27remove SFX_APP() macro that was a mer wrapper for SfxGetApp()Norbert Thiebaud
Change-Id: I480a789c767dd671775c9d70d96bf71908f21f5b
2014-06-27fdo#78758: sw: RTF export: don't export multiple \fldrst for one hyperlinkMichael Stahl
Ensure that we export only one \fldresult per hyperlink by doing that in StartURL() and EndURL(); the TextINetFormat() is called once per text portion. This shouldn't cause problems as there can't be anything between the end of the \field group and the start of \fldresult anyway. Replace the annoying call to EndURL() from EndRun() with a special case in EndURL() to store things in the right buffer (hopefully). (somehow this is regression from c4498251cb7181a9f272b0720f398597c0daef09) Change-Id: I209ea7a384fb1cb5d1505a70ecc4a4536bbf26a2
2014-06-27sw: avoid calling convertToString() with unsupported encodingsMichael Stahl
Change-Id: If0b589c884cd306ca7c94d3366af66276a120176
2014-06-27SwFlyFrm::Format: inform our custom shape about size changes if neededMiklos Vajna
This adds support for the following scenario: - Shape has no editeng text, but a textbox - Shape has automatic size - User edits the fly frame (serving as the textbox of the draw shape) and expects that both the shape and the textbox gets resized accordingly Note that this way we can signal our size request for the textbox, and the custom shape takes care of resizing the shape in a way, so that after the resize, the text area counted from the custom shape geometry will be exactly what we requested. (I.e. just asking the shape to have the same size as the fly would work for rectangle, but not e.g. for triangles.) Change-Id: I1e7efd00db52cf28481f6821ea6949f748b855e7
2014-06-27CppunitTest_sw_ooxmlimport: use exact value from bugdoc in testMceNested()Miklos Vajna
Bugdoc has 2514600 EMU's as the vertical position, use that, and allow larger values, as originally this was 0, and we have additional 2 mm100, probably due to rounding errors. Change-Id: I7495a0f9e913332a24d0a830b0252ecb6a39d806
2014-06-27loplugin:unreffun: also warn about redundant redeclarationsStephan Bergmann
Change-Id: I9a812220b58cf6da00d854e65794f7c673ab239d
2014-06-27DBG_ASSERT->assertCaolán McNamara
Change-Id: Ic2933fc686d3bb030291756bd94127ee7583c833
2014-06-27fdo#80097 : tblBorders and tcBorders are not preserved for the table.Ravindra Vidhate
When we have multiple tables inside a table, the tblBorders and tcBorders of the inside tables are not getting preserved. The issue is m_aTableStyleConf is not clear when the LO starts writing the properties of the inside table. Change-Id: I30081b8a5a59614430a2279550ae7eb589cb71ec Reviewed-on: https://gerrit.libreoffice.org/9893 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-26fdo#48673 - UI: No keyboard shortcut for "Ignore All" on misspelled wordJoren De Cuyper
Also added mnemonic for "Ignore" entry Change-Id: I044fc0a718a32fe7b502d2c342ba5f09921053ec Reviewed-on: https://gerrit.libreoffice.org/9908 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-26fdo#62879 Changed wording of protected section dialogJoel
Clarified the wording of protected section dialog from "Readonly content cannot be changed." to "Write protected sections cannot be changed." Change-Id: Ic6df2d84b6cc9e87727306eff8aa0e06895cab17 Reviewed-on: https://gerrit.libreoffice.org/9905 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-26Resolves: #i125122# WW8 import: Handle nested TOX fieldsOliver-Rainer Wittmann
- only the content of nested TOX fields is imported, no TOX field itself (cherry picked from commit 1df1e98e7b6556892f546cc559e31f9fd9e00a78) (cherry picked from commit b2d0492ea85a2f96378326361421749619269b15) Conflicts: sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par6.cxx Change-Id: I29cf81df72bf548414bef06b54a691eae6a5edcd
2014-06-26drop the functional partsCaolán McNamara
appears to work without it as far as I can see Change-Id: Ibe19addeeb38f853a515aef36d6bc83d338e1c0b
2014-06-26Resolves: #i124914# reset certain language dependent pool defaults...Oliver-Rainer Wittmann
before importing a document via <SfxObjectShell::ImportFrom(..)> (used for OOXML *.docx import) (cherry picked from commit 920bf1164fe0c3d232dc0f7d476eec1660f4690e) Conflicts: sfx2/inc/sfx2/objsh.hxx sw/inc/docsh.hxx sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/app/docstyle.cxx Change-Id: Id32bd6a8ef081dd4af4d832aa42317de7f64184f
2014-06-26OSL_ENSURE->assertCaolán McNamara
Change-Id: Ib8ba49e89d03eaf3b3aae94dbbf121898ba9e8de
2014-06-26SwTextBoxHelper::syncProperty: handle TextAutoGrowHeightMiklos Vajna
This propagates the "to shape to text" property of the shape to the textbox, and the textbox is already layouted accordingly, but not the shape yet. (As the shape thinks it has no text.) Change-Id: I1fdf0d5743bcb201f112a4c5db18924210858cea
2014-06-26sw doc model xml dump: handle SwFmtFrmSizeMiklos Vajna
Change-Id: Ie1a8dbc86c9725f3d238226c166ec657722c1770
2014-06-26SwTextBoxHelper::syncProperty: handle TextPreRotateAngleMiklos Vajna
For now only the most problematic -270 case, for which we don't have a native writing direction: rotate the characters on a textportion level instead. CppunitTest_sw_ooxmlsdrexport's testFdo69636 is a reproducer for this, the document model was fine already, but with this, the layout has the rotation as well, as expected. Change-Id: Iefc56f3adcea614566aaefd41d832d9b0cdb730b
2014-06-26fdo#79940 LO crashes on opening; tries to remove a para with bookmarksVinaya Mandke
LO crashes while opening the issue file as, DomainMapper_Impl::RemoveLastParagraph tries to dispose a paragraph which has bookmarks attached. If A para finishes and a new para has not been started as yet, which means the current cursor position is outside a paragraph. In such a case move the Bookmark-End to the earlier paragraph. Added the issue file in sw/qa/core/data/ooxml/pass/ Change-Id: I62cf94718add943d042d770ab5337a0dae70d9e8 Reviewed-on: https://gerrit.libreoffice.org/9764 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-25Resolves fdo#54155: Crash when playing with a Group inside a GroupJulien Nabet
Change-Id: I89c80fca1cdc8bc88172eaf8057141d5e42a06dc
2014-06-25pagedesc: We have DelPageDesc() that takes OUString as param directly.Jan Holesovsky
Change-Id: I616f89716a6e337c647cfb880a4e675cd1b65993
2014-06-25pagedesc: Consolidate FindPageDescByName() and FindPageDesc().Jan Holesovsky
Change-Id: I18d570509cd3f3b65a19a12a9df0b1d5db901d04
2014-06-25pagedesc: It's better when MakePageDesc returns a pointer.Jan Holesovsky
This removes many uses of GetPageDesc(sal_uInt16). Change-Id: I9660e30d7fccd4336422ba03b19087321a7ae973
2014-06-25still ugly, but lets silent the warning for nowBjoern Michaelsen
Change-Id: I647e969bfc9f8b4294d3e526d8d5b11df7d7bea9
2014-06-25remove old redline save/restoreBjoern Michaelsen
Change-Id: I3165f84d44c74bca3a2d75ebf3cd681b9d5d120a
2014-06-25refactor redline save/restoreBjoern Michaelsen
Change-Id: I4840d694954a5c0419abfa4c0fbe67b756f8253c
2014-06-25Let SwTextBoxHelper::findTextBoxes() return a setMiklos Vajna
The intention was to have a container where it's fast to look elements up, and list is a linked list, so it doesn't fit. Change-Id: I3196c8dee96ecd4a6f464b74fd5141b27f1773b8
2014-06-25MSWord uses \xb for linebreaks in DB fields, take 2 (bnc#878854)Luboš Luňák
This commit also does the conversion when reading the data from a data source using the mail merge wizard. Change-Id: Ia14417507b6ddce955fec26142a42ce51f77de4e
2014-06-25remove spurious com::sun::star::util prefixMichael Stahl
Change-Id: I002a14fe0cb0cbdb4d5da51db8da6c8208cf604e
2014-06-25remove spurious com::sun::star::text prefixMichael Stahl
Change-Id: I98d2fc7de3c2d3f95fb96192da83761ac1146172
2014-06-25remove spurious com::sun::star::forms prefixMichael Stahl
Change-Id: I5c7c1d888cda7f01685bce46a6092a2c30b856f9
2014-06-25remove spurious com::sun::star::frame prefixMichael Stahl
Change-Id: Ica1291e8d115ae7a7f1e99e569c9889e2b852f8a
2014-06-25remove spurious com::sun::star::script prefixMichael Stahl
Change-Id: I66fc14d1f26da0c91a455b0f63bde31210566c2c
2014-06-25remove spurious ::com::sun::star::sdbcx namespace prefixMichael Stahl
Change-Id: I37220af64c15259ab5bcf61b324d2a73ed8f5348
2014-06-25remove spurious com::sun::star::chaosMichael Stahl
Apparently some time before inital CVS import a global search-and-replace went horribly wrong and added spurious namespace prefixes everywhere. Change-Id: I4009bc3ab4b1d4c80412f75ad0e4628a382f99f0
2014-06-25SwView::EnterDrawTextMode: refuse to edit editeng text if texbox is attachedMiklos Vajna
Change-Id: If1b3e9807414e90341199eabfa937376084c097d
generated by cgit (git 2.34.1) at 2025-01-18 09:03:36 +0000