summaryrefslogtreecommitdiff
path: root/sw/source/core/docnode
AgeCommit message (Collapse)AuthorFilesLines
2012-10-29rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:Michael Stahl1-27/+24
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-07-04replace enum SvxBorderStyle with css::table::BorderLineSyleMichael Stahl1-1/+1
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67 (cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
2012-07-04rename SvxBorderLine::SetStyle to something unambiguousMichael Stahl1-1/+1
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae (cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
2012-06-01targetted revert of minor cppcheck cleanupsMichael Meeks1-1/+1
Change-Id: I72bd86baaccb6f0604f04217046b1b523a02aa62
2012-05-25Convert SV_DECL_PTRARR(SwOLENodes) to std::vectorNoel Grandin1-1/+1
Change-Id: I384e152b89ed6951417296a5722f831f8ba7cb46
2012-05-25Convert SV_DECL_PTRARR(SwSections) to std::vectorNoel Grandin1-39/+25
Change-Id: Ie41c43dc0cb5b64240122e76df20ff1a57f8532a
2012-05-24Removed unused SfxMedium::bDirectStephan Bergmann1-1/+1
See the TODO comment in sfx2/inc/sfx2/docfile.hxx about a temporary SfxMedium ctor overload to find not yet adapted uses of another overload, to be removed again in due time. Change-Id: Ie22c33c32f8870ce6ebf6d500abc7a4e33d97183
2012-05-23add libxml forward definitions instead of direct includesMichael Meeks1-0/+3
Change-Id: I33ffca788182cd24d148614ee03c5a884baccf84
2012-05-14Convert SV_DECL_PTRARR_DEL(SwTableBoxes) to std::vectorNoel Grandin3-80/+80
I added a GetPos() method because quite a lot of code used that method and the existing code is quite tied to the precise return values of that method. Change-Id: I9af6b923d978abe758b63d835f228495c020455a
2012-05-05Resolves: fdo#49342 crash merging cells, revert conversion to std::mapCaolán McNamara2-46/+53
3af0c948254751eade9bff772b849720747c5494 868bd3b778b6c7b970c67d1dacc469967f69e551 b2e84f9a40fda7821d4e658f9102bcbc783a1ba3 7264d2767095150944ff1e6999c71be1dbdc6f83 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f The problem is that a paragraph gets added to the document after the TableBox selection is created, which changes the node ids of the following paragraphs in the TableBox but the map has used cached SttNd value as its key, so it can't recognize nodes using the new index. This worked in the old implementation because that was effectively a sorted-vector, so probably the best conversion to stl is a sorted vector Change-Id: I1143d843b872eee15b016f82b68ecc020969f1b5
2012-05-03fdo#31005 Table Autoformats do not save/apply all propertiesMuhammad Haggag1-1/+8
This change expands the number of properties supported by autoformats, mainly for Writer. Some improvements affect Calc as well (e.g. border styles are now preserved for Calc). Common: boxitem.hxx, frmitems.cxx * Added a new version for SvxBoxItem serialization that includes border styles. * Updated SvxBoxItem and SvxBorderLine serialization logic accordingly. Writer: fmtornt.hxx, attrfrm.cxx * Added serialization/deserialization logic for SwFmtVertOrient. Writer: tblafmt.hxx, tblafmt.cxx, ndtbl.cxx * Updated file version for autotbl.fmt to be SOFFICE_FILEFORMAT_50. * Autoformats now record the text orientation and vertical alignment of table cells. * Autoformats now record the following table-level properties: - Break - Keep with next paragraph - Repeat heading - Allow table split across pages - Allow rows to break across pages - Merge adjacent line styles - Table shadow Calc: autoform.hxx, autoform.cxx * Added support for reading/writing writer-specific data as binary blobs. * Updated file version for autotbl.fmt to be SOFFICE_FILEFORMAT_50.
2012-04-25Convert SV_DECL_PTRARR_DEL(SwSelUnions) to boost::ptr_vectorNoel Grandin1-13/+13
2012-04-25_FndBoxes was a PTRARR_DEL so use ptr_vectorMichael Stahl2-28/+40
2012-04-25Convert SV_DECL_PTRARR_DEL(_FndLines) to boost::ptr_vectorNoel Grandin2-38/+41
2012-04-25Convert SV_DECL_PTRARR(_FndBox*) to std::vectorNoel Grandin2-35/+38
2012-04-14Resolves: fdo#48640 handle various busted rtf docs without hangingCaolán McNamara1-1/+9
2012-03-26Fix Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-1/+1
2012-03-22Convert SVARRAY SORT into STL setBartosz Kosiorek1-28/+28
2012-03-21Revert "sw-outline-numbering-broken-fix.diff: outline numbering fix in ↵Michael Stahl1-1/+1
master docs" This reverts commit 9a11bd42af0db32fd06c84dd955ee563134665ce. Removing attributes from the _source_ node in SwTxtNode::MakeCopy does not make any sens at all, and the cited issue i#96092 was apparently fixed independently in CWS sw31bf04 by the change to ndtxt.cxx in 1524aa18b9ddf7a4181e3f278155c48655084452.
2012-03-21rhbz#789022: SwNodes: fix inconsistent outline check:Michael Stahl1-17/+17
SwNodes::UpdateOutlineNode will add/remove the node from SwNodes::pOutlineNds depending on IsOutline(), while various SwNodes methods that move and delete nodes check GetAttrOutlineLevel() != 0, which may be false even if IsOutline() is true.
2012-03-13merge return branchesCaolán McNamara1-4/+0
2012-03-01New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problemStephan Bergmann1-1/+1
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem.
2012-02-27use a non-leaky singletonCaolán McNamara1-9/+8
2012-02-26fdo#46144: "Distributy Columns Evenly" does not work with the selected columnsIvan Timofeev1-8/+3
regression from f7303fcac779f99931bfba48e8bfcf9c081af67f: - SvUShorts aWish( nTmp, nTmp ), + std::vector<sal_uInt16> aWish( nTmp, nTmp ), aMins( nTmp, nTmp );
2012-02-23fdo#40599 i#112763: fix frame duplication:Michael Stahl1-1/+1
SwDoc::CopyFlyInFlyImpl: When called from SwRedline::CopyToSection, do not copy frames that are anchored at the redline end node by checking IsRedlineMove(); these frames are not deleted by DelCopyOfSection and were thus duplicated on every Show/Hide redlines. (regression from 62ebbb006b4a11974e14dd61d3c453a98336f951 (CWS os131))
2012-01-21Improve checking for emptinessThomas Arnhold1-1/+1
2012-01-21Removed some unused parameters; added SAL_UNUSED_PARAMETER.Stephan Bergmann5-28/+28
SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC) is used to annotate legitimately unused parameters, so that static analysis tools can tell legitimately unused parameters from truly unnecessary ones. To that end, some patches for external modules are also added, that are only applied when compiling with GCC and add necessary __attribute__ ((unused)) in headers.
2012-01-07Remove superfluous _ZFORLIST_DECLARE_TABLE definition.Marcel Metz1-1/+0
2011-12-14sw: build hidden debug features in all casesCédric Bosdonnat1-4/+3
To activate the layout and node dumping features in sw, set the SW_DEBUG environement variable to anything before running the office. F12 will then dump the layout as a layout.xml file in the working directory, and Shift+F12 will dump the nodes structure as nodes.xml at the same place.
2011-12-12de-ICC this for maximum readabilityCaolán McNamara1-14/+0
2011-12-09make SwNode and SwCntntNode abstract base classesLuboš Luňák1-6/+6
2011-12-08childs -> childrenMichael T. Whiteley1-3/+3
2011-11-27remove include of pch header from swNorbert Thiebaud23-35/+0
2011-11-24sw: remove debug instance countingMichael Stahl1-14/+0
There are various classes that in DBG_UTIL mode count their instances with a global variable, and give each instance a unique serial number. The purpose of this exercise is somewhat unclear to me. This removes the instance counting from: SwNumberTree, SwIndex, SwNodeIndex, SwNumRule
2011-11-24sw: enable more debug code:Michael Stahl3-7/+3
Whole bunch of code is #if OSL_DEBUG_LEVEL > 1, reduce that to > 0 so more assertions are active when building --enable-debug or --enable-dbgutil.
2011-11-24sw: replace abuses of OSL_DEBUG_LEVEL with DBG_UTILMichael Stahl6-22/+22
OSL_DEBUG_LEVEL is set by make debug=t, which should never result in ABI incompatible objects.
2011-11-23SwSelBoxes: svarray -> std::mapDaisuke Nishino2-53/+46
2011-11-23aPosArr.Remove(0, n) shouldn't be aPosArr.clear(), but aPosArr.erase(...)Caolán McNamara1-1/+3
i.e. a0a1c3f4fb730ed3614593c3d8ddb50c23204c29 looks really dubious
2011-11-17redundant if not-null checks on deleteIvan Timofeev2-3/+2
2011-11-01eliminate SvUShorts typeDaniel Di Marco1-6/+6
2011-10-03definition of ALPHA is no longer available for DEC AlphaTakeshi Abe2-12/+0
proper ifdef for DEC Alpha should be covered with AXP
2011-09-29Allow for lack of LIBXML_ATTR_FORMATTor Lillqvist1-1/+5
2011-09-29add modelinesCaolán McNamara1-0/+3
2011-09-26revert the change of SwCntntNode bases, for nowLuboš Luňák1-2/+2
Smoketest fails because of this, presumably there is some old-style C cast that fails to adjust the pointer value in SwModify* -> SwCntntNode* casts because of missing the header file *sigh* , but I can't find it now.
2011-09-26remove executable bitLuboš Luňák1-0/+0
2011-09-23debug support for dumping writer nodes structureLuboš Luňák1-0/+199
Similarly to the layout debug support. F12 -> layout, Shift+F12 -> nodes.
2011-09-23make SwCntntNode* and SwNode* have the same valueLuboš Luňák1-2/+2
For debugging purposes, mainly. Fix also some casts that worked only with SwModify being the first base (there seems to be no real requirement for it being first).
2011-09-22just silence the auto_ptr deprecations in isolationCaolán McNamara1-0/+2
2011-09-21Some cppcheck cleaningJulien Nabet1-2/+2
2011-09-20replaced some SvUShorts with std::vectorDaniel Di Marco1-22/+21
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 19:30:30 +0000